diff options
| author | Chun-wei Fan <fanchunwei@src.gnome.org> | 2014-01-20 16:30:22 +0800 |
|---|---|---|
| committer | Chun-wei Fan <fanchunwei@src.gnome.org> | 2014-01-20 16:30:22 +0800 |
| commit | 39703440cfd4e7949708266270e447b7b22c9347 (patch) | |
| tree | cfa236428be0cf0467ea9684fb19555339043c88 /build/win32 | |
| parent | 9c2a45a635d9cd6ac752245be4af6d3f00212349 (diff) | |
| download | gobject-introspection-39703440cfd4e7949708266270e447b7b22c9347.tar.gz | |
Rework The Visual Studio 2008 Build Process
This patch makes the build of G-I on Visual Studio 2008 into a two-step
process, as it would make it clearer and easier to the one building G-I by:
-Splitting up the property sheets into multiple parts, where pre-configured
code (which is currently shipped with the tarball) is copied using custom
build steps, so that they can be re-copied when they are updated. This
also removes the need for setting environment variables before launching
the Visual Studio Project to build the G-I DLL, the tools written in C and
the _giscanner Python2 module. The Python2 paths (set to Python 2.7.x)
are now set in a property sheet, which can be updated quite easily, if
needed.
-Use a set of NMake Makefiles to build the introspection files for GLib,
and also the .gir's that are shipped with G-I, and make it clear to people
what things are needed to build the introspection files.
-Standardizing across the board that we now use $(ApiVersion) for the .lib
files and the "installation" of headers, etc.
Similar updates to the Visual Studio 2010 files will follow later.
Diffstat (limited to 'build/win32')
41 files changed, 675 insertions, 888 deletions
diff --git a/build/win32/vs10/annotation.vcxproj b/build/win32/vs10/annotation.vcxproj index b732cadf..eb194f43 100644 --- a/build/win32/vs10/annotation.vcxproj +++ b/build/win32/vs10/annotation.vcxproj @@ -89,7 +89,7 @@ <ModuleDefinitionFile>..\$(ProjectName).def</ModuleDefinitionFile> <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Windows</SubSystem> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(GIApiVersion).lib</ImportLibrary> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <TargetMachine>MachineX86</TargetMachine> </Link> </ItemDefinitionGroup> @@ -112,7 +112,7 @@ <SubSystem>Windows</SubSystem> <OptimizeReferences>true</OptimizeReferences> <EnableCOMDATFolding>true</EnableCOMDATFolding> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(GIApiVersion).lib</ImportLibrary> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <TargetMachine>MachineX86</TargetMachine> </Link> </ItemDefinitionGroup> @@ -136,7 +136,7 @@ <ModuleDefinitionFile>..\$(ProjectName).def</ModuleDefinitionFile> <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Windows</SubSystem> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(GIApiVersion).lib</ImportLibrary> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <TargetMachine>MachineX64</TargetMachine> </Link> </ItemDefinitionGroup> @@ -162,7 +162,7 @@ <SubSystem>Windows</SubSystem> <OptimizeReferences>true</OptimizeReferences> <EnableCOMDATFolding>true</EnableCOMDATFolding> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(GIApiVersion).lib</ImportLibrary> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <TargetMachine>MachineX64</TargetMachine> </Link> </ItemDefinitionGroup> diff --git a/build/win32/vs10/everything.vcxproj b/build/win32/vs10/everything.vcxproj index fe135282..a0afe93c 100644 --- a/build/win32/vs10/everything.vcxproj +++ b/build/win32/vs10/everything.vcxproj @@ -94,7 +94,7 @@ <ModuleDefinitionFile>..\$(ProjectName).def</ModuleDefinitionFile> <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Windows</SubSystem> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(GIApiVersion).lib</ImportLibrary> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <TargetMachine>MachineX86</TargetMachine> </Link> </ItemDefinitionGroup> @@ -122,7 +122,7 @@ <SubSystem>Windows</SubSystem> <OptimizeReferences>true</OptimizeReferences> <EnableCOMDATFolding>true</EnableCOMDATFolding> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(GIApiVersion).lib</ImportLibrary> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <TargetMachine>MachineX86</TargetMachine> </Link> </ItemDefinitionGroup> @@ -151,7 +151,7 @@ <ModuleDefinitionFile>..\$(ProjectName).def</ModuleDefinitionFile> <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Windows</SubSystem> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(GIApiVersion).lib</ImportLibrary> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <TargetMachine>MachineX64</TargetMachine> </Link> </ItemDefinitionGroup> @@ -182,7 +182,7 @@ <SubSystem>Windows</SubSystem> <OptimizeReferences>true</OptimizeReferences> <EnableCOMDATFolding>true</EnableCOMDATFolding> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(GIApiVersion).lib</ImportLibrary> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <TargetMachine>MachineX64</TargetMachine> </Link> </ItemDefinitionGroup> diff --git a/build/win32/vs10/foo.vcxproj b/build/win32/vs10/foo.vcxproj index 480f11e1..237784fc 100644 --- a/build/win32/vs10/foo.vcxproj +++ b/build/win32/vs10/foo.vcxproj @@ -89,7 +89,7 @@ <ModuleDefinitionFile>..\$(ProjectName).def</ModuleDefinitionFile> <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Windows</SubSystem> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(GIApiVersion).lib</ImportLibrary> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <TargetMachine>MachineX86</TargetMachine> </Link> </ItemDefinitionGroup> @@ -112,7 +112,7 @@ <SubSystem>Windows</SubSystem> <OptimizeReferences>true</OptimizeReferences> <EnableCOMDATFolding>true</EnableCOMDATFolding> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(GIApiVersion).lib</ImportLibrary> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <TargetMachine>MachineX86</TargetMachine> </Link> </ItemDefinitionGroup> @@ -136,7 +136,7 @@ <ModuleDefinitionFile>..\$(ProjectName).def</ModuleDefinitionFile> <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Windows</SubSystem> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(GIApiVersion).lib</ImportLibrary> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <TargetMachine>MachineX64</TargetMachine> </Link> </ItemDefinitionGroup> @@ -162,7 +162,7 @@ <SubSystem>Windows</SubSystem> <OptimizeReferences>true</OptimizeReferences> <EnableCOMDATFolding>true</EnableCOMDATFolding> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(GIApiVersion).lib</ImportLibrary> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <TargetMachine>MachineX64</TargetMachine> </Link> </ItemDefinitionGroup> diff --git a/build/win32/vs10/gettype.vcxproj b/build/win32/vs10/gettype.vcxproj index 197e1c92..44c8d040 100644 --- a/build/win32/vs10/gettype.vcxproj +++ b/build/win32/vs10/gettype.vcxproj @@ -89,7 +89,7 @@ <ModuleDefinitionFile>..\$(ProjectName).def</ModuleDefinitionFile> <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Windows</SubSystem> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(GIApiVersion).lib</ImportLibrary> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <TargetMachine>MachineX86</TargetMachine> </Link> </ItemDefinitionGroup> @@ -112,7 +112,7 @@ <SubSystem>Windows</SubSystem> <OptimizeReferences>true</OptimizeReferences> <EnableCOMDATFolding>true</EnableCOMDATFolding> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(GIApiVersion).lib</ImportLibrary> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <TargetMachine>MachineX86</TargetMachine> </Link> </ItemDefinitionGroup> @@ -136,7 +136,7 @@ <ModuleDefinitionFile>..\$(ProjectName).def</ModuleDefinitionFile> <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Windows</SubSystem> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(GIApiVersion).lib</ImportLibrary> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <TargetMachine>MachineX64</TargetMachine> </Link> </ItemDefinitionGroup> @@ -162,7 +162,7 @@ <SubSystem>Windows</SubSystem> <OptimizeReferences>true</OptimizeReferences> <EnableCOMDATFolding>true</EnableCOMDATFolding> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(GIApiVersion).lib</ImportLibrary> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <TargetMachine>MachineX64</TargetMachine> </Link> </ItemDefinitionGroup> diff --git a/build/win32/vs10/gimarshallingtests.vcxproj b/build/win32/vs10/gimarshallingtests.vcxproj index d87fa7c4..9100eae8 100644 --- a/build/win32/vs10/gimarshallingtests.vcxproj +++ b/build/win32/vs10/gimarshallingtests.vcxproj @@ -89,7 +89,7 @@ <ModuleDefinitionFile>..\$(ProjectName).def</ModuleDefinitionFile> <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Windows</SubSystem> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(GIApiVersion).lib</ImportLibrary> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <TargetMachine>MachineX86</TargetMachine> </Link> </ItemDefinitionGroup> @@ -112,7 +112,7 @@ <SubSystem>Windows</SubSystem> <OptimizeReferences>true</OptimizeReferences> <EnableCOMDATFolding>true</EnableCOMDATFolding> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(GIApiVersion).lib</ImportLibrary> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <TargetMachine>MachineX86</TargetMachine> </Link> </ItemDefinitionGroup> @@ -136,7 +136,7 @@ <ModuleDefinitionFile>..\$(ProjectName).def</ModuleDefinitionFile> <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Windows</SubSystem> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(GIApiVersion).lib</ImportLibrary> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <TargetMachine>MachineX64</TargetMachine> </Link> </ItemDefinitionGroup> @@ -162,7 +162,7 @@ <SubSystem>Windows</SubSystem> <OptimizeReferences>true</OptimizeReferences> <EnableCOMDATFolding>true</EnableCOMDATFolding> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(GIApiVersion).lib</ImportLibrary> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <TargetMachine>MachineX64</TargetMachine> </Link> </ItemDefinitionGroup> diff --git a/build/win32/vs10/gir.propsin b/build/win32/vs10/gir.propsin index 47c855c3..49aaa6c8 100644 --- a/build/win32/vs10/gir.propsin +++ b/build/win32/vs10/gir.propsin @@ -5,7 +5,7 @@ <VSVER>10</VSVER> <BASE_GI_DIR>$(SolutionDir)\..\..\..</BASE_GI_DIR> <CopyDir>$(GlibEtcInstallRoot)</CopyDir> - <GIApiVersion>1.0</GIApiVersion> + <ApiVersion>1.0</ApiVersion> <DefDir>$(SolutionDir)$(Configuration)\$(Platform)\obj\$(ProjectName)</DefDir> <GenerateGIRDef> echo EXPORTS > $(DefDir)\girepository.def @@ -103,7 +103,7 @@ goto DONE </GenerateGIR> <LibGILibtoolCompatibleDllPrefix>lib</LibGILibtoolCompatibleDllPrefix> - <LibGILibtoolCompatibleDllSuffix>-$(GIApiVersion)-0</LibGILibtoolCompatibleDllSuffix> + <LibGILibtoolCompatibleDllSuffix>-$(ApiVersion)-0</LibGILibtoolCompatibleDllSuffix> <LibGISeparateVS10DllPrefix /> <LibGISeparateVS10DllSuffix>-1-vs10</LibGISeparateVS10DllSuffix> <LibGIDllPrefix>$(LibGISeparateVS10DllPrefix)</LibGIDllPrefix> @@ -131,20 +131,20 @@ copy ..\..\..\tools\g-ir-scanner $(CopyDir)\bin copy $(SolutionDir)$(Configuration)\$(Platform)\bin\_giscanner.pyd $(CopyDir)\lib\gobject-introspection\giscanner -mkdir $(CopyDir)\share\gir-$(GIApiVersion) +mkdir $(CopyDir)\share\gir-$(ApiVersion) -copy $(SolutionDir)$(Configuration)\$(Platform)\share\gir-$(GIApiVersion)\*.gir $(CopyDir)\share\gir-$(GIApiVersion) +copy $(SolutionDir)$(Configuration)\$(Platform)\share\gir-$(ApiVersion)\*.gir $(CopyDir)\share\gir-$(ApiVersion) -mkdir $(CopyDir)\share\gobject-introspection-$(GIApiVersion) +mkdir $(CopyDir)\share\gobject-introspection-$(ApiVersion) -copy ..\..\..\girepository\gdump.c $(CopyDir)\share\gobject-introspection-$(GIApiVersion) +copy ..\..\..\girepository\gdump.c $(CopyDir)\share\gobject-introspection-$(ApiVersion) -mkdir $(CopyDir)\lib\girepository-$(GIApiVersion) +mkdir $(CopyDir)\lib\girepository-$(ApiVersion) -copy $(SolutionDir)$(Configuration)\$(Platform)\bin\girepository-$(GIApiVersion).lib $(CopyDir)\lib +copy $(SolutionDir)$(Configuration)\$(Platform)\bin\girepository-$(ApiVersion).lib $(CopyDir)\lib -copy $(SolutionDir)$(Configuration)\$(Platform)\lib\girepository-$(GIApiVersion)\*.typelib $(CopyDir)\lib\girepository-$(GIApiVersion) +copy $(SolutionDir)$(Configuration)\$(Platform)\lib\girepository-$(ApiVersion)\*.typelib $(CopyDir)\lib\girepository-$(ApiVersion) </GIDoInstall> </PropertyGroup> @@ -188,8 +188,8 @@ if not exist ..\..\..\tools\g-ir-annotation-tool copy ..\..\..\tools\g-ir-annota <BuildMacro Include="CopyDir"> <Value>$(CopyDir)</Value> </BuildMacro> - <BuildMacro Include="GIApiVersion"> - <Value>$(GIApiVersion)</Value> + <BuildMacro Include="ApiVersion"> + <Value>$(ApiVersion)</Value> </BuildMacro> <BuildMacro Include="DefDir"> <Value>$(DefDir)</Value> diff --git a/build/win32/vs10/girepository.vcxprojin b/build/win32/vs10/girepository.vcxprojin index ef8b96f9..fe70a0d3 100644 --- a/build/win32/vs10/girepository.vcxprojin +++ b/build/win32/vs10/girepository.vcxprojin @@ -94,7 +94,7 @@ <ModuleDefinitionFile>$(IntDir)girepository.def</ModuleDefinitionFile> <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Windows</SubSystem> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(GIApiVersion).lib</ImportLibrary> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <TargetMachine>MachineX86</TargetMachine> </Link> </ItemDefinitionGroup> @@ -122,7 +122,7 @@ <SubSystem>Windows</SubSystem> <OptimizeReferences>true</OptimizeReferences> <EnableCOMDATFolding>true</EnableCOMDATFolding> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(GIApiVersion).lib</ImportLibrary> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <TargetMachine>MachineX86</TargetMachine> </Link> </ItemDefinitionGroup> @@ -151,7 +151,7 @@ <ModuleDefinitionFile>$(IntDir)girepository.def</ModuleDefinitionFile> <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Windows</SubSystem> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(GIApiVersion).lib</ImportLibrary> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <TargetMachine>MachineX64</TargetMachine> </Link> </ItemDefinitionGroup> @@ -182,7 +182,7 @@ <SubSystem>Windows</SubSystem> <OptimizeReferences>true</OptimizeReferences> <EnableCOMDATFolding>true</EnableCOMDATFolding> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(GIApiVersion).lib</ImportLibrary> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <TargetMachine>MachineX64</TargetMachine> </Link> </ItemDefinitionGroup> diff --git a/build/win32/vs10/gtkfrob.vcxproj b/build/win32/vs10/gtkfrob.vcxproj index efbbb63c..10297ca1 100644 --- a/build/win32/vs10/gtkfrob.vcxproj +++ b/build/win32/vs10/gtkfrob.vcxproj @@ -89,7 +89,7 @@ <ModuleDefinitionFile>..\$(ProjectName).def</ModuleDefinitionFile> <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Windows</SubSystem> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(GIApiVersion).lib</ImportLibrary> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <TargetMachine>MachineX86</TargetMachine> </Link> </ItemDefinitionGroup> @@ -112,7 +112,7 @@ <SubSystem>Windows</SubSystem> <OptimizeReferences>true</OptimizeReferences> <EnableCOMDATFolding>true</EnableCOMDATFolding> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(GIApiVersion).lib</ImportLibrary> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <TargetMachine>MachineX86</TargetMachine> </Link> </ItemDefinitionGroup> @@ -136,7 +136,7 @@ <ModuleDefinitionFile>..\$(ProjectName).def</ModuleDefinitionFile> <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Windows</SubSystem> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(GIApiVersion).lib</ImportLibrary> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <TargetMachine>MachineX64</TargetMachine> </Link> </ItemDefinitionGroup> @@ -162,7 +162,7 @@ <SubSystem>Windows</SubSystem> <OptimizeReferences>true</OptimizeReferences> <EnableCOMDATFolding>true</EnableCOMDATFolding> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(GIApiVersion).lib</ImportLibrary> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <TargetMachine>MachineX64</TargetMachine> </Link> </ItemDefinitionGroup> diff --git a/build/win32/vs10/regress.vcxproj b/build/win32/vs10/regress.vcxproj index f4b7e288..052bf0f7 100644 --- a/build/win32/vs10/regress.vcxproj +++ b/build/win32/vs10/regress.vcxproj @@ -90,7 +90,7 @@ <ModuleDefinitionFile>..\$(ProjectName).def</ModuleDefinitionFile> <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Windows</SubSystem> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(GIApiVersion).lib</ImportLibrary> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <TargetMachine>MachineX86</TargetMachine> </Link> </ItemDefinitionGroup> @@ -114,7 +114,7 @@ <SubSystem>Windows</SubSystem> <OptimizeReferences>true</OptimizeReferences> <EnableCOMDATFolding>true</EnableCOMDATFolding> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(GIApiVersion).lib</ImportLibrary> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <TargetMachine>MachineX86</TargetMachine> </Link> </ItemDefinitionGroup> @@ -139,7 +139,7 @@ <ModuleDefinitionFile>..\$(ProjectName).def</ModuleDefinitionFile> <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Windows</SubSystem> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(GIApiVersion).lib</ImportLibrary> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <TargetMachine>MachineX64</TargetMachine> </Link> </ItemDefinitionGroup> @@ -166,7 +166,7 @@ <SubSystem>Windows</SubSystem> <OptimizeReferences>true</OptimizeReferences> <EnableCOMDATFolding>true</EnableCOMDATFolding> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(GIApiVersion).lib</ImportLibrary> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <TargetMachine>MachineX64</TargetMachine> </Link> </ItemDefinitionGroup> diff --git a/build/win32/vs10/sletter.vcxproj b/build/win32/vs10/sletter.vcxproj index bfaea789..b4b341ff 100644 --- a/build/win32/vs10/sletter.vcxproj +++ b/build/win32/vs10/sletter.vcxproj @@ -89,7 +89,7 @@ <ModuleDefinitionFile>..\$(ProjectName).def</ModuleDefinitionFile> <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Windows</SubSystem> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(GIApiVersion).lib</ImportLibrary> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <TargetMachine>MachineX86</TargetMachine> </Link> </ItemDefinitionGroup> @@ -112,7 +112,7 @@ <SubSystem>Windows</SubSystem> <OptimizeReferences>true</OptimizeReferences> <EnableCOMDATFolding>true</EnableCOMDATFolding> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(GIApiVersion).lib</ImportLibrary> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <TargetMachine>MachineX86</TargetMachine> </Link> </ItemDefinitionGroup> @@ -136,7 +136,7 @@ <ModuleDefinitionFile>..\$(ProjectName).def</ModuleDefinitionFile> <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Windows</SubSystem> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(GIApiVersion).lib</ImportLibrary> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <TargetMachine>MachineX64</TargetMachine> </Link> </ItemDefinitionGroup> @@ -162,7 +162,7 @@ <SubSystem>Windows</SubSystem> <OptimizeReferences>true</OptimizeReferences> <EnableCOMDATFolding>true</EnableCOMDATFolding> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(GIApiVersion).lib</ImportLibrary> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <TargetMachine>MachineX64</TargetMachine> </Link> </ItemDefinitionGroup> diff --git a/build/win32/vs10/testinherit.vcxproj b/build/win32/vs10/testinherit.vcxproj index 65c914b8..5eab228e 100644 --- a/build/win32/vs10/testinherit.vcxproj +++ b/build/win32/vs10/testinherit.vcxproj @@ -89,7 +89,7 @@ <ModuleDefinitionFile>..\$(ProjectName).def</ModuleDefinitionFile> <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Windows</SubSystem> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(GIApiVersion).lib</ImportLibrary> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <TargetMachine>MachineX86</TargetMachine> </Link> </ItemDefinitionGroup> @@ -112,7 +112,7 @@ <SubSystem>Windows</SubSystem> <OptimizeReferences>true</OptimizeReferences> <EnableCOMDATFolding>true</EnableCOMDATFolding> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(GIApiVersion).lib</ImportLibrary> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <TargetMachine>MachineX86</TargetMachine> </Link> </ItemDefinitionGroup> @@ -136,7 +136,7 @@ <ModuleDefinitionFile>..\$(ProjectName).def</ModuleDefinitionFile> <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Windows</SubSystem> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(GIApiVersion).lib</ImportLibrary> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <TargetMachine>MachineX64</TargetMachine> </Link> </ItemDefinitionGroup> @@ -162,7 +162,7 @@ <SubSystem>Windows</SubSystem> <OptimizeReferences>true</OptimizeReferences> <EnableCOMDATFolding>true</EnableCOMDATFolding> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(GIApiVersion).lib</ImportLibrary> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <TargetMachine>MachineX64</TargetMachine> </Link> </ItemDefinitionGroup> diff --git a/build/win32/vs10/utility.vcxproj b/build/win32/vs10/utility.vcxproj index 8ef0fe82..044ed9ad 100644 --- a/build/win32/vs10/utility.vcxproj +++ b/build/win32/vs10/utility.vcxproj @@ -89,7 +89,7 @@ <ModuleDefinitionFile>..\$(ProjectName).def</ModuleDefinitionFile> <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Windows</SubSystem> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(GIApiVersion).lib</ImportLibrary> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <TargetMachine>MachineX86</TargetMachine> </Link> </ItemDefinitionGroup> @@ -112,7 +112,7 @@ <SubSystem>Windows</SubSystem> <OptimizeReferences>true</OptimizeReferences> <EnableCOMDATFolding>true</EnableCOMDATFolding> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(GIApiVersion).lib</ImportLibrary> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <TargetMachine>MachineX86</TargetMachine> </Link> </ItemDefinitionGroup> @@ -136,7 +136,7 @@ <ModuleDefinitionFile>..\$(ProjectName).def</ModuleDefinitionFile> <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Windows</SubSystem> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(GIApiVersion).lib</ImportLibrary> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <TargetMachine>MachineX64</TargetMachine> </Link> </ItemDefinitionGroup> @@ -162,7 +162,7 @@ <SubSystem>Windows</SubSystem> <OptimizeReferences>true</OptimizeReferences> <EnableCOMDATFolding>true</EnableCOMDATFolding> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(GIApiVersion).lib</ImportLibrary> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <TargetMachine>MachineX64</TargetMachine> </Link> </ItemDefinitionGroup> diff --git a/build/win32/vs9/Makefile.am b/build/win32/vs9/Makefile.am index ed82cbca..a385ce65 100644 --- a/build/win32/vs9/Makefile.am +++ b/build/win32/vs9/Makefile.am @@ -1,16 +1,19 @@ EXTRA_DIST = \ gobject-introspection.sln \ + gi-build-defines.vsprops \ + gi-extra-paths.vsprops \ + gi-gen-srcs.vsprops \ + gi-install.vspropsin \ + gi-install.vsprops \ + gi-version-paths.vsprops \ + gi-prebuild.vcproj \ girepository.vcprojin \ - gir.vspropsin \ - gir.vsprops \ annotation.vcproj \ cmph-bdz-test.vcproj \ cmph.vcprojin \ - everything.vcproj \ foo.vcproj \ g-ir-compiler.vcprojin \ g-ir-generate.vcproj \ - generate_typelibs.vcproj \ gettype.vcproj \ gimarshallingtests.vcproj \ glib-print.vcproj \ @@ -23,8 +26,8 @@ EXTRA_DIST = \ _giscanner.vcproj \ README.txt -gir.vsprops: $(top_srcdir)/build/win32/vs9/gir.vspropsin gir.vs9.install - $(CPP) -P - <$(top_srcdir)/build/win32/vs9/gir.vspropsin >$@ +gi-install.vsprops: $(top_srcdir)/build/win32/vs9/gi-install.vspropsin gir.vs9.install + $(CPP) -P - <$(top_srcdir)/build/win32/vs9/gi-install.vspropsin >$@ rm gir.vs9.install -CLEANFILES = gir.vsprops +CLEANFILES = gir-install.vsprops diff --git a/build/win32/vs9/README.txt b/build/win32/vs9/README.txt index 579e5ece..36b1ddd4 100644 --- a/build/win32/vs9/README.txt +++ b/build/win32/vs9/README.txt @@ -59,16 +59,40 @@ http://www.gtk.org/download/win32.php [32-bit] http://www.gtk.org/download/win64.php [64-bit]
*** Note! ***
-Please note that due to numerous possible configurations on Python, some environmental
-variables need to be set before launching the gobject-introsection.sln solution file.
-
-These variables are namely:
-PYTHONDIR: Root installation folder of your Python interpretor, where python.exe is
- located. Currently only Python 2.6.x and 2.7.x is supported.
- It must match your build configuration (Win32 or x64/amd64)
+Please note that due to numerous possible configurations on Python, PKG_CONFIG_PATH and
+MinGW, the build of G-I is now a 2-step process: one with the Visual Studio Projects that
+will build the libraries, tools, Python Module and test DLLs (except for the everything
+test), and the other one with NMake Makefiles for building the introspection files.
+Please note that if one needs to change the installation location
+of Python, one needs to change the values of PythonDir (for x86/Win32 builds) and/or
+PythonDirX64 (for x64 builds) in gi-extra-paths.vsprops
+
+The use of Visual Studio Projects will no longer require the setting of environmental
+variables, but the following environmental variables are needed (either by using "set xxx=yyy"
+or by nmake -f gi-introspection-msvc.mak xxx=yyy) for building the introspection files (which
+should be done after successfully building the Project Files):
+
+PYTHON2: Full path to your Python 2.6.x/2.7.x interpretor (python.exe) if it is
+ not in your PATH. Please note that only 2.6.x and 2.7.x works at this time.
+ You need to use a x64/amd64 version of Python for x64 builds, and a Win32/x86
+ version of Python for Win32/x86 builds
PKG_CONFIG_PATH: Location of the .pc (pkg-config) files, especially for the GLib .pc files.
MINGWDIR: Root installation folder for your Windows GCC (such as MinGW). For example,
if your gcc executable (gcc.exe) is in c:\mingw\bin, use "set MINGWDIR=c:\mingw"
+ You need to use a x64/amd64 version of gcc for x64 builds, and a Win32/x86
+ version of gcc for Win32/x86 builds
+
+GCC is currently needed to as the GCC preprocessor is used to create the introspection dump source
+file, which is then compiled with the Visual C++ compiler to produce the .gir files.
+
+Please see $(srcroot)\build\gi-introspection-msvc.mak for more details. Doing
+"nmake -f gi-introspection-msvc.mak (options omitted)" will build the various introspection files,
+"nmake -f gi-introspection-msvc.mak tests-introspection" will build the introspection files for the tests,
+and "nmake -f gi-introspection-msvc.mak (options omitted) install-introspection" will copy the introspection
+files to <root>\vs9\<PlatformName>\share\gir-1.0 (.gir files) and <root>\vs9\<PlatformName>\lib\girepository-1.0
+(.typelib files)
+
+
*** End of Note! ***
The "install" project will copy build results and headers into their
@@ -77,9 +101,6 @@ built DLLs go into <root>\vs9\<PlatformName>\bin, built LIBs into <root>\vs9\<PlatformName>\lib and gobject-introspection headers into
<root>\vs9\<PlatformName>\include\gobject-introsection-1.0.
-The generated .gir files will end up in <root>\vs9\<PlatformName>\share\gir-1.0
-and .typelib files will end up in <root>\vs9\<PlatformName>\lib\girepository-1.0
-
This is then from where
project files higher in the stack are supposed to look for them, not
from a specific gobject-introspection source tree.
diff --git a/build/win32/vs9/_giscanner.vcproj b/build/win32/vs9/_giscanner.vcproj index 3619a2fb..8f1e2a6e 100644 --- a/build/win32/vs9/_giscanner.vcproj +++ b/build/win32/vs9/_giscanner.vcproj @@ -22,16 +22,13 @@ <Configuration Name="Debug|Win32" ConfigurationType="2" - InheritedPropertySheets=".\gir.vsprops" + InheritedPropertySheets=".\gi-extra-paths.vsprops" CharacterSet="2" > <Tool - Name="VCPreBuildEventTool" - /> - <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\..\giscanner;;$(PYTHONDIR)\include;$(PYTHONDIR)\PC" + AdditionalIncludeDirectories="..\..\..\giscanner;;$(PythonDir)\include;$(PythonDir)\PC" ForcedIncludeFiles="msvc_recommended_pragmas.h;io.h" PreprocessorDefinitions="_DEBUG;YY_NO_UNISTD_H" MinimalRebuild="true" @@ -45,7 +42,7 @@ Name="VCLinkerTool" OutputFile="$(OutDir)\$(ProjectName).pyd" LinkIncremental="2" - AdditionalLibraryDirectories="$(PYTHONDIR)\libs" + AdditionalLibraryDirectories="$(PythonDir)\libs" GenerateDebugInformation="true" SubSystem="2" TargetMachine="1" @@ -54,18 +51,15 @@ <Configuration Name="Release|Win32" ConfigurationType="2" - InheritedPropertySheets=".\gir.vsprops" + InheritedPropertySheets=".\gi-extra-paths.vsprops" CharacterSet="2" WholeProgramOptimization="1" > <Tool - Name="VCPreBuildEventTool" - /> - <Tool Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" - AdditionalIncludeDirectories="..\..\..\giscanner;;$(PYTHONDIR)\include;$(PYTHONDIR)\PC" + AdditionalIncludeDirectories="..\..\..\giscanner;;$(PythonDir)\include;$(PythonDir)\PC" ForcedIncludeFiles="msvc_recommended_pragmas.h;io.h" PreprocessorDefinitions="YY_NO_UNISTD_H" RuntimeLibrary="2" @@ -78,7 +72,7 @@ Name="VCLinkerTool" OutputFile="$(OutDir)\$(ProjectName).pyd" LinkIncremental="1" - AdditionalLibraryDirectories="$(PYTHONDIR)\libs" + AdditionalLibraryDirectories="$(PythonDir)\libs" GenerateDebugInformation="true" SubSystem="2" OptimizeReferences="2" @@ -89,20 +83,17 @@ <Configuration Name="Debug|x64" ConfigurationType="2" - InheritedPropertySheets=".\gir.vsprops" + InheritedPropertySheets=".\gi-extra-paths.vsprops" CharacterSet="2" > <Tool - Name="VCPreBuildEventTool" - /> - <Tool Name="VCMIDLTool" TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\..\giscanner;;$(PYTHONDIR)\include;$(PYTHONDIR)\PC" + AdditionalIncludeDirectories="..\..\..\giscanner;;$(PythonDirX64)\include;$(PythonDirX64)\PC" ForcedIncludeFiles="msvc_recommended_pragmas.h;io.h" PreprocessorDefinitions="_DEBUG;YY_NO_UNISTD_H" MinimalRebuild="true" @@ -116,7 +107,7 @@ Name="VCLinkerTool" OutputFile="$(OutDir)\$(ProjectName).pyd" LinkIncremental="2" - AdditionalLibraryDirectories="$(PYTHONDIR)\libs" + AdditionalLibraryDirectories="$(PythonDirX64)\libs" GenerateDebugInformation="true" SubSystem="2" TargetMachine="17" @@ -125,14 +116,11 @@ <Configuration Name="Release|x64" ConfigurationType="2" - InheritedPropertySheets=".\gir.vsprops" + InheritedPropertySheets=".\gi-extra-paths.vsprops" CharacterSet="2" WholeProgramOptimization="1" > <Tool - Name="VCPreBuildEventTool" - /> - <Tool Name="VCMIDLTool" TargetEnvironment="3" /> @@ -140,7 +128,7 @@ Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" - AdditionalIncludeDirectories="..\..\..\giscanner;;$(PYTHONDIR)\include;$(PYTHONDIR)\PC" + AdditionalIncludeDirectories="..\..\..\giscanner;;$(PythonDirX64)\include;$(PythonDirX64)\PC" ForcedIncludeFiles="msvc_recommended_pragmas.h;io.h" PreprocessorDefinitions="YY_NO_UNISTD_H" RuntimeLibrary="2" @@ -153,7 +141,7 @@ Name="VCLinkerTool" OutputFile="$(OutDir)\$(ProjectName).pyd" LinkIncremental="1" - AdditionalLibraryDirectories="$(PYTHONDIR)\libs" + AdditionalLibraryDirectories="$(PythonDirX64)\libs" GenerateDebugInformation="true" SubSystem="2" OptimizeReferences="2" diff --git a/build/win32/vs9/annotation.vcproj b/build/win32/vs9/annotation.vcproj index 81045941..b40a5bed 100644 --- a/build/win32/vs9/annotation.vcproj +++ b/build/win32/vs9/annotation.vcproj @@ -22,13 +22,10 @@ <Configuration Name="Debug|Win32" ConfigurationType="2" - InheritedPropertySheets=".\gir.vsprops" + InheritedPropertySheets=".\gi-build-defines.vsprops" CharacterSet="2" > <Tool - Name="VCPreBuildEventTool" - /> - <Tool Name="VCCLCompilerTool" Optimization="0" PreprocessorDefinitions="_DEBUG" @@ -46,21 +43,18 @@ ModuleDefinitionFile="..\$(ProjectName).def" GenerateDebugInformation="true" SubSystem="2" - ImportLibrary="$(TargetDir)$(ProjectName)-$(GIApiVersion).lib" + ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib" TargetMachine="1" /> </Configuration> <Configuration Name="Release|Win32" ConfigurationType="2" - InheritedPropertySheets=".\gir.vsprops" + InheritedPropertySheets=".\gi-build-defines.vsprops" CharacterSet="2" WholeProgramOptimization="1" > <Tool - Name="VCPreBuildEventTool" - /> - <Tool Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" @@ -80,20 +74,17 @@ SubSystem="2" OptimizeReferences="2" EnableCOMDATFolding="2" - ImportLibrary="$(TargetDir)$(ProjectName)-$(GIApiVersion).lib" + ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib" TargetMachine="1" /> </Configuration> <Configuration Name="Debug|x64" ConfigurationType="2" - InheritedPropertySheets=".\gir.vsprops" + InheritedPropertySheets=".\gi-build-defines.vsprops" CharacterSet="2" > <Tool - Name="VCPreBuildEventTool" - /> - <Tool Name="VCMIDLTool" TargetEnvironment="3" /> @@ -115,21 +106,18 @@ ModuleDefinitionFile="..\$(ProjectName).def" GenerateDebugInformation="true" SubSystem="2" - ImportLibrary="$(TargetDir)$(ProjectName)-$(GIApiVersion).lib" + ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib" TargetMachine="17" /> </Configuration> <Configuration Name="Release|x64" ConfigurationType="2" - InheritedPropertySheets=".\gir.vsprops" + InheritedPropertySheets=".\gi-build-defines.vsprops" CharacterSet="2" WholeProgramOptimization="1" > <Tool - Name="VCPreBuildEventTool" - /> - <Tool Name="VCMIDLTool" TargetEnvironment="3" /> @@ -153,7 +141,7 @@ SubSystem="2" OptimizeReferences="2" EnableCOMDATFolding="2" - ImportLibrary="$(TargetDir)$(ProjectName)-$(GIApiVersion).lib" + ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib" TargetMachine="17" /> </Configuration> diff --git a/build/win32/vs9/cmph-bdz-test.vcproj b/build/win32/vs9/cmph-bdz-test.vcproj index 0bd8106b..d83bcdb5 100644 --- a/build/win32/vs9/cmph-bdz-test.vcproj +++ b/build/win32/vs9/cmph-bdz-test.vcproj @@ -22,13 +22,10 @@ <Configuration Name="Debug|Win32" ConfigurationType="1" - InheritedPropertySheets=".\gir.vsprops" + InheritedPropertySheets=".\gi-build-defines.vsprops" CharacterSet="2" > <Tool - Name="VCPreBuildEventTool" - /> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\girepository\cmph" @@ -51,14 +48,11 @@ <Configuration Name="Release|Win32" ConfigurationType="1" - InheritedPropertySheets=".\gir.vsprops" + InheritedPropertySheets=".\gi-build-defines.vsprops" CharacterSet="2" WholeProgramOptimization="1" > <Tool - Name="VCPreBuildEventTool" - /> - <Tool Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" @@ -84,13 +78,10 @@ <Configuration Name="Debug|x64" ConfigurationType="1" - InheritedPropertySheets=".\gir.vsprops" + InheritedPropertySheets=".\gi-build-defines.vsprops" CharacterSet="2" > <Tool - Name="VCPreBuildEventTool" - /> - <Tool Name="VCMIDLTool" TargetEnvironment="3" /> @@ -117,14 +108,11 @@ <Configuration Name="Release|x64" ConfigurationType="1" - InheritedPropertySheets=".\gir.vsprops" + InheritedPropertySheets=".\gi-build-defines.vsprops" CharacterSet="2" WholeProgramOptimization="1" > <Tool - Name="VCPreBuildEventTool" - /> - <Tool Name="VCMIDLTool" TargetEnvironment="3" /> diff --git a/build/win32/vs9/cmph.vcprojin b/build/win32/vs9/cmph.vcprojin index ff56d375..5801d739 100644 --- a/build/win32/vs9/cmph.vcprojin +++ b/build/win32/vs9/cmph.vcprojin @@ -22,13 +22,10 @@ <Configuration Name="Debug|Win32" ConfigurationType="4" - InheritedPropertySheets=".\gir.vsprops" + InheritedPropertySheets=".\gi-build-defines.vsprops" CharacterSet="2" > <Tool - Name="VCPreBuildEventTool" - /> - <Tool Name="VCCLCompilerTool" Optimization="0" PreprocessorDefinitions="_DEBUG" @@ -43,14 +40,11 @@ <Configuration Name="Release|Win32" ConfigurationType="4" - InheritedPropertySheets=".\gir.vsprops" + InheritedPropertySheets=".\gi-build-defines.vsprops" CharacterSet="2" WholeProgramOptimization="1" > <Tool - Name="VCPreBuildEventTool" - /> - <Tool Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" @@ -65,13 +59,10 @@ <Configuration Name="Debug|x64" ConfigurationType="4" - InheritedPropertySheets=".\gir.vsprops" + InheritedPropertySheets=".\gi-build-defines.vsprops" CharacterSet="2" > <Tool - Name="VCPreBuildEventTool" - /> - <Tool Name="VCMIDLTool" TargetEnvironment="3" /> @@ -90,14 +81,11 @@ <Configuration Name="Release|x64" ConfigurationType="4" - InheritedPropertySheets=".\gir.vsprops" + InheritedPropertySheets=".\gi-build-defines.vsprops" CharacterSet="2" WholeProgramOptimization="1" > <Tool - Name="VCPreBuildEventTool" - /> - <Tool Name="VCMIDLTool" TargetEnvironment="3" /> diff --git a/build/win32/vs9/everything.vcproj b/build/win32/vs9/everything.vcproj deleted file mode 100644 index c8f1eace..00000000 --- a/build/win32/vs9/everything.vcproj +++ /dev/null @@ -1,190 +0,0 @@ -<?xml version="1.0" encoding="big5"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="9.00" - Name="everything" - ProjectGUID="{2986281A-BD41-4BD1-8B43-25B7D7E7F234}" - RootNamespace="everything" - Keyword="Win32Proj" - TargetFrameworkVersion="196613" - > - <Platforms> - <Platform - Name="Win32" - /> - <Platform - Name="x64" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - ConfigurationType="2" - InheritedPropertySheets=".\gir.vsprops" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - CommandLine="$(GenEverythingH)" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - PreprocessorDefinitions="_DEBUG" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="3" - UsePrecompiledHeader="0" - WarningLevel="3" - DebugInformationFormat="4" - /> - <Tool - Name="VCLinkerTool" - OutputFile="$(OutDir)\$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll" - LinkIncremental="2" - ModuleDefinitionFile="..\$(ProjectName).def" - GenerateDebugInformation="true" - SubSystem="2" - ImportLibrary="$(TargetDir)$(ProjectName)-$(GIApiVersion).lib" - TargetMachine="1" - /> - </Configuration> - <Configuration - Name="Release|Win32" - ConfigurationType="2" - InheritedPropertySheets=".\gir.vsprops" - CharacterSet="2" - WholeProgramOptimization="1" - > - <Tool - Name="VCPreBuildEventTool" - CommandLine="$(GenEverythingH)" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - EnableIntrinsicFunctions="true" - PreprocessorDefinitions="" - RuntimeLibrary="2" - EnableFunctionLevelLinking="true" - UsePrecompiledHeader="0" - WarningLevel="3" - DebugInformationFormat="3" - /> - <Tool - Name="VCLinkerTool" - OutputFile="$(OutDir)\$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll" - LinkIncremental="1" - ModuleDefinitionFile="..\$(ProjectName).def" - GenerateDebugInformation="true" - SubSystem="2" - OptimizeReferences="2" - EnableCOMDATFolding="2" - ImportLibrary="$(TargetDir)$(ProjectName)-$(GIApiVersion).lib" - TargetMachine="1" - /> - </Configuration> - <Configuration - Name="Debug|x64" - ConfigurationType="2" - InheritedPropertySheets=".\gir.vsprops" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - CommandLine="$(GenEverythingH)" - /> - <Tool - Name="VCMIDLTool" - TargetEnvironment="3" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - PreprocessorDefinitions="_DEBUG" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="3" - UsePrecompiledHeader="0" - WarningLevel="3" - DebugInformationFormat="3" - /> - <Tool - Name="VCLinkerTool" - OutputFile="$(OutDir)\$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll" - LinkIncremental="2" - ModuleDefinitionFile="..\$(ProjectName).def" - GenerateDebugInformation="true" - SubSystem="2" - ImportLibrary="$(TargetDir)$(ProjectName)-$(GIApiVersion).lib" - TargetMachine="17" - /> - </Configuration> - <Configuration - Name="Release|x64" - ConfigurationType="2" - InheritedPropertySheets=".\gir.vsprops" - CharacterSet="2" - WholeProgramOptimization="1" - > - <Tool - Name="VCPreBuildEventTool" - CommandLine="$(GenEverythingH)" - /> - <Tool - Name="VCMIDLTool" - TargetEnvironment="3" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - EnableIntrinsicFunctions="true" - PreprocessorDefinitions="" - RuntimeLibrary="2" - EnableFunctionLevelLinking="true" - UsePrecompiledHeader="0" - WarningLevel="3" - DebugInformationFormat="3" - /> - <Tool - Name="VCLinkerTool" - OutputFile="$(OutDir)\$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll" - LinkIncremental="1" - ModuleDefinitionFile="..\$(ProjectName).def" - GenerateDebugInformation="true" - SubSystem="2" - OptimizeReferences="2" - EnableCOMDATFolding="2" - ImportLibrary="$(TargetDir)$(ProjectName)-$(GIApiVersion).lib" - TargetMachine="17" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="Sources" - Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" - UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" - > - <File RelativePath="..\..\..\tests\everything.c" /> - </Filter> - <Filter - Name="Headers" - Filter="h;hpp;hxx;hm;inl;inc;xsd" - UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" - > - </Filter> - <Filter - Name="Resource Files" - Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" - UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" - > - </Filter> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/build/win32/vs9/foo.vcproj b/build/win32/vs9/foo.vcproj index 3a2aeef2..f88dfd8c 100644 --- a/build/win32/vs9/foo.vcproj +++ b/build/win32/vs9/foo.vcproj @@ -22,13 +22,10 @@ <Configuration Name="Debug|Win32" ConfigurationType="2" - InheritedPropertySheets=".\gir.vsprops" + InheritedPropertySheets=".\gi-build-defines.vsprops" CharacterSet="2" > <Tool - Name="VCPreBuildEventTool" - /> - <Tool Name="VCCLCompilerTool" Optimization="0" PreprocessorDefinitions="_DEBUG" @@ -46,21 +43,18 @@ ModuleDefinitionFile="..\$(ProjectName).def" GenerateDebugInformation="true" SubSystem="2" - ImportLibrary="$(TargetDir)$(ProjectName)-$(GIApiVersion).lib" + ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib" TargetMachine="1" /> </Configuration> <Configuration Name="Release|Win32" ConfigurationType="2" - InheritedPropertySheets=".\gir.vsprops" + InheritedPropertySheets=".\gi-build-defines.vsprops" CharacterSet="2" WholeProgramOptimization="1" > <Tool - Name="VCPreBuildEventTool" - /> - <Tool Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" @@ -80,20 +74,17 @@ SubSystem="2" OptimizeReferences="2" EnableCOMDATFolding="2" - ImportLibrary="$(TargetDir)$(ProjectName)-$(GIApiVersion).lib" + ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib" TargetMachine="1" /> </Configuration> <Configuration Name="Debug|x64" ConfigurationType="2" - InheritedPropertySheets=".\gir.vsprops" + InheritedPropertySheets=".\gi-build-defines.vsprops" CharacterSet="2" > <Tool - Name="VCPreBuildEventTool" - /> - <Tool Name="VCMIDLTool" TargetEnvironment="3" /> @@ -115,21 +106,18 @@ ModuleDefinitionFile="..\$(ProjectName).def" GenerateDebugInformation="true" SubSystem="2" - ImportLibrary="$(TargetDir)$(ProjectName)-$(GIApiVersion).lib" + ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib" TargetMachine="17" /> </Configuration> <Configuration Name="Release|x64" ConfigurationType="2" - InheritedPropertySheets=".\gir.vsprops" + InheritedPropertySheets=".\gi-build-defines.vsprops" CharacterSet="2" WholeProgramOptimization="1" > <Tool - Name="VCPreBuildEventTool" - /> - <Tool Name="VCMIDLTool" TargetEnvironment="3" /> @@ -153,7 +141,7 @@ SubSystem="2" OptimizeReferences="2" EnableCOMDATFolding="2" - ImportLibrary="$(TargetDir)$(ProjectName)-$(GIApiVersion).lib" + ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib" TargetMachine="17" /> </Configuration> diff --git a/build/win32/vs9/g-ir-compiler.vcprojin b/build/win32/vs9/g-ir-compiler.vcprojin index f08b9195..b18648ff 100644 --- a/build/win32/vs9/g-ir-compiler.vcprojin +++ b/build/win32/vs9/g-ir-compiler.vcprojin @@ -22,16 +22,13 @@ <Configuration Name="Debug|Win32" ConfigurationType="1" - InheritedPropertySheets=".\gir.vsprops" + InheritedPropertySheets=".\gi-build-defines.vsprops" CharacterSet="2" > <Tool - Name="VCPreBuildEventTool" - /> - <Tool Name="VCCLCompilerTool" Optimization="0" - PreprocessorDefinitions="_DEBUG;FFI_BUILDING" + PreprocessorDefinitions="_DEBUG;$(FFIDefines)" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -51,20 +48,17 @@ <Configuration Name="Debug|x64" ConfigurationType="1" - InheritedPropertySheets=".\gir.vsprops" + InheritedPropertySheets=".\gi-build-defines.vsprops" CharacterSet="2" > <Tool - Name="VCPreBuildEventTool" - /> - <Tool Name="VCMIDLTool" TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" Optimization="0" - PreprocessorDefinitions="_DEBUG;FFI_BUILDING" + PreprocessorDefinitions="_DEBUG;$(FFIDefines)" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -85,18 +79,15 @@ <Configuration Name="Release|Win32" ConfigurationType="1" - InheritedPropertySheets=".\gir.vsprops" + InheritedPropertySheets=".\gi-build-defines.vsprops" CharacterSet="2" WholeProgramOptimization="1" > <Tool - Name="VCPreBuildEventTool" - /> - <Tool Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" - PreprocessorDefinitions="FFI_BUILDING" + PreprocessorDefinitions="$(FFIDefines)" RuntimeLibrary="2" EnableFunctionLevelLinking="true" UsePrecompiledHeader="0" @@ -117,14 +108,11 @@ <Configuration Name="Release|x64" ConfigurationType="1" - InheritedPropertySheets=".\gir.vsprops" + InheritedPropertySheets=".\gi-build-defines.vsprops" CharacterSet="2" WholeProgramOptimization="1" > <Tool - Name="VCPreBuildEventTool" - /> - <Tool Name="VCMIDLTool" TargetEnvironment="3" /> @@ -134,7 +122,7 @@ EnableIntrinsicFunctions="true" EnableMinimalRebuild="true" WholeProgramOptimization="false" - PreprocessorDefinitions="FFI_BUILDING" + PreprocessorDefinitions="$(FFIDefines)" RuntimeLibrary="2" EnableFunctionLevelLinking="true" UsePrecompiledHeader="0" diff --git a/build/win32/vs9/g-ir-generate.vcproj b/build/win32/vs9/g-ir-generate.vcproj index 0e5973a4..ebd3c2b6 100644 --- a/build/win32/vs9/g-ir-generate.vcproj +++ b/build/win32/vs9/g-ir-generate.vcproj @@ -22,13 +22,10 @@ <Configuration Name="Debug|Win32" ConfigurationType="1" - InheritedPropertySheets=".\gir.vsprops" + InheritedPropertySheets=".\gi-build-defines.vsprops" CharacterSet="2" > <Tool - Name="VCPreBuildEventTool" - /> - <Tool Name="VCCLCompilerTool" Optimization="0" PreprocessorDefinitions="_DEBUG" @@ -50,14 +47,11 @@ <Configuration Name="Release|Win32" ConfigurationType="1" - InheritedPropertySheets=".\gir.vsprops" + InheritedPropertySheets=".\gi-build-defines.vsprops" CharacterSet="2" WholeProgramOptimization="1" > <Tool - Name="VCPreBuildEventTool" - /> - <Tool Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" @@ -81,13 +75,10 @@ <Configuration Name="Debug|x64" ConfigurationType="1" - InheritedPropertySheets=".\gir.vsprops" + InheritedPropertySheets=".\gi-build-defines.vsprops" CharacterSet="2" > <Tool - Name="VCPreBuildEventTool" - /> - <Tool Name="VCMIDLTool" TargetEnvironment="3" /> @@ -113,14 +104,11 @@ <Configuration Name="Release|x64" ConfigurationType="1" - InheritedPropertySheets=".\gir.vsprops" + InheritedPropertySheets=".\gi-build-defines.vsprops" CharacterSet="2" WholeProgramOptimization="1" > <Tool - Name="VCPreBuildEventTool" - /> - <Tool Name="VCMIDLTool" TargetEnvironment="3" /> diff --git a/build/win32/vs9/generate_typelibs.vcproj b/build/win32/vs9/generate_typelibs.vcproj deleted file mode 100644 index e8b0059e..00000000 --- a/build/win32/vs9/generate_typelibs.vcproj +++ /dev/null @@ -1,74 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="9.00" - Name="generate_typelibs" - ProjectGUID="{BE771349-F11E-42AE-A23F-DA083FDC6FB8}" - RootNamespace="generate_typelibs" - TargetFrameworkVersion="196613" - > - <Platforms> - <Platform - Name="Win32" - /> - <Platform - Name="x64" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - ConfigurationType="10" - InheritedPropertySheets=".\gir.vsprops" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - CommandLine="$(GenerateGIR)" - /> - </Configuration> - <Configuration - Name="Release|Win32" - ConfigurationType="10" - InheritedPropertySheets=".\gir.vsprops" - CharacterSet="2" - WholeProgramOptimization="1" - > - <Tool - Name="VCPreBuildEventTool" - CommandLine="$(GenerateGIR)" - /> - </Configuration> - <Configuration - Name="Debug|x64" - ConfigurationType="10" - InheritedPropertySheets=".\gir.vsprops" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - CommandLine="$(GenerateGIR)" - /> - </Configuration> - <Configuration - Name="Release|x64" - ConfigurationType="10" - InheritedPropertySheets=".\gir.vsprops" - CharacterSet="2" - WholeProgramOptimization="1" - > - <Tool - Name="VCPreBuildEventTool" - CommandLine="$(GenerateGIR)" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/build/win32/vs9/gettype.vcproj b/build/win32/vs9/gettype.vcproj index 5806277c..d4c18894 100644 --- a/build/win32/vs9/gettype.vcproj +++ b/build/win32/vs9/gettype.vcproj @@ -22,13 +22,10 @@ <Configuration Name="Debug|Win32" ConfigurationType="2" - InheritedPropertySheets=".\gir.vsprops" + InheritedPropertySheets=".\gi-build-defines.vsprops" CharacterSet="2" > <Tool - Name="VCPreBuildEventTool" - /> - <Tool Name="VCCLCompilerTool" Optimization="0" PreprocessorDefinitions="_DEBUG" @@ -46,21 +43,18 @@ ModuleDefinitionFile="..\$(ProjectName).def" GenerateDebugInformation="true" SubSystem="2" - ImportLibrary="$(TargetDir)$(ProjectName)-$(GIApiVersion).lib" + ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib" TargetMachine="1" /> </Configuration> <Configuration Name="Release|Win32" ConfigurationType="2" - InheritedPropertySheets=".\gir.vsprops" + InheritedPropertySheets=".\gi-build-defines.vsprops" CharacterSet="2" WholeProgramOptimization="1" > <Tool - Name="VCPreBuildEventTool" - /> - <Tool Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" @@ -80,20 +74,17 @@ SubSystem="2" OptimizeReferences="2" EnableCOMDATFolding="2" - ImportLibrary="$(TargetDir)$(ProjectName)-$(GIApiVersion).lib" + ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib" TargetMachine="1" /> </Configuration> <Configuration Name="Debug|x64" ConfigurationType="2" - InheritedPropertySheets=".\gir.vsprops" + InheritedPropertySheets=".\gi-build-defines.vsprops" CharacterSet="2" > <Tool - Name="VCPreBuildEventTool" - /> - <Tool Name="VCMIDLTool" TargetEnvironment="3" /> @@ -115,21 +106,18 @@ ModuleDefinitionFile="..\$(ProjectName).def" GenerateDebugInformation="true" SubSystem="2" - ImportLibrary="$(TargetDir)$(ProjectName)-$(GIApiVersion).lib" + ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib" TargetMachine="17" /> </Configuration> <Configuration Name="Release|x64" ConfigurationType="2" - InheritedPropertySheets=".\gir.vsprops" + InheritedPropertySheets=".\gi-build-defines.vsprops" CharacterSet="2" WholeProgramOptimization="1" > <Tool - Name="VCPreBuildEventTool" - /> - <Tool Name="VCMIDLTool" TargetEnvironment="3" /> @@ -153,7 +141,7 @@ SubSystem="2" OptimizeReferences="2" EnableCOMDATFolding="2" - ImportLibrary="$(TargetDir)$(ProjectName)-$(GIApiVersion).lib" + ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib" TargetMachine="17" /> </Configuration> diff --git a/build/win32/vs9/gi-build-defines.vsprops b/build/win32/vs9/gi-build-defines.vsprops new file mode 100644 index 00000000..12cd0cf3 --- /dev/null +++ b/build/win32/vs9/gi-build-defines.vsprops @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioPropertySheet + ProjectType="Visual C++" + Version="8.00" + Name="gibuilddefinesprops" + InheritedPropertySheets=".\gi-version-paths.vsprops" + OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin" + IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj\$(ProjectName)\" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\..;..\..\..\girepository;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include" + PreprocessorDefinitions="HAVE_CONFIG_H;WIN32" + ForcedIncludeFiles="msvc_recommended_pragmas.h" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="gio-2.0.lib gobject-2.0.lib gmodule-2.0.lib glib-2.0.lib" + AdditionalLibraryDirectories="$(GlibEtcInstallRoot)\lib" + /> + <UserMacro + Name="FFIDefines" + Value="FFI_BUILDING" + /> + <UserMacro + Name="GIRepositoryBuildDefines" + Value="G_IREPOSITORY_COMPILATION;$(FFIDefines);DLL_EXPORT" + /> +</VisualStudioPropertySheet> diff --git a/build/win32/vs9/gi-extra-paths.vsprops b/build/win32/vs9/gi-extra-paths.vsprops new file mode 100644 index 00000000..83c1d416 --- /dev/null +++ b/build/win32/vs9/gi-extra-paths.vsprops @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioPropertySheet + ProjectType="Visual C++" + Version="8.00" + Name="giextrapaths" + InheritedPropertySheets=".\gi-build-defines.vsprops" + > + <!-- PythonDir currently needs to point to a 32-bit/x86 Python 2.6/2.7 installation --> + <UserMacro + Name="PythonDir" + Value="c:\\python27" + /> + <!-- PythonDirX64 currently needs to point to a x86-64/x64 Python 2.6/2.7 installation --> + <UserMacro + Name="PythonDirX64" + Value="c:\\python27.x64" + /> +</VisualStudioPropertySheet> diff --git a/build/win32/vs9/gi-gen-srcs.vsprops b/build/win32/vs9/gi-gen-srcs.vsprops new file mode 100644 index 00000000..3b9c0b0d --- /dev/null +++ b/build/win32/vs9/gi-gen-srcs.vsprops @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioPropertySheet + ProjectType="Visual C++" + Version="8.00" + Name="gigensrcsprops" + InheritedPropertySheets=".\gi-extra-paths.vsprops" + > + <UserMacro + Name="CopyConfigH" + Value=" +copy ..\..\..\config.h.win32 ..\..\..\config.h + " + /> + <UserMacro + Name="CopyGIRScanner" + Value=" +copy ..\..\..\tools\g-ir-scanner.in ..\..\..\tools\g-ir-scanner + " + /> + <UserMacro + Name="CopyGIRDocTool" + Value=" +copy ..\..\..\tools\g-ir-doc-tool.in ..\..\..\tools\g-ir-doc-tool + " + /> + <UserMacro + Name="CopyGIRAnnotationTool" + Value=" +copy ..\..\..\tools\g-ir-annotation-tool.in ..\..\..\tools\g-ir-annotation-tool + " + /> + <UserMacro + Name="GenerateGIRDef" + Value=" +echo EXPORTS > $(DefDir)\girepository.def
 +cl -EP ..\..\..\girepository\girepository.symbols >> $(DefDir)\girepository.def
 + " + /> +</VisualStudioPropertySheet> diff --git a/build/win32/vs9/gi-install.vspropsin b/build/win32/vs9/gi-install.vspropsin new file mode 100644 index 00000000..eb898d8d --- /dev/null +++ b/build/win32/vs9/gi-install.vspropsin @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioPropertySheet + ProjectType="Visual C++" + Version="8.00" + Name="giinstallprops" + InheritedPropertySheets=".\gi-build-defines.vsprops" + > + <UserMacro + Name="GIDoInstall" + Value=" +mkdir $(CopyDir)
 +mkdir $(CopyDir)\bin
 +copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\$(LibGIDllPrefix)girepository$(LibGIDllSuffix).dll $(CopyDir)\bin
 +copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\g-ir-compiler.exe $(CopyDir)\bin
 +copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\g-ir-generate.exe $(CopyDir)\bin
 +copy ..\..\..\tools\g-ir-annotation-tool $(CopyDir)\bin
 +copy ..\..\..\tools\g-ir-doc-tool $(CopyDir)\bin
 +copy ..\..\..\tools\g-ir-scanner $(CopyDir)\bin
 + +#include "gir.vs9.install" + +copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\_giscanner.pyd $(CopyDir)\lib\gobject-introspection\giscanner
 + +mkdir $(CopyDir)\share\gir-$(ApiVersion)
 + +mkdir $(CopyDir)\share\gobject-introspection-$(ApiVersion)
 + +copy ..\..\..\girepository\gdump.c $(CopyDir)\share\gobject-introspection-$(ApiVersion)
 + +mkdir $(CopyDir)\lib
 + +copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\girepository-$(ApiVersion).lib $(CopyDir)\lib
 + +echo Please note that building GObject-Introspection with Visual Studio is now a 2-step process
 +echo Please open the appropriate Visual Studio (or Windows SDK) command prompt and use the NMake Makefile
 +echo in SRC_ROOT\build\gi-introspection-msvc.mak to build the introspection files
 + " + /> +</VisualStudioPropertySheet> diff --git a/build/win32/vs9/gi-prebuild.vcproj b/build/win32/vs9/gi-prebuild.vcproj new file mode 100644 index 00000000..8f911ef9 --- /dev/null +++ b/build/win32/vs9/gi-prebuild.vcproj @@ -0,0 +1,201 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="gi-prebuild" + ProjectGUID="{2093D218-190E-4194-9421-3BA7CBF33B11}" + RootNamespace="giprebuild" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + <Platform + Name="x64" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + InheritedPropertySheets=".\gi-gen-srcs.vsprops" + ConfigurationType="10" + CharacterSet="2" + DeleteExtensionsOnClean="" + > + </Configuration> + <Configuration + Name="Debug|x64" + InheritedPropertySheets=".\gi-gen-srcs.vsprops" + ConfigurationType="10" + CharacterSet="2" + DeleteExtensionsOnClean="" + > + </Configuration> + <Configuration + Name="Release|Win32" + InheritedPropertySheets=".\gi-gen-srcs.vsprops" + ConfigurationType="10" + CharacterSet="2" + WholeProgramOptimization="1" + DeleteExtensionsOnClean="" + > + </Configuration> + <Configuration + Name="Release|x64" + InheritedPropertySheets=".\gi-gen-srcs.vsprops" + ConfigurationType="10" + CharacterSet="2" + WholeProgramOptimization="1" + DeleteExtensionsOnClean="" + > + </Configuration> + </Configurations> + <Files> + <Filter + Name="Resource Files" + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" + UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" + > + <File RelativePath="..\..\..\config.h.win32"> + <FileConfiguration Name="Debug|Win32"> + <Tool + Name="VCCustomBuildTool" + Description="Copying config.h from config.h.win32..." + CommandLine="$(CopyConfigH)" + Outputs="..\..\..\config.h" + /> + </FileConfiguration> + <FileConfiguration Name="Release|Win32"> + <Tool + Name="VCCustomBuildTool" + Description="Copying config.h from config.h.win32..." + CommandLine="$(CopyConfigH)" + Outputs="..\..\..\config.h" + /> + </FileConfiguration> + <FileConfiguration Name="Debug|x64"> + <Tool + Name="VCCustomBuildTool" + Description="Copying config.h from config.h.win32..." + CommandLine="$(CopyConfigH)" + Outputs="..\..\..\config.h" + /> + </FileConfiguration> + <FileConfiguration Name="Release|x64"> + <Tool + Name="VCCustomBuildTool" + Description="Copying config.h from config.h.win32..." + CommandLine="$(CopyConfigH)" + Outputs="..\..\..\config.h" + /> + </FileConfiguration> + </File> + <File RelativePath="..\..\..\tools\g-ir-scanner.in"> + <FileConfiguration Name="Debug|Win32"> + <Tool + Name="VCCustomBuildTool" + Description="Copying g-ir-scanner from g-ir-scanner.in..." + CommandLine="$(CopyGIRScanner)" + Outputs="..\..\..\tools\g-ir-scanner" + /> + </FileConfiguration> + <FileConfiguration Name="Release|Win32"> + <Tool + Name="VCCustomBuildTool" + Description="Copying g-ir-scanner from g-ir-scanner.in..." + CommandLine="$(CopyGIRScanner)" + Outputs="..\..\..\tools\g-ir-scanner" + /> + </FileConfiguration> + <FileConfiguration Name="Debug|x64"> + <Tool + Name="VCCustomBuildTool" + Description="Copying g-ir-scanner from g-ir-scanner.in..." + CommandLine="$(CopyGIRScanner)" + Outputs="..\..\..\tools\g-ir-scanner" + /> + </FileConfiguration> + <FileConfiguration Name="Release|x64"> + <Tool + Name="VCCustomBuildTool" + Description="Copying g-ir-scanner from g-ir-scanner.in..." + CommandLine="$(CopyGIRScanner)" + Outputs="..\..\..\tools\g-ir-scanner" + /> + </FileConfiguration> + </File> + <File RelativePath="..\..\..\tools\g-ir-doc-tool.in"> + <FileConfiguration Name="Debug|Win32"> + <Tool + Name="VCCustomBuildTool" + Description="Copying g-ir-doc-tool from g-ir-doc-tool.in..." + CommandLine="$(CopyGIRDocTool)" + Outputs="..\..\..\tools\g-ir-doc-tool" + /> + </FileConfiguration> + <FileConfiguration Name="Release|Win32"> + <Tool + Name="VCCustomBuildTool" + Description="Copying g-ir-doc-tool from g-ir-doc-tool.in..." + CommandLine="$(CopyGIRDocTool)" + Outputs="..\..\..\tools\g-ir-doc-tool" + /> + </FileConfiguration> + <FileConfiguration Name="Debug|x64"> + <Tool + Name="VCCustomBuildTool" + Description="Copying g-ir-doc-tool from g-ir-doc-tool.in..." + CommandLine="$(CopyGIRDocTool)" + Outputs="..\..\..\tools\g-ir-doc-tool" + /> + </FileConfiguration> + <FileConfiguration Name="Release|x64"> + <Tool + Name="VCCustomBuildTool" + Description="Copying g-ir-doc-tool from g-ir-doc-tool.in..." + CommandLine="$(CopyGIRDocTool)" + Outputs="..\..\..\tools\g-ir-doc-tool" + /> + </FileConfiguration> + </File> + <File RelativePath="..\..\..\tools\g-ir-annotation-tool.in"> + <FileConfiguration Name="Debug|Win32"> + <Tool + Name="VCCustomBuildTool" + Description="Copying g-ir-annotation-tool from g-ir-annotation-tool.in..." + CommandLine="$(CopyGIRAnnotationTool)" + Outputs="..\..\..\tools\g-ir-annotation-tool" + /> + </FileConfiguration> + <FileConfiguration Name="Release|Win32"> + <Tool + Name="VCCustomBuildTool" + Description="Copying g-ir-annotation-tool from g-ir-annotation-tool.in..." + CommandLine="$(CopyGIRAnnotationTool)" + Outputs="..\..\..\tools\g-ir-annotation-tool" + /> + </FileConfiguration> + <FileConfiguration Name="Debug|x64"> + <Tool + Name="VCCustomBuildTool" + Description="Copying g-ir-annotation-tool from g-ir-annotation-tool.in..." + CommandLine="$(CopyGIRAnnotationTool)" + Outputs="..\..\..\tools\g-ir-annotation-tool" + /> + </FileConfiguration> + <FileConfiguration Name="Release|x64"> + <Tool + Name="VCCustomBuildTool" + Description="Copying g-ir-annotation-tool from g-ir-annotation-tool.in..." + CommandLine="$(CopyGIRAnnotationTool)" + Outputs="..\..\..\tools\g-ir-annotation-tool" + /> + </FileConfiguration> + </File> + </Filter> + </Files> +</VisualStudioProject> diff --git a/build/win32/vs9/gi-version-paths.vsprops b/build/win32/vs9/gi-version-paths.vsprops new file mode 100644 index 00000000..13a2579a --- /dev/null +++ b/build/win32/vs9/gi-version-paths.vsprops @@ -0,0 +1,57 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioPropertySheet + ProjectType="Visual C++" + Version="8.00" + Name="giversionpaths" + > + <UserMacro + Name="VSVER" + Value="9" + /> + <UserMacro + Name="GlibEtcInstallRoot" + Value="$(SolutionDir)\..\..\..\..\vs$(VSVer)\$(PlatformName)" + /> + <UserMacro + Name="BASE_GI_DIR" + Value="$(SolutionDir)\..\..\.." + /> + <UserMacro + Name="CopyDir" + Value="$(GlibEtcInstallRoot)" + /> + <UserMacro + Name="ApiVersion" + Value="1.0" + /> + <UserMacro + Name="DefDir" + Value="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj\$(ProjectName)" + /> + <UserMacro + Name="LibGILibtoolCompatibleDllPrefix" + Value="lib" + /> + <UserMacro + Name="LibGILibtoolCompatibleDllSuffix" + Value="-$(ApiVersion)-0" + /> + <UserMacro + Name="LibGISeparateVSDllPrefix" + Value="" + /> + <UserMacro + Name="LibGISeparateVSDllSuffix" + Value="-1-vs$(VSVer)" + /> + <!-- Change these two to LibGILibtoolCompatibleDllPrefix and + LibGILibtoolCompatibleDllSuffix if that is what you want --> + <UserMacro + Name="LibGIDllPrefix" + Value="$(LibGISeparateVSDllPrefix)" + /> + <UserMacro + Name="LibGIDllSuffix" + Value="$(LibGISeparateVSDllSuffix)" + /> +</VisualStudioPropertySheet> diff --git a/build/win32/vs9/gimarshallingtests.vcproj b/build/win32/vs9/gimarshallingtests.vcproj index eb970926..89b850cf 100644 --- a/build/win32/vs9/gimarshallingtests.vcproj +++ b/build/win32/vs9/gimarshallingtests.vcproj @@ -22,13 +22,10 @@ <Configuration Name="Debug|Win32" ConfigurationType="2" - InheritedPropertySheets=".\gir.vsprops" + InheritedPropertySheets=".\gi-build-defines.vsprops" CharacterSet="2" > <Tool - Name="VCPreBuildEventTool" - /> - <Tool Name="VCCLCompilerTool" Optimization="0" PreprocessorDefinitions="_DEBUG" @@ -46,21 +43,18 @@ ModuleDefinitionFile="..\$(ProjectName).def" GenerateDebugInformation="true" SubSystem="2" - ImportLibrary="$(TargetDir)$(ProjectName)-$(GIApiVersion).lib" + ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib" TargetMachine="1" /> </Configuration> <Configuration Name="Release|Win32" ConfigurationType="2" - InheritedPropertySheets=".\gir.vsprops" + InheritedPropertySheets=".\gi-build-defines.vsprops" CharacterSet="2" WholeProgramOptimization="1" > <Tool - Name="VCPreBuildEventTool" - /> - <Tool Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" @@ -80,20 +74,17 @@ SubSystem="2" OptimizeReferences="2" EnableCOMDATFolding="2" - ImportLibrary="$(TargetDir)$(ProjectName)-$(GIApiVersion).lib" + ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib" TargetMachine="1" /> </Configuration> <Configuration Name="Debug|x64" ConfigurationType="2" - InheritedPropertySheets=".\gir.vsprops" + InheritedPropertySheets=".\gi-build-defines.vsprops" CharacterSet="2" > <Tool - Name="VCPreBuildEventTool" - /> - <Tool Name="VCMIDLTool" TargetEnvironment="3" /> @@ -115,21 +106,18 @@ ModuleDefinitionFile="..\$(ProjectName).def" GenerateDebugInformation="true" SubSystem="2" - ImportLibrary="$(TargetDir)$(ProjectName)-$(GIApiVersion).lib" + ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib" TargetMachine="17" /> </Configuration> <Configuration Name="Release|x64" ConfigurationType="2" - InheritedPropertySheets=".\gir.vsprops" + InheritedPropertySheets=".\gi-build-defines.vsprops" CharacterSet="2" WholeProgramOptimization="1" > <Tool - Name="VCPreBuildEventTool" - /> - <Tool Name="VCMIDLTool" TargetEnvironment="3" /> @@ -153,7 +141,7 @@ SubSystem="2" OptimizeReferences="2" EnableCOMDATFolding="2" - ImportLibrary="$(TargetDir)$(ProjectName)-$(GIApiVersion).lib" + ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib" TargetMachine="17" /> </Configuration> diff --git a/build/win32/vs9/gir.vspropsin b/build/win32/vs9/gir.vspropsin deleted file mode 100644 index a42b214b..00000000 --- a/build/win32/vs9/gir.vspropsin +++ /dev/null @@ -1,170 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioPropertySheet - ProjectType="Visual C++" - Version="8.00" - Name="giprops" - OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin" - IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj\$(ProjectName)\" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\..\..;..\..\..\girepository;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include" - PreprocessorDefinitions="HAVE_CONFIG_H;WIN32" - ForcedIncludeFiles="msvc_recommended_pragmas.h" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="gio-2.0.lib gobject-2.0.lib gmodule-2.0.lib gthread-2.0.lib glib-2.0.lib" - AdditionalLibraryDirectories="$(GlibEtcInstallRoot)\lib" - /> - <Tool - Name="VCPreBuildEventTool" - CommandLine=" -if not exist ..\..\..\config.h copy ..\..\..\config.h.win32 ..\..\..\config.h
 -if not exist ..\..\..\tools\g-ir-scanner copy ..\..\..\tools\g-ir-scanner.in ..\..\..\tools\g-ir-scanner
 -if not exist ..\..\..\tools\g-ir-doc-tool copy ..\..\..\tools\g-ir-doc-tool.in ..\..\..\tools\g-ir-doc-tool
 -if not exist ..\..\..\tools\g-ir-annotation-tool copy ..\..\..\tools\g-ir-annotation-tool.in ..\..\..\tools\g-ir-annotation-tool
 -" - /> - <UserMacro - Name="GlibEtcInstallRoot" - Value="$(SolutionDir)\..\..\..\..\vs9\$(PlatformName)" - /> - <UserMacro - Name="VSVER" - Value="9" - /> - <UserMacro - Name="BASE_GI_DIR" - Value="$(SolutionDir)\..\..\.." - /> - <UserMacro - Name="CopyDir" - Value="$(GlibEtcInstallRoot)" - /> - <UserMacro - Name="GIApiVersion" - Value="1.0" - /> - <UserMacro - Name="DefDir" - Value="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj\$(ProjectName)" - /> - <UserMacro - Name="GenerateGIRDef" - Value=" - echo EXPORTS > $(DefDir)\girepository.def
 - cl -EP ..\..\..\girepository\girepository.symbols >> $(DefDir)\girepository.def
 - " - /> - <UserMacro - Name="GenEverythingH" - Value=" -if exist ..\..\..\tests\everything.h goto DONE_GEN_EVERYTHING_C
 -cd ..\..\..\tests
 -set PATH=$(GlibEtcInstallRoot)\bin;$(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin;%PYTHONDIR%;%PATH%
 -set PYTHONPATH=$(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin;$(BASE_GI_DIR)
 -set UNINSTALLED_INTROSPECTION_SRCDIR=$(BASE_GI_DIR)
 -python ..\tools\g-ir-scanner --verbose -I. --add-include-path=..\ --add-include-path=..\gir --generate-typelib-tests=Everything,everything.h,everything.c
 -cd $(SolutionDir)
 -:DONE_GEN_EVERYTHING_C
 - " - /> - <UserMacro - Name="GenerateGIR" - Value=" -@echo off
 -set CC=cl
 -if "$(MINGWDIR)" == "" goto ERR_NOGCC
 -if "$(PYTHONDIR)" == "" goto ERR_NOPYPATH
 -if "$(PKG_CONFIG_PATH)" == "" goto ERR_NOPKGCONFIG
 - -set PYTHONPATH=$(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin;$(BASE_GI_DIR)
 -set UNINSTALLED_INTROSPECTION_SRCDIR=$(BASE_GI_DIR)
 -set PATH=$(GlibEtcInstallRoot)\bin;$(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin;$(PATH);$(PYTHONDIR);$(MINGWDIR)\bin
 -set LIB=$(GlibEtcInstallRoot)\lib;$(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin;$(LIB);$(PYTHONDIR)\libs
 -set INCLUDE=$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(INCLUDE);$(PYTHONDIR)\include
 - -set PLAT=$(PlatformName)
 -set CONF=$(ConfigurationName)
 -set BASEDIR=$(GlibEtcInstallRoot)
 -set VSVER=$(VSVER)
 - -cd ..
 -call gengir.bat
 -cd .\vs$(VSVER)
 -goto DONE
 - -:ERR_NOGCC
 -echo You need a Windows GCC installation to preprocess the headers to generate .gir files
 -echo Please set MINGWDIR accordingly before launching the Project
 -goto DONE
 - -:ERR_NOPYPATH
 -echo You need a Python installation to build the Python module and run the Python scripts to generate .gir files
 -echo The Python installation needs to correspond to the configuration of your build, i.e. Win32 or x64
 -echo Please set PYTHONDIR accordingly before launching the Project
 -goto DONE
 - -:ERR_NOPKGCONFIG
 -echo You need pkg-config and need to set PKG_CONFIG_PATH to point to pkgconfig (.pc) files to generate .gir files
 -echo Please set PKG_CONFIG_PATH accordingly before launching the Project
 -goto DONE
 - -:DONE
 - " - /> - <UserMacro - Name="LibGILibtoolCompatibleDllPrefix" - Value="lib" - /> - <UserMacro - Name="LibGILibtoolCompatibleDllSuffix" - Value="-$(GIApiVersion)-0" - /> - <UserMacro - Name="LibGISeparateVS9DllPrefix" - Value="" - /> - <UserMacro - Name="LibGISeparateVS9DllSuffix" - Value="-1-vs9" - /> - <!-- Change these two to LibGILibtoolCompatibleDllPrefix and - LibGILibtoolCompatibleDllSuffix if that is what you want --> - <UserMacro - Name="LibGIDllPrefix" - Value="$(LibGISeparateVS9DllPrefix)" - /> - <UserMacro - Name="LibGIDllSuffix" - Value="$(LibGISeparateVS9DllSuffix)" - /> - <UserMacro - Name="GIDoInstall" - Value=" -mkdir $(CopyDir)
 -mkdir $(CopyDir)\bin
 -copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\$(LibGIDllPrefix)girepository$(LibGIDllSuffix).dll $(CopyDir)\bin
 -copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\g-ir-compiler.exe $(CopyDir)\bin
 -copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\g-ir-generate.exe $(CopyDir)\bin
 -copy ..\..\..\tools\g-ir-annotation-tool $(CopyDir)\bin
 -copy ..\..\..\tools\g-ir-doc-tool $(CopyDir)\bin
 -copy ..\..\..\tools\g-ir-scanner $(CopyDir)\bin
 - -#include "gir.vs9.install" - -copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\_giscanner.pyd $(CopyDir)\lib\gobject-introspection\giscanner
 - -mkdir $(CopyDir)\share\gir-$(GIApiVersion)
 -copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\share\gir-$(GIApiVersion)\*.gir $(CopyDir)\share\gir-$(GIApiVersion)
 - -mkdir $(CopyDir)\share\gobject-introspection-$(GIApiVersion)
 -copy ..\..\..\girepository\gdump.c $(CopyDir)\share\gobject-introspection-$(GIApiVersion)
 - -mkdir $(CopyDir)\lib\girepository-$(GIApiVersion)
 -copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\girepository-$(GIApiVersion).lib $(CopyDir)\lib
 -copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\lib\girepository-$(GIApiVersion)\*.typelib $(CopyDir)\lib\girepository-$(GIApiVersion)
 -" - /> -</VisualStudioPropertySheet> diff --git a/build/win32/vs9/girepository.vcprojin b/build/win32/vs9/girepository.vcprojin index 12436213..438aa3d4 100644 --- a/build/win32/vs9/girepository.vcprojin +++ b/build/win32/vs9/girepository.vcprojin @@ -22,17 +22,14 @@ <Configuration Name="Debug|Win32" ConfigurationType="2" - InheritedPropertySheets=".\gir.vsprops" + InheritedPropertySheets=".\gi-gen-srcs.vsprops" CharacterSet="2" > <Tool - Name="VCPreBuildEventTool" - /> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\girepository" - PreprocessorDefinitions="_DEBUG;G_IREPOSITORY_COMPILATION;FFI_BUILDING;DLL_EXPORT" + PreprocessorDefinitions="_DEBUG;$(GIRepositoryBuildDefines)" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -41,16 +38,6 @@ DebugInformationFormat="4" /> <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - CommandLine="$(GenerateGIRDef)" - /> - <Tool Name="VCLinkerTool" AdditionalDependencies="libffi.lib" OutputFile="$(OutDir)\$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll" @@ -58,26 +45,23 @@ ModuleDefinitionFile="$(IntDir)\girepository.def" GenerateDebugInformation="true" SubSystem="2" - ImportLibrary="$(TargetDir)$(ProjectName)-$(GIApiVersion).lib" + ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib" TargetMachine="1" /> </Configuration> <Configuration Name="Release|Win32" ConfigurationType="2" - InheritedPropertySheets=".\gir.vsprops" + InheritedPropertySheets=".\gi-gen-srcs.vsprops" CharacterSet="2" WholeProgramOptimization="1" > <Tool - Name="VCPreBuildEventTool" - /> - <Tool Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" AdditionalIncludeDirectories="..\..\..\girepository" - PreprocessorDefinitions="G_IREPOSITORY_COMPILATION;FFI_BUILDING;DLL_EXPORT" + PreprocessorDefinitions="$(GIRepositoryBuildDefines)" RuntimeLibrary="2" EnableFunctionLevelLinking="true" UsePrecompiledHeader="0" @@ -85,16 +69,6 @@ DebugInformationFormat="3" /> <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - CommandLine="$(GenerateGIRDef)" - /> - <Tool Name="VCLinkerTool" AdditionalDependencies="libffi.lib" OutputFile="$(OutDir)\$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll" @@ -104,20 +78,17 @@ SubSystem="2" OptimizeReferences="2" EnableCOMDATFolding="2" - ImportLibrary="$(TargetDir)$(ProjectName)-$(GIApiVersion).lib" + ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib" TargetMachine="1" /> </Configuration> <Configuration Name="Debug|x64" ConfigurationType="2" - InheritedPropertySheets=".\gir.vsprops" + InheritedPropertySheets=".\gi-gen-srcs.vsprops" CharacterSet="2" > <Tool - Name="VCPreBuildEventTool" - /> - <Tool Name="VCMIDLTool" TargetEnvironment="3" /> @@ -125,7 +96,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\girepository" - PreprocessorDefinitions="_DEBUG;G_IREPOSITORY_COMPILATION;FFI_BUILDING;DLL_EXPORT" + PreprocessorDefinitions="_DEBUG;$(GIRepositoryBuildDefines)" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -134,16 +105,6 @@ DebugInformationFormat="3" /> <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - CommandLine="$(GenerateGIRDef)" - /> - <Tool Name="VCLinkerTool" AdditionalDependencies="libffi.lib" OutputFile="$(OutDir)\$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll" @@ -151,21 +112,18 @@ ModuleDefinitionFile="$(IntDir)\girepository.def" GenerateDebugInformation="true" SubSystem="2" - ImportLibrary="$(TargetDir)$(ProjectName)-$(GIApiVersion).lib" + ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib" TargetMachine="17" /> </Configuration> <Configuration Name="Release|x64" ConfigurationType="2" - InheritedPropertySheets=".\gir.vsprops" + InheritedPropertySheets=".\gi-gen-srcs.vsprops" CharacterSet="2" WholeProgramOptimization="1" > <Tool - Name="VCPreBuildEventTool" - /> - <Tool Name="VCMIDLTool" TargetEnvironment="3" /> @@ -174,7 +132,7 @@ Optimization="2" EnableIntrinsicFunctions="true" AdditionalIncludeDirectories="..\..\..\girepository" - PreprocessorDefinitions="G_IREPOSITORY_COMPILATION;FFI_BUILDING;DLL_EXPORT" + PreprocessorDefinitions="$(GIRepositoryBuildDefines)" RuntimeLibrary="2" EnableFunctionLevelLinking="true" UsePrecompiledHeader="0" @@ -182,16 +140,6 @@ DebugInformationFormat="3" /> <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - CommandLine="$(GenerateGIRDef)" - /> - <Tool Name="VCLinkerTool" AdditionalDependencies="libffi.lib" OutputFile="$(OutDir)\$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll" @@ -201,7 +149,7 @@ SubSystem="2" OptimizeReferences="2" EnableCOMDATFolding="2" - ImportLibrary="$(TargetDir)$(ProjectName)-$(GIApiVersion).lib" + ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib" TargetMachine="17" /> </Configuration> @@ -226,7 +174,40 @@ Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" - > + > <File RelativePath="..\..\..\girepository\girepository.symbols"> + <FileConfiguration Name="Debug|Win32"> + <Tool + Name="VCCustomBuildTool" + Description="Generating $(DefDir)\girepository.def..." + CommandLine="$(GenerateGIRDef)" + Outputs="$(DefDir)\girepository.def" + /> + </FileConfiguration> + <FileConfiguration Name="Release|Win32"> + <Tool + Name="VCCustomBuildTool" + Description="Generating $(DefDir)\girepository.def..." + CommandLine="$(GenerateGIRDef)" + Outputs="$(DefDir)\girepository.def" + /> + </FileConfiguration> + <FileConfiguration Name="Debug|x64"> + <Tool + Name="VCCustomBuildTool" + Description="Generating $(DefDir)\girepository.def..." + CommandLine="$(GenerateGIRDef)" + Outputs="$(DefDir)\girepository.def" + /> + </FileConfiguration> + <FileConfiguration Name="Release|x64"> + <Tool + Name="VCCustomBuildTool" + Description="Generating $(DefDir)\girepository.def..." + CommandLine="$(GenerateGIRDef)" + Outputs="$(DefDir)\girepository.def" + /> + </FileConfiguration> + </File> </Filter> </Files> <Globals> diff --git a/build/win32/vs9/glib-print.vcproj b/build/win32/vs9/glib-print.vcproj index 0491ebac..f269dca8 100644 --- a/build/win32/vs9/glib-print.vcproj +++ b/build/win32/vs9/glib-print.vcproj @@ -22,13 +22,10 @@ <Configuration Name="Debug|Win32" ConfigurationType="1" - InheritedPropertySheets=".\gir.vsprops" + InheritedPropertySheets=".\gi-build-defines.vsprops" CharacterSet="2" > <Tool - Name="VCPreBuildEventTool" - /> - <Tool Name="VCCLCompilerTool" Optimization="0" PreprocessorDefinitions="_DEBUG" @@ -50,14 +47,11 @@ <Configuration Name="Release|Win32" ConfigurationType="1" - InheritedPropertySheets=".\gir.vsprops" + InheritedPropertySheets=".\gi-build-defines.vsprops" CharacterSet="2" WholeProgramOptimization="1" > <Tool - Name="VCPreBuildEventTool" - /> - <Tool Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" @@ -81,13 +75,10 @@ <Configuration Name="Debug|x64" ConfigurationType="1" - InheritedPropertySheets=".\gir.vsprops" + InheritedPropertySheets=".\gi-build-defines.vsprops" CharacterSet="2" > <Tool - Name="VCPreBuildEventTool" - /> - <Tool Name="VCMIDLTool" TargetEnvironment="3" /> @@ -113,14 +104,11 @@ <Configuration Name="Release|x64" ConfigurationType="1" - InheritedPropertySheets=".\gir.vsprops" + InheritedPropertySheets=".\gi-build-defines.vsprops" CharacterSet="2" WholeProgramOptimization="1" > <Tool - Name="VCPreBuildEventTool" - /> - <Tool Name="VCMIDLTool" TargetEnvironment="3" /> diff --git a/build/win32/vs9/gobject-introspection.sln b/build/win32/vs9/gobject-introspection.sln index 68eaf25c..25e3d957 100644 --- a/build/win32/vs9/gobject-introspection.sln +++ b/build/win32/vs9/gobject-introspection.sln @@ -1,7 +1,13 @@
Microsoft Visual Studio Solution File, Format Version 10.00
# Visual Studio 2008
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gi-prebuild", "gi-prebuild.vcproj", "{2093D218-190E-4194-9421-3BA7CBF33B11}"
+EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cmph", "cmph.vcproj", "{442C007E-D901-41DA-9706-5DB4AFB4C06B}"
+ ProjectSection(ProjectDependencies) = postProject
+ {2093D218-190E-4194-9421-3BA7CBF33B11} = {2093D218-190E-4194-9421-3BA7CBF33B11}
+ EndProjectSection
+EndProject
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cmph-bdz-test", "cmph-bdz-test.vcproj", "{E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}"
ProjectSection(ProjectDependencies) = postProject
@@ -14,6 +20,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "girepository", "girepositor EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_giscanner", "_giscanner.vcproj", "{8311394F-9114-4C97-80F2-51BCABA054C9}"
+ ProjectSection(ProjectDependencies) = postProject
+ {2093D218-190E-4194-9421-3BA7CBF33B11} = {2093D218-190E-4194-9421-3BA7CBF33B11}
+ EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glib-print", "glib-print.vcproj", "{2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}"
ProjectSection(ProjectDependencies) = postProject
@@ -32,12 +41,24 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g-ir-compiler", "g-ir-compi EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gimarshallingtests", "gimarshallingtests.vcproj", "{E2F8D205-0A53-4D40-9169-CE1EF2AAF203}"
+ ProjectSection(ProjectDependencies) = postProject
+ {2093D218-190E-4194-9421-3BA7CBF33B11} = {2093D218-190E-4194-9421-3BA7CBF33B11}
+ EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "regress", "regress.vcproj", "{0A4F3C2B-DEF6-4EEF-A9E7-60E975722B60}"
+ ProjectSection(ProjectDependencies) = postProject
+ {2093D218-190E-4194-9421-3BA7CBF33B11} = {2093D218-190E-4194-9421-3BA7CBF33B11}
+ EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "utility", "utility.vcproj", "{A1F07FDB-20BB-441E-A4D5-6C2CD3D69214}"
+ ProjectSection(ProjectDependencies) = postProject
+ {2093D218-190E-4194-9421-3BA7CBF33B11} = {2093D218-190E-4194-9421-3BA7CBF33B11}
+ EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "annotation", "annotation.vcproj", "{A70C7D31-0019-45D9-9537-BB1DB5F31886}"
+ ProjectSection(ProjectDependencies) = postProject
+ {2093D218-190E-4194-9421-3BA7CBF33B11} = {2093D218-190E-4194-9421-3BA7CBF33B11}
+ EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "foo", "foo.vcproj", "{CD6291E9-2FFA-4D71-94EB-6D1EDD52F1D1}"
ProjectSection(ProjectDependencies) = postProject
@@ -45,29 +66,29 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "foo", "foo.vcproj", "{CD629 EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testinherit", "testinherit.vcproj", "{3F2C9F08-7FB7-4465-BF24-84E083EC4913}"
+ ProjectSection(ProjectDependencies) = postProject
+ {2093D218-190E-4194-9421-3BA7CBF33B11} = {2093D218-190E-4194-9421-3BA7CBF33B11}
+ EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gettype", "gettype.vcproj", "{F7DCF92C-A570-4E0B-A357-2FF90E5FF1BA}"
+ ProjectSection(ProjectDependencies) = postProject
+ {2093D218-190E-4194-9421-3BA7CBF33B11} = {2093D218-190E-4194-9421-3BA7CBF33B11}
+ EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtkfrob", "gtkfrob.vcproj", "{95C833D3-6EC2-493D-969A-6082E5495F66}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sletter", "sletter.vcproj", "{86A35E44-E4C8-4628-87E9-942D136D72BC}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "everything", "everything.vcproj", "{2986281A-BD41-4BD1-8B43-25B7D7E7F234}"
ProjectSection(ProjectDependencies) = postProject
- {8311394F-9114-4C97-80F2-51BCABA054C9} = {8311394F-9114-4C97-80F2-51BCABA054C9}
+ {2093D218-190E-4194-9421-3BA7CBF33B11} = {2093D218-190E-4194-9421-3BA7CBF33B11}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "generate_typelibs", "generate_typelibs.vcproj", "{BE771349-F11E-42AE-A23F-DA083FDC6FB8}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sletter", "sletter.vcproj", "{86A35E44-E4C8-4628-87E9-942D136D72BC}"
ProjectSection(ProjectDependencies) = postProject
- {8311394F-9114-4C97-80F2-51BCABA054C9} = {8311394F-9114-4C97-80F2-51BCABA054C9}
- {5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774} = {5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}
+ {2093D218-190E-4194-9421-3BA7CBF33B11} = {2093D218-190E-4194-9421-3BA7CBF33B11}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "install", "install.vcproj", "{2093D218-190E-4194-9421-3BA7CBF33B10}"
ProjectSection(ProjectDependencies) = postProject
{F4E6621F-A7DD-4863-8CCF-BA04DFC601E3} = {F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}
{23E28245-8FC7-4B41-B1C5-8785BD4366A7} = {23E28245-8FC7-4B41-B1C5-8785BD4366A7}
- {BE771349-F11E-42AE-A23F-DA083FDC6FB8} = {BE771349-F11E-42AE-A23F-DA083FDC6FB8}
{8311394F-9114-4C97-80F2-51BCABA054C9} = {8311394F-9114-4C97-80F2-51BCABA054C9}
{5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774} = {5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}
EndProjectSection
@@ -80,6 +101,14 @@ Global Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {2093D218-190E-4194-9421-3BA7CBF33B11}.Debug|Win32.ActiveCfg = Debug|Win32
+ {2093D218-190E-4194-9421-3BA7CBF33B11}.Debug|Win32.Build.0 = Debug|Win32
+ {2093D218-190E-4194-9421-3BA7CBF33B11}.Debug|x64.ActiveCfg = Debug|x64
+ {2093D218-190E-4194-9421-3BA7CBF33B11}.Debug|x64.Build.0 = Debug|x64
+ {2093D218-190E-4194-9421-3BA7CBF33B11}.Release|Win32.ActiveCfg = Release|Win32
+ {2093D218-190E-4194-9421-3BA7CBF33B11}.Release|Win32.Build.0 = Release|Win32
+ {2093D218-190E-4194-9421-3BA7CBF33B11}.Release|x64.ActiveCfg = Release|x64
+ {2093D218-190E-4194-9421-3BA7CBF33B11}.Release|x64.Build.0 = Release|x64
{442C007E-D901-41DA-9706-5DB4AFB4C06B}.Debug|Win32.ActiveCfg = Debug|Win32
{442C007E-D901-41DA-9706-5DB4AFB4C06B}.Debug|Win32.Build.0 = Debug|Win32
{442C007E-D901-41DA-9706-5DB4AFB4C06B}.Debug|x64.ActiveCfg = Debug|x64
@@ -208,22 +237,6 @@ Global {86A35E44-E4C8-4628-87E9-942D136D72BC}.Release|Win32.Build.0 = Release|Win32
{86A35E44-E4C8-4628-87E9-942D136D72BC}.Release|x64.ActiveCfg = Release|x64
{86A35E44-E4C8-4628-87E9-942D136D72BC}.Release|x64.Build.0 = Release|x64
- {2986281A-BD41-4BD1-8B43-25B7D7E7F234}.Debug|Win32.ActiveCfg = Debug|Win32
- {2986281A-BD41-4BD1-8B43-25B7D7E7F234}.Debug|Win32.Build.0 = Debug|Win32
- {2986281A-BD41-4BD1-8B43-25B7D7E7F234}.Debug|x64.ActiveCfg = Debug|x64
- {2986281A-BD41-4BD1-8B43-25B7D7E7F234}.Debug|x64.Build.0 = Debug|x64
- {2986281A-BD41-4BD1-8B43-25B7D7E7F234}.Release|Win32.ActiveCfg = Release|Win32
- {2986281A-BD41-4BD1-8B43-25B7D7E7F234}.Release|Win32.Build.0 = Release|Win32
- {2986281A-BD41-4BD1-8B43-25B7D7E7F234}.Release|x64.ActiveCfg = Release|x64
- {2986281A-BD41-4BD1-8B43-25B7D7E7F234}.Release|x64.Build.0 = Release|x64
- {BE771349-F11E-42AE-A23F-DA083FDC6FB8}.Debug|Win32.ActiveCfg = Debug|Win32
- {BE771349-F11E-42AE-A23F-DA083FDC6FB8}.Debug|Win32.Build.0 = Debug|Win32
- {BE771349-F11E-42AE-A23F-DA083FDC6FB8}.Debug|x64.ActiveCfg = Debug|x64
- {BE771349-F11E-42AE-A23F-DA083FDC6FB8}.Debug|x64.Build.0 = Debug|x64
- {BE771349-F11E-42AE-A23F-DA083FDC6FB8}.Release|Win32.ActiveCfg = Release|Win32
- {BE771349-F11E-42AE-A23F-DA083FDC6FB8}.Release|Win32.Build.0 = Release|Win32
- {BE771349-F11E-42AE-A23F-DA083FDC6FB8}.Release|x64.ActiveCfg = Release|x64
- {BE771349-F11E-42AE-A23F-DA083FDC6FB8}.Release|x64.Build.0 = Release|x64
{2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|Win32.ActiveCfg = Debug|Win32
{2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|Win32.Build.0 = Debug|Win32
{2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|x64.ActiveCfg = Debug|x64
diff --git a/build/win32/vs9/gtkfrob.vcproj b/build/win32/vs9/gtkfrob.vcproj index c9cc0727..41eeb980 100644 --- a/build/win32/vs9/gtkfrob.vcproj +++ b/build/win32/vs9/gtkfrob.vcproj @@ -22,13 +22,10 @@ <Configuration Name="Debug|Win32" ConfigurationType="2" - InheritedPropertySheets=".\gir.vsprops" + InheritedPropertySheets=".\gi-build-defines.vsprops" CharacterSet="2" > <Tool - Name="VCPreBuildEventTool" - /> - <Tool Name="VCCLCompilerTool" Optimization="0" PreprocessorDefinitions="_DEBUG" @@ -46,21 +43,18 @@ ModuleDefinitionFile="..\$(ProjectName).def" GenerateDebugInformation="true" SubSystem="2" - ImportLibrary="$(TargetDir)$(ProjectName)-$(GIApiVersion).lib" + ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib" TargetMachine="1" /> </Configuration> <Configuration Name="Release|Win32" ConfigurationType="2" - InheritedPropertySheets=".\gir.vsprops" + InheritedPropertySheets=".\gi-build-defines.vsprops" CharacterSet="2" WholeProgramOptimization="1" > <Tool - Name="VCPreBuildEventTool" - /> - <Tool Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" @@ -80,20 +74,17 @@ SubSystem="2" OptimizeReferences="2" EnableCOMDATFolding="2" - ImportLibrary="$(TargetDir)$(ProjectName)-$(GIApiVersion).lib" + ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib" TargetMachine="1" /> </Configuration> <Configuration Name="Debug|x64" ConfigurationType="2" - InheritedPropertySheets=".\gir.vsprops" + InheritedPropertySheets=".\gi-build-defines.vsprops" CharacterSet="2" > <Tool - Name="VCPreBuildEventTool" - /> - <Tool Name="VCMIDLTool" TargetEnvironment="3" /> @@ -115,21 +106,18 @@ ModuleDefinitionFile="..\$(ProjectName).def" GenerateDebugInformation="true" SubSystem="2" - ImportLibrary="$(TargetDir)$(ProjectName)-$(GIApiVersion).lib" + ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib" TargetMachine="17" /> </Configuration> <Configuration Name="Release|x64" ConfigurationType="2" - InheritedPropertySheets=".\gir.vsprops" + InheritedPropertySheets=".\gi-build-defines.vsprops" CharacterSet="2" WholeProgramOptimization="1" > <Tool - Name="VCPreBuildEventTool" - /> - <Tool Name="VCMIDLTool" TargetEnvironment="3" /> @@ -153,7 +141,7 @@ SubSystem="2" OptimizeReferences="2" EnableCOMDATFolding="2" - ImportLibrary="$(TargetDir)$(ProjectName)-$(GIApiVersion).lib" + ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib" TargetMachine="17" /> </Configuration> diff --git a/build/win32/vs9/install.vcproj b/build/win32/vs9/install.vcproj index 04cda9c7..58ad177b 100644 --- a/build/win32/vs9/install.vcproj +++ b/build/win32/vs9/install.vcproj @@ -21,7 +21,7 @@ <Configurations> <Configuration Name="Debug|Win32" - InheritedPropertySheets=".\gir.vsprops" + InheritedPropertySheets=".\gi-install.vsprops" OutputDirectory="$(GlibEtcInstallRoot)" ConfigurationType="10" CharacterSet="2" @@ -34,7 +34,7 @@ </Configuration> <Configuration Name="Debug|x64" - InheritedPropertySheets=".\gir.vsprops" + InheritedPropertySheets=".\gi-install.vsprops" OutputDirectory="$(GlibEtcInstallRoot)" ConfigurationType="10" CharacterSet="2" @@ -47,7 +47,7 @@ </Configuration> <Configuration Name="Release|Win32" - InheritedPropertySheets=".\gir.vsprops" + InheritedPropertySheets=".\gi-install.vsprops" OutputDirectory="$(GlibEtcInstallRoot)" ConfigurationType="10" CharacterSet="2" @@ -61,7 +61,7 @@ </Configuration> <Configuration Name="Release|x64" - InheritedPropertySheets=".\gir.vsprops" + InheritedPropertySheets=".\gi-install.vsprops" OutputDirectory="$(GlibEtcInstallRoot)" ConfigurationType="10" CharacterSet="2" diff --git a/build/win32/vs9/regress.vcproj b/build/win32/vs9/regress.vcproj index 6f557353..ab956cab 100644 --- a/build/win32/vs9/regress.vcproj +++ b/build/win32/vs9/regress.vcproj @@ -22,13 +22,10 @@ <Configuration Name="Debug|Win32" ConfigurationType="2" - InheritedPropertySheets=".\gir.vsprops" + InheritedPropertySheets=".\gi-build-defines.vsprops" CharacterSet="2" > <Tool - Name="VCPreBuildEventTool" - /> - <Tool Name="VCCLCompilerTool" Optimization="0" PreprocessorDefinitions="_DEBUG" @@ -47,21 +44,18 @@ ModuleDefinitionFile="..\$(ProjectName).def" GenerateDebugInformation="true" SubSystem="2" - ImportLibrary="$(TargetDir)$(ProjectName)-$(GIApiVersion).lib" + ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib" TargetMachine="1" /> </Configuration> <Configuration Name="Release|Win32" ConfigurationType="2" - InheritedPropertySheets=".\gir.vsprops" + InheritedPropertySheets=".\gi-build-defines.vsprops" CharacterSet="2" WholeProgramOptimization="1" > <Tool - Name="VCPreBuildEventTool" - /> - <Tool Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" @@ -82,20 +76,17 @@ SubSystem="2" OptimizeReferences="2" EnableCOMDATFolding="2" - ImportLibrary="$(TargetDir)$(ProjectName)-$(GIApiVersion).lib" + ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib" TargetMachine="1" /> </Configuration> <Configuration Name="Debug|x64" ConfigurationType="2" - InheritedPropertySheets=".\gir.vsprops" + InheritedPropertySheets=".\gi-build-defines.vsprops" CharacterSet="2" > <Tool - Name="VCPreBuildEventTool" - /> - <Tool Name="VCMIDLTool" TargetEnvironment="3" /> @@ -118,21 +109,18 @@ ModuleDefinitionFile="..\$(ProjectName).def" GenerateDebugInformation="true" SubSystem="2" - ImportLibrary="$(TargetDir)$(ProjectName)-$(GIApiVersion).lib" + ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib" TargetMachine="17" /> </Configuration> <Configuration Name="Release|x64" ConfigurationType="2" - InheritedPropertySheets=".\gir.vsprops" + InheritedPropertySheets=".\gi-build-defines.vsprops" CharacterSet="2" WholeProgramOptimization="1" > <Tool - Name="VCPreBuildEventTool" - /> - <Tool Name="VCMIDLTool" TargetEnvironment="3" /> @@ -157,7 +145,7 @@ SubSystem="2" OptimizeReferences="2" EnableCOMDATFolding="2" - ImportLibrary="$(TargetDir)$(ProjectName)-$(GIApiVersion).lib" + ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib" TargetMachine="17" /> </Configuration> diff --git a/build/win32/vs9/sletter.vcproj b/build/win32/vs9/sletter.vcproj index 706166b2..aaef2650 100644 --- a/build/win32/vs9/sletter.vcproj +++ b/build/win32/vs9/sletter.vcproj @@ -22,13 +22,10 @@ <Configuration Name="Debug|Win32" ConfigurationType="2" - InheritedPropertySheets=".\gir.vsprops" + InheritedPropertySheets=".\gi-build-defines.vsprops" CharacterSet="2" > <Tool - Name="VCPreBuildEventTool" - /> - <Tool Name="VCCLCompilerTool" Optimization="0" PreprocessorDefinitions="_DEBUG" @@ -46,21 +43,18 @@ ModuleDefinitionFile="..\$(ProjectName).def" GenerateDebugInformation="true" SubSystem="2" - ImportLibrary="$(TargetDir)$(ProjectName)-$(GIApiVersion).lib" + ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib" TargetMachine="1" /> </Configuration> <Configuration Name="Release|Win32" ConfigurationType="2" - InheritedPropertySheets=".\gir.vsprops" + InheritedPropertySheets=".\gi-build-defines.vsprops" CharacterSet="2" WholeProgramOptimization="1" > <Tool - Name="VCPreBuildEventTool" - /> - <Tool Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" @@ -80,20 +74,17 @@ SubSystem="2" OptimizeReferences="2" EnableCOMDATFolding="2" - ImportLibrary="$(TargetDir)$(ProjectName)-$(GIApiVersion).lib" + ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib" TargetMachine="1" /> </Configuration> <Configuration Name="Debug|x64" ConfigurationType="2" - InheritedPropertySheets=".\gir.vsprops" + InheritedPropertySheets=".\gi-build-defines.vsprops" CharacterSet="2" > <Tool - Name="VCPreBuildEventTool" - /> - <Tool Name="VCMIDLTool" TargetEnvironment="3" /> @@ -115,21 +106,18 @@ ModuleDefinitionFile="..\$(ProjectName).def" GenerateDebugInformation="true" SubSystem="2" - ImportLibrary="$(TargetDir)$(ProjectName)-$(GIApiVersion).lib" + ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib" TargetMachine="17" /> </Configuration> <Configuration Name="Release|x64" ConfigurationType="2" - InheritedPropertySheets=".\gir.vsprops" + InheritedPropertySheets=".\gi-build-defines.vsprops" CharacterSet="2" WholeProgramOptimization="1" > <Tool - Name="VCPreBuildEventTool" - /> - <Tool Name="VCMIDLTool" TargetEnvironment="3" /> @@ -153,7 +141,7 @@ SubSystem="2" OptimizeReferences="2" EnableCOMDATFolding="2" - ImportLibrary="$(TargetDir)$(ProjectName)-$(GIApiVersion).lib" + ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib" TargetMachine="17" /> </Configuration> diff --git a/build/win32/vs9/testinherit.vcproj b/build/win32/vs9/testinherit.vcproj index fd62b906..b5d26c7b 100644 --- a/build/win32/vs9/testinherit.vcproj +++ b/build/win32/vs9/testinherit.vcproj @@ -22,13 +22,10 @@ <Configuration Name="Debug|Win32" ConfigurationType="2" - InheritedPropertySheets=".\gir.vsprops" + InheritedPropertySheets=".\gi-build-defines.vsprops" CharacterSet="2" > <Tool - Name="VCPreBuildEventTool" - /> - <Tool Name="VCCLCompilerTool" Optimization="0" PreprocessorDefinitions="_DEBUG" @@ -46,21 +43,18 @@ ModuleDefinitionFile="..\$(ProjectName).def" GenerateDebugInformation="true" SubSystem="2" - ImportLibrary="$(TargetDir)$(ProjectName)-$(GIApiVersion).lib" + ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib" TargetMachine="1" /> </Configuration> <Configuration Name="Release|Win32" ConfigurationType="2" - InheritedPropertySheets=".\gir.vsprops" + InheritedPropertySheets=".\gi-build-defines.vsprops" CharacterSet="2" WholeProgramOptimization="1" > <Tool - Name="VCPreBuildEventTool" - /> - <Tool Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" @@ -80,20 +74,17 @@ SubSystem="2" OptimizeReferences="2" EnableCOMDATFolding="2" - ImportLibrary="$(TargetDir)$(ProjectName)-$(GIApiVersion).lib" + ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib" TargetMachine="1" /> </Configuration> <Configuration Name="Debug|x64" ConfigurationType="2" - InheritedPropertySheets=".\gir.vsprops" + InheritedPropertySheets=".\gi-build-defines.vsprops" CharacterSet="2" > <Tool - Name="VCPreBuildEventTool" - /> - <Tool Name="VCMIDLTool" TargetEnvironment="3" /> @@ -115,21 +106,18 @@ ModuleDefinitionFile="..\$(ProjectName).def" GenerateDebugInformation="true" SubSystem="2" - ImportLibrary="$(TargetDir)$(ProjectName)-$(GIApiVersion).lib" + ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib" TargetMachine="17" /> </Configuration> <Configuration Name="Release|x64" ConfigurationType="2" - InheritedPropertySheets=".\gir.vsprops" + InheritedPropertySheets=".\gi-build-defines.vsprops" CharacterSet="2" WholeProgramOptimization="1" > <Tool - Name="VCPreBuildEventTool" - /> - <Tool Name="VCMIDLTool" TargetEnvironment="3" /> @@ -153,7 +141,7 @@ SubSystem="2" OptimizeReferences="2" EnableCOMDATFolding="2" - ImportLibrary="$(TargetDir)$(ProjectName)-$(GIApiVersion).lib" + ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib" TargetMachine="17" /> </Configuration> diff --git a/build/win32/vs9/utility.vcproj b/build/win32/vs9/utility.vcproj index 7d510324..44251dd3 100644 --- a/build/win32/vs9/utility.vcproj +++ b/build/win32/vs9/utility.vcproj @@ -22,13 +22,10 @@ <Configuration Name="Debug|Win32" ConfigurationType="2" - InheritedPropertySheets=".\gir.vsprops" + InheritedPropertySheets=".\gi-build-defines.vsprops" CharacterSet="2" > <Tool - Name="VCPreBuildEventTool" - /> - <Tool Name="VCCLCompilerTool" Optimization="0" PreprocessorDefinitions="_DEBUG" @@ -46,21 +43,18 @@ ModuleDefinitionFile="..\$(ProjectName).def" GenerateDebugInformation="true" SubSystem="2" - ImportLibrary="$(TargetDir)$(ProjectName)-$(GIApiVersion).lib" + ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib" TargetMachine="1" /> </Configuration> <Configuration Name="Release|Win32" ConfigurationType="2" - InheritedPropertySheets=".\gir.vsprops" + InheritedPropertySheets=".\gi-build-defines.vsprops" CharacterSet="2" WholeProgramOptimization="1" > <Tool - Name="VCPreBuildEventTool" - /> - <Tool Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" @@ -80,20 +74,17 @@ SubSystem="2" OptimizeReferences="2" EnableCOMDATFolding="2" - ImportLibrary="$(TargetDir)$(ProjectName)-$(GIApiVersion).lib" + ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib" TargetMachine="1" /> </Configuration> <Configuration Name="Debug|x64" ConfigurationType="2" - InheritedPropertySheets=".\gir.vsprops" + InheritedPropertySheets=".\gi-build-defines.vsprops" CharacterSet="2" > <Tool - Name="VCPreBuildEventTool" - /> - <Tool Name="VCMIDLTool" TargetEnvironment="3" /> @@ -115,21 +106,18 @@ ModuleDefinitionFile="..\$(ProjectName).def" GenerateDebugInformation="true" SubSystem="2" - ImportLibrary="$(TargetDir)$(ProjectName)-$(GIApiVersion).lib" + ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib" TargetMachine="17" /> </Configuration> <Configuration Name="Release|x64" ConfigurationType="2" - InheritedPropertySheets=".\gir.vsprops" + InheritedPropertySheets=".\gi-build-defines.vsprops" CharacterSet="2" WholeProgramOptimization="1" > <Tool - Name="VCPreBuildEventTool" - /> - <Tool Name="VCMIDLTool" TargetEnvironment="3" /> @@ -153,7 +141,7 @@ SubSystem="2" OptimizeReferences="2" EnableCOMDATFolding="2" - ImportLibrary="$(TargetDir)$(ProjectName)-$(GIApiVersion).lib" + ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib" TargetMachine="17" /> </Configuration> |