From 39703440cfd4e7949708266270e447b7b22c9347 Mon Sep 17 00:00:00 2001
From: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Mon, 20 Jan 2014 16:30:22 +0800
Subject: 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.
---
 build/win32/vs10/gimarshallingtests.vcxproj | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'build/win32/vs10/gimarshallingtests.vcxproj')

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>
-- 
cgit v1.2.1