From 6b12a25dde34f56f1c3d3c7bff2cfb8d63bbf1a4 Mon Sep 17 00:00:00 2001
From: Matthias Braun <matze@braunis.de>
Date: Thu, 20 May 2010 13:19:03 +0000
Subject: [PATCH] update vc2010 project file

[r27566]
---
 win32/vc2010/{libfirm.sln => firm.sln}        |  2 +-
 .../vc2010/{libfirm.vcxproj => firm.vcxproj}  | 38 ++++++++-----------
 ...m.vcxproj.filters => firm.vcxproj.filters} | 33 +++++-----------
 3 files changed, 26 insertions(+), 47 deletions(-)
 rename win32/vc2010/{libfirm.sln => firm.sln} (86%)
 rename win32/vc2010/{libfirm.vcxproj => firm.vcxproj} (96%)
 rename win32/vc2010/{libfirm.vcxproj.filters => firm.vcxproj.filters} (96%)

diff --git a/win32/vc2010/libfirm.sln b/win32/vc2010/firm.sln
similarity index 86%
rename from win32/vc2010/libfirm.sln
rename to win32/vc2010/firm.sln
index 61a1c7878..48dcda821 100644
--- a/win32/vc2010/libfirm.sln
+++ b/win32/vc2010/firm.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual C++ Express 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libfirm", "libfirm.vcxproj", "{7375BFCA-376F-4CB1-BBE6-7C88374BDBD9}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "firm", "firm.vcxproj", "{7375BFCA-376F-4CB1-BBE6-7C88374BDBD9}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/win32/vc2010/libfirm.vcxproj b/win32/vc2010/firm.vcxproj
similarity index 96%
rename from win32/vc2010/libfirm.vcxproj
rename to win32/vc2010/firm.vcxproj
index ed56401af..f5e88e37f 100644
--- a/win32/vc2010/libfirm.vcxproj
+++ b/win32/vc2010/firm.vcxproj
@@ -16,7 +16,7 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{7375BFCA-376F-4CB1-BBE6-7C88374BDBD9}</ProjectGuid>
-    <RootNamespace>libfirm</RootNamespace>
+    <RootNamespace>firm</RootNamespace>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugJTEST|Win32'" Label="Configuration">
@@ -68,11 +68,11 @@
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>$(FirmRoot)/ir;$(FirmRoot)/ir/obstack;$(FirmRoot)/win32;$(FirmRoot)/ir/adt;$(FirmRoot)/ir/ana;$(FirmRoot)/ir/common;$(FirmRoot)/ir/debug;$(FirmRoot)/ir/ident;$(FirmRoot)/ir/ir;$(FirmRoot)/ir/opt;$(FirmRoot)/ir/stat;$(FirmRoot)/ir/tr;$(FirmRoot)/ir/tv;$(FirmRoot)/ir/arch;$(FirmRoot)/ir/lower;$(FirmRoot)/ir/be;$(FirmRoot)/ir/libcore;$(FirmRoot)/include/libfirm;$(FirmRoot)/include/libfirm/adt;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;WIN32;_LIB;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;inline=_inline;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;WIN32;_LIB;FIRM_BUILD_DLL;_CRT_SECURE_NO_DEPRECATE;inline=_inline;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>.\Release/libfirm.pch</PrecompiledHeaderOutputFile>
+      <PrecompiledHeaderOutputFile>.\Release/firm.pch</PrecompiledHeaderOutputFile>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <ObjectFileName>$(IntDir)</ObjectFileName>
       <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
@@ -86,12 +86,12 @@
       <Culture>0x0407</Culture>
     </ResourceCompile>
     <Lib>
-      <OutputFile>..\..\ipd\lib\libfirm.lib</OutputFile>
+      <OutputFile>..\..\ipd\lib\firm.lib</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
     </Lib>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\Release/libfirm.bsc</OutputFile>
+      <OutputFile>.\Release/firm.bsc</OutputFile>
 		</Bscmake>
     <Link>
       <AdditionalDependencies>winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -102,11 +102,11 @@
       <AdditionalOptions>/WL %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(FirmRoot)/ir;$(FirmRoot)/ir/obstack;$(FirmRoot)/win32;$(FirmRoot)/ir/adt;$(FirmRoot)/ir/ana;$(FirmRoot)/ir/common;$(FirmRoot)/ir/debug;$(FirmRoot)/ir/ident;$(FirmRoot)/ir/ir;$(FirmRoot)/ir/opt;$(FirmRoot)/ir/stat;$(FirmRoot)/ir/tr;$(FirmRoot)/ir/tv;$(FirmRoot)/ir/arch;$(FirmRoot)/ir/lower;$(FirmRoot)/ir/be;$(FirmRoot)/ir/libcore;$(FirmRoot)/include/libfirm;$(FirmRoot)/include/libfirm/adt;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NO_DEBUG;WIN32;_LIB;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;inline=_inline;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NO_DEBUG;WIN32;_LIB;FIRM_BUILD_DLL;_CRT_SECURE_NO_DEPRECATE;inline=_inline;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeaderOutputFile>.\Debug/libfirm.pch</PrecompiledHeaderOutputFile>
+      <PrecompiledHeaderOutputFile>.\Debug/firm.pch</PrecompiledHeaderOutputFile>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <ObjectFileName>$(IntDir)</ObjectFileName>
       <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
@@ -120,12 +120,12 @@
       <Culture>0x0407</Culture>
     </ResourceCompile>
     <Lib>
-      <OutputFile>..\..\ipd\lib\libfirm_g.lib</OutputFile>
+      <OutputFile>..\..\ipd\lib\firm_g.lib</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
     </Lib>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\Debug/libfirm.bsc</OutputFile>
+      <OutputFile>.\Debug/firm.bsc</OutputFile>
     </Bscmake>
     <Link>
       <AdditionalDependencies>winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -136,11 +136,11 @@
       <AdditionalOptions>/WL %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(FirmRoot);$(FirmRoot)/ir/obstack;$(FirmRoot)/win32;$(FirmRoot)/ir/adt;$(FirmRoot)/ir/ana;$(FirmRoot)/ir/common;$(FirmRoot)/ir/debug;$(FirmRoot)/ir/ident;$(FirmRoot)/ir/ir;$(FirmRoot)/ir/opt;$(FirmRoot)/ir/stat;$(FirmRoot)/ir/tr;$(FirmRoot)/ir/tv;$(FirmRoot)/ir/arch;$(FirmRoot)/ir/lower;$(FirmRoot)/ir/be;$(FirmRoot)/ir/libcore;$(FirmRoot)/include/libfirm;$(FirmRoot)/include/libfirm/adt;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;WIN32;_LIB;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;inline=_inline;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;WIN32;_LIB;FIRM_BUILD_DLL;_CRT_SECURE_NO_DEPRECATE;inline=_inline;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeaderOutputFile>.\Debug/libfirm.pch</PrecompiledHeaderOutputFile>
+      <PrecompiledHeaderOutputFile>.\Debug/firm.pch</PrecompiledHeaderOutputFile>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <ObjectFileName>$(IntDir)</ObjectFileName>
       <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
@@ -154,12 +154,12 @@
       <Culture>0x0407</Culture>
     </ResourceCompile>
     <Lib>
-      <OutputFile>..\..\ipd\lib\libfirm_g.lib</OutputFile>
+      <OutputFile>..\..\ipd\lib\firm_g.lib</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
     </Lib>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\Debug/libfirm.bsc</OutputFile>
+      <OutputFile>.\Debug/firm.bsc</OutputFile>
 		</Bscmake>
     <Link>
       <AdditionalDependencies>winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -187,6 +187,7 @@
     <ClInclude Include="$(FirmRoot)\ir\adt\bitfiddle.h" />
     <ClInclude Include="$(FirmRoot)\ir\adt\bitset.h" />
     <ClInclude Include="$(FirmRoot)\ir\adt\compiler.h" />
+    <ClInclude Include="$(FirmRoot)\ir\adt\util.h" />
     <ClInclude Include="$(FirmRoot)\ir\adt\raw_bitset.h" />
     <ClCompile Include="$(FirmRoot)\ir\ana\absgraph.c" />
     <ClCompile Include="$(FirmRoot)\ir\ana\analyze_irg_args.c" />
@@ -455,10 +456,8 @@
     <ClCompile Include="$(FirmRoot)\ir\lower\lower_mode_b.c" />
     <ClCompile Include="$(FirmRoot)\ir\lower\lower_mux.c" />
     <ClCompile Include="$(FirmRoot)\ir\lower\lower_switch.c" />
-    <ClInclude Include="$(FirmRoot)\ir\lower\*.h" />
     <ClCompile Include="$(FirmRoot)\ir\obstack\obstack.c" />
     <ClCompile Include="$(FirmRoot)\ir\obstack\obstack_printf.c" />
-    <ClInclude Include="$(FirmRoot)\ir\obstack\*.h" />
     <ClCompile Include="$(FirmRoot)\ir\opt\boolopt.c" />
     <ClCompile Include="$(FirmRoot)\ir\opt\cfopt.c" />
     <ClCompile Include="$(FirmRoot)\ir\opt\code_placement.c" />
@@ -538,14 +537,15 @@
     <ClInclude Include="$(FirmRoot)\win32\inttypes.h" />
     <ClInclude Include="$(FirmRoot)\win32\stdbool.h" />
     <ClInclude Include="$(FirmRoot)\win32\stdint.h" />
-    <ClCompile Include="$(FirmRoot)\include\libfirm\*.c" />
     <ClInclude Include="$(FirmRoot)\include\libfirm\analyze_irg_args.h" />
     <ClInclude Include="$(FirmRoot)\include\libfirm\be.h" />
+    <ClInclude Include="$(FirmRoot)\include\libfirm\begin.h" />
     <ClInclude Include="$(FirmRoot)\include\libfirm\callgraph.h" />
     <ClInclude Include="$(FirmRoot)\include\libfirm\cdep.h" />
     <ClInclude Include="$(FirmRoot)\include\libfirm\cgana.h" />
     <ClInclude Include="$(FirmRoot)\include\libfirm\compound_path.h" />
     <ClInclude Include="$(FirmRoot)\include\libfirm\dbginfo.h" />
+    <ClInclude Include="$(FirmRoot)\include\libfirm\end.h" />
     <ClInclude Include="$(FirmRoot)\include\libfirm\execfreq.h" />
     <ClInclude Include="$(FirmRoot)\include\libfirm\execution_frequency.h" />
     <ClInclude Include="$(FirmRoot)\include\libfirm\field_temperature.h" />
@@ -588,7 +588,6 @@
     <ClInclude Include="$(FirmRoot)\include\libfirm\irtypeinfo.h" />
     <ClInclude Include="$(FirmRoot)\include\libfirm\irvrfy.h" />
     <ClInclude Include="$(FirmRoot)\include\libfirm\lowering.h" />
-    <ClInclude Include="$(FirmRoot)\include\libfirm\old_fctnames.h" />
     <ClInclude Include="$(FirmRoot)\include\libfirm\pseudo_irg.h" />
     <ClInclude Include="$(FirmRoot)\include\libfirm\rta.h" />
     <ClInclude Include="$(FirmRoot)\include\libfirm\seqnumbers.h" />
@@ -598,8 +597,6 @@
     <ClInclude Include="$(FirmRoot)\include\libfirm\tv.h" />
     <ClInclude Include="$(FirmRoot)\include\libfirm\typerep.h" />
     <ClInclude Include="$(FirmRoot)\include\libfirm\vrp.h" />
-    <ClCompile Include="$(FirmRoot)\include\libfirm\adt\*.c" />
-    <ClInclude Include="$(FirmRoot)\include\libfirm\adt\align.h" />
     <ClInclude Include="$(FirmRoot)\include\libfirm\adt\array.h" />
     <ClInclude Include="$(FirmRoot)\include\libfirm\adt\bipartite.h" />
     <ClInclude Include="$(FirmRoot)\include\libfirm\adt\cpset.h" />
@@ -610,12 +607,10 @@
     <ClInclude Include="$(FirmRoot)\include\libfirm\adt\hashptr.h" />
     <ClInclude Include="$(FirmRoot)\include\libfirm\adt\hashset.h" />
     <ClInclude Include="$(FirmRoot)\include\libfirm\adt\hungarian.h" />
-    <ClInclude Include="$(FirmRoot)\include\libfirm\adt\impl.h" />
     <ClInclude Include="$(FirmRoot)\include\libfirm\adt\iterator.h" />
     <ClInclude Include="$(FirmRoot)\include\libfirm\adt\list.h" />
     <ClInclude Include="$(FirmRoot)\include\libfirm\adt\obstack.h" />
     <ClInclude Include="$(FirmRoot)\include\libfirm\adt\obst.h" />
-    <ClInclude Include="$(FirmRoot)\include\libfirm\adt\offset.h" />
     <ClInclude Include="$(FirmRoot)\include\libfirm\adt\pdeq.h" />
     <ClInclude Include="$(FirmRoot)\include\libfirm\adt\plist.h" />
     <ClInclude Include="$(FirmRoot)\include\libfirm\adt\pmap.h" />
@@ -624,7 +619,6 @@
     <ClInclude Include="$(FirmRoot)\include\libfirm\adt\pset_new.h" />
     <ClInclude Include="$(FirmRoot)\include\libfirm\adt\set.h" />
     <ClInclude Include="$(FirmRoot)\include\libfirm\adt\unionfind.h" />
-    <ClInclude Include="$(FirmRoot)\include\libfirm\adt\util.h" />
     <ClInclude Include="$(FirmRoot)\include\libfirm\adt\xmalloc.h" />
     <ClCompile Include="$(FirmRoot)\ir\be\ia32\bearch_ia32.c" />
     <ClCompile Include="$(FirmRoot)\ir\be\ia32\gen_ia32_emitter.c" />
diff --git a/win32/vc2010/libfirm.vcxproj.filters b/win32/vc2010/firm.vcxproj.filters
similarity index 96%
rename from win32/vc2010/libfirm.vcxproj.filters
rename to win32/vc2010/firm.vcxproj.filters
index 23be89073..0d6a2b871 100644
--- a/win32/vc2010/libfirm.vcxproj.filters
+++ b/win32/vc2010/firm.vcxproj.filters
@@ -150,6 +150,9 @@
     <ClInclude Include="$(FirmRoot)\ir\adt\bitset.h">
       <Filter>ir\adt</Filter>
     </ClInclude>
+    <ClInclude Include="$(FirmRoot)\ir\adt\util.h">
+      <Filter>ir\adt</Filter>
+    </ClInclude>
     <ClInclude Include="$(FirmRoot)\ir\adt\compiler.h">
       <Filter>ir\adt</Filter>
     </ClInclude>
@@ -957,18 +960,12 @@
     <ClCompile Include="$(FirmRoot)\ir\lower\lower_switch.c">
        <Filter>ir\lower</Filter>
     </ClCompile>
-    <ClInclude Include="$(FirmRoot)\ir\lower\*.h">
-      <Filter>ir\lower</Filter>
-    </ClInclude>
     <ClCompile Include="$(FirmRoot)\ir\obstack\obstack.c">
        <Filter>ir\obstack</Filter>
     </ClCompile>
     <ClCompile Include="$(FirmRoot)\ir\obstack\obstack_printf.c">
        <Filter>ir\obstack</Filter>
     </ClCompile>
-    <ClInclude Include="$(FirmRoot)\ir\obstack\*.h">
-      <Filter>ir\obstack</Filter>
-    </ClInclude>
     <ClCompile Include="$(FirmRoot)\ir\opt\boolopt.c">
        <Filter>ir\opt</Filter>
     </ClCompile>
@@ -1206,15 +1203,15 @@
     <ClInclude Include="$(FirmRoot)\win32\stdint.h">
       <Filter>win32</Filter>
     </ClInclude>
-    <ClCompile Include="$(FirmRoot)\include\libfirm\*.c">
-       <Filter>include\libfirm</Filter>
-    </ClCompile>
     <ClInclude Include="$(FirmRoot)\include\libfirm\analyze_irg_args.h">
       <Filter>include\libfirm</Filter>
     </ClInclude>
     <ClInclude Include="$(FirmRoot)\include\libfirm\be.h">
       <Filter>include\libfirm</Filter>
     </ClInclude>
+    <ClInclude Include="$(FirmRoot)\include\libfirm\begin.h">
+      <Filter>include\libfirm</Filter>
+    </ClInclude>
     <ClInclude Include="$(FirmRoot)\include\libfirm\callgraph.h">
       <Filter>include\libfirm</Filter>
     </ClInclude>
@@ -1230,6 +1227,9 @@
     <ClInclude Include="$(FirmRoot)\include\libfirm\dbginfo.h">
       <Filter>include\libfirm</Filter>
     </ClInclude>
+    <ClInclude Include="$(FirmRoot)\include\libfirm\end.h">
+      <Filter>include\libfirm</Filter>
+    </ClInclude>
     <ClInclude Include="$(FirmRoot)\include\libfirm\execfreq.h">
       <Filter>include\libfirm</Filter>
     </ClInclude>
@@ -1356,9 +1356,6 @@
     <ClInclude Include="$(FirmRoot)\include\libfirm\lowering.h">
       <Filter>include\libfirm</Filter>
     </ClInclude>
-    <ClInclude Include="$(FirmRoot)\include\libfirm\old_fctnames.h">
-      <Filter>include\libfirm</Filter>
-    </ClInclude>
     <ClInclude Include="$(FirmRoot)\include\libfirm\pseudo_irg.h">
       <Filter>include\libfirm</Filter>
     </ClInclude>
@@ -1386,9 +1383,6 @@
     <ClInclude Include="$(FirmRoot)\include\libfirm\vrp.h">
       <Filter>include\libfirm</Filter>
     </ClInclude>
-    <ClCompile Include="$(FirmRoot)\include\libfirm\adt\*.c">
-       <Filter>include\libfirm\adt</Filter>
-    </ClCompile>
     <ClInclude Include="$(FirmRoot)\include\libfirm\adt\align.h">
       <Filter>include\libfirm\adt</Filter>
     </ClInclude>
@@ -1422,9 +1416,6 @@
     <ClInclude Include="$(FirmRoot)\include\libfirm\adt\hungarian.h">
       <Filter>include\libfirm\adt</Filter>
     </ClInclude>
-    <ClInclude Include="$(FirmRoot)\include\libfirm\adt\impl.h">
-      <Filter>include\libfirm\adt</Filter>
-    </ClInclude>
     <ClInclude Include="$(FirmRoot)\include\libfirm\adt\iterator.h">
       <Filter>include\libfirm\adt</Filter>
     </ClInclude>
@@ -1437,9 +1428,6 @@
     <ClInclude Include="$(FirmRoot)\include\libfirm\adt\obst.h">
       <Filter>include\libfirm\adt</Filter>
     </ClInclude>
-    <ClInclude Include="$(FirmRoot)\include\libfirm\adt\offset.h">
-      <Filter>include\libfirm\adt</Filter>
-    </ClInclude>
     <ClInclude Include="$(FirmRoot)\include\libfirm\adt\pdeq.h">
       <Filter>include\libfirm\adt</Filter>
     </ClInclude>
@@ -1464,9 +1452,6 @@
     <ClInclude Include="$(FirmRoot)\include\libfirm\adt\unionfind.h">
       <Filter>include\libfirm\adt</Filter>
     </ClInclude>
-    <ClInclude Include="$(FirmRoot)\include\libfirm\adt\util.h">
-      <Filter>include\libfirm\adt</Filter>
-    </ClInclude>
     <ClInclude Include="$(FirmRoot)\include\libfirm\adt\xmalloc.h">
       <Filter>include\libfirm\adt</Filter>
     </ClInclude>
-- 
2.20.1