[gdk-pixbuf] VS support update: Generate .def file in compiler IntDir

From: Chun-wei Fan <fanchunwei src gnome org>
To: commits-list gnome org
Cc:
Subject: [gdk-pixbuf] VS support update: Generate .def file in compiler IntDir
Date: Wed, 8 Feb 2012 07:31:04 +0000 (UTC)
commit 950093974223a405f0b92979235866b7eb5ab3f7
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Wed Feb 8 15:30:09 2012 +0800

    VS support update: Generate .def file in compiler IntDir
    
    This will make the source directory a bit cleaner during the build, and
    will avoid confusion with the .def file that is dist in a release tarball
    (probably we should stop the distribution of the .def file for GDK-Pixbuf?)

 build/win32/vs10/gdk-pixbuf.props     |    9 ++++++++-
 build/win32/vs10/gdk-pixbuf.vcxprojin |   16 ++++++++--------
 build/win32/vs9/gdk-pixbuf.vcprojin   |   16 ++++++++--------
 build/win32/vs9/gdk-pixbuf.vsprops    |    2 +-
 4 files changed, 25 insertions(+), 18 deletions(-)
---
diff --git a/build/win32/vs10/gdk-pixbuf.props b/build/win32/vs10/gdk-pixbuf.props
index 45d7c19..6787a1a 100644
--- a/build/win32/vs10/gdk-pixbuf.props
+++ b/build/win32/vs10/gdk-pixbuf.props
@@ -15,6 +15,7 @@
     <GdkPixbufDefines>HAVE_CONFIG_H;GDK_PIXBUF_COMPILATION;GDK_PIXBUF_ENABLE_BACKEND;$(GdkPixbufPrefixDefine);$(GdkPixbufBinVerDefine);$(MODULAR_MACROS);$(GPBLibdirDefine);$(GdkPixbufLocaleDir)</GdkPixbufDefines>
 	<GlibEtcInstallRoot>..\..\..\..\vs10\$(Platform)</GlibEtcInstallRoot>
 	<CopyDir>$(GlibEtcInstallRoot)</CopyDir>
+	<DefDir>$(SolutionDir)$(Configuration)\$(PlatformName)\obj\$(ProjectName)\</DefDir>
     <GdkPixbufDoInstall>
 echo on
 
@@ -58,7 +59,7 @@ copy ..\..\..\gdk-pixbuf\gdk-pixdata.h $(CopyDir)\include\gdk-pixbuf-$(GdkPixbuf
 copy $(Configuration)\$(Platform)\bin\*-$(GdkPixbufApiVersion).lib $(CopyDir)\\lib
 
 </GdkPixbufDoInstall>
-    <GdkPixbufGenerateGdkPixbufDef>echo EXPORTS &gt;"..\..\..\gdk-pixbuf\gdk-pixbuf.def" &amp;&amp; cl /EP -DG_OS_WIN32 -DINCLUDE_VARIABLES -DALL_FILES -DG_GNUC_CONST= -DG_GNUC_NULL_TERMINATED= ..\..\..\gdk-pixbuf\gdk-pixbuf.symbols &gt;&gt;"..\..\..\gdk-pixbuf\gdk-pixbuf.def"</GdkPixbufGenerateGdkPixbufDef>
+    <GdkPixbufGenerateGdkPixbufDef>echo EXPORTS &gt;$(DefDir)\gdk-pixbuf.def &amp;&amp; cl /EP -DG_OS_WIN32 -DINCLUDE_VARIABLES -DALL_FILES -DG_GNUC_CONST= -DG_GNUC_NULL_TERMINATED= ..\..\..\gdk-pixbuf\gdk-pixbuf.symbols &gt;&gt;$(DefDir)\gdk-pixbuf.def</GdkPixbufGenerateGdkPixbufDef>
     <GdkPixbufLibtoolCompatibleDllPrefix>lib</GdkPixbufLibtoolCompatibleDllPrefix>
     <GdkPixbufLibtoolCompatibleDllSuffix>-$(GdkPixbufApiVersion)-0</GdkPixbufLibtoolCompatibleDllSuffix>
     <GdkPixbufSeparateVS10DllPrefix />
@@ -168,5 +169,11 @@ glib-genmarshal.exe --prefix=_gdk_pixbuf_marshal ..\..\..\gdk-pixbuf\gdk-pixbuf-
     <BuildMacro Include="GlibEtcInstallRoot">
       <Value>$(GlibEtcInstallRoot)</Value>
     </BuildMacro>
+    <BuildMacro Include="CopyDir">
+      <Value>$(CopyDir)</Value>
+    </BuildMacro>
+    <BuildMacro Include="DefDir">
+      <Value>$(DefDir)</Value>
+    </BuildMacro>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/build/win32/vs10/gdk-pixbuf.vcxprojin b/build/win32/vs10/gdk-pixbuf.vcxprojin
index e6b2126..16140fe 100644
--- a/build/win32/vs10/gdk-pixbuf.vcxprojin
+++ b/build/win32/vs10/gdk-pixbuf.vcxprojin
@@ -142,7 +142,7 @@
     <Link>
       <AdditionalDependencies>Gdiplus.lib;libpng15d.lib;zlib1d.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(GdkPixbufDllPrefix)gdk_pixbuf$(GdkPixbufDllSuffix).dll</OutputFile>
-      <ModuleDefinitionFile>..\..\..\gdk-pixbuf\gdk-pixbuf.def</ModuleDefinitionFile>
+      <ModuleDefinitionFile>$(IntDir)\gdk-pixbuf.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(OutDir)gdk-pixbuf.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
@@ -171,7 +171,7 @@
     <Link>
       <AdditionalDependencies>Gdiplus.lib;libpng15.lib;zlib1.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(GdkPixbufDllPrefix)gdk_pixbuf$(GdkPixbufDllSuffix).dll</OutputFile>
-      <ModuleDefinitionFile>..\..\..\gdk-pixbuf\gdk-pixbuf.def</ModuleDefinitionFile>
+      <ModuleDefinitionFile>$(IntDir)\gdk-pixbuf.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
@@ -202,7 +202,7 @@
     <Link>
       <AdditionalDependencies>Gdiplus.lib;libpng15d.lib;zlib1d.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(GdkPixbufDllPrefix)gdk_pixbuf$(GdkPixbufDllSuffix).dll</OutputFile>
-      <ModuleDefinitionFile>..\..\..\gdk-pixbuf\gdk-pixbuf.def</ModuleDefinitionFile>
+      <ModuleDefinitionFile>$(IntDir)\gdk-pixbuf.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <ImportLibrary>$(OutDir)gdk_pixbuf-$(GdkPixbufApiVersion).lib</ImportLibrary>
@@ -224,7 +224,7 @@
     <Link>
       <AdditionalDependencies>Gdiplus.lib;libpng15.lib;zlib1.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(GdkPixbufDllPrefix)gdk_pixbuf$(GdkPixbufDllSuffix).dll</OutputFile>
-      <ModuleDefinitionFile>..\..\..\gdk-pixbuf\gdk-pixbuf.def</ModuleDefinitionFile>
+      <ModuleDefinitionFile>$(IntDir)\gdk-pixbuf.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
@@ -254,7 +254,7 @@
       <AdditionalDependencies>libpng15d.lib;zlib1d.lib;intld.lib;libjpegd.lib;libjasper.lib;libtiffd_i.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(GdkPixbufDllPrefix)gdk_pixbuf$(GdkPixbufDllSuffix).dll</OutputFile>
       <IgnoreSpecificDefaultLibraries>LIBCMTD.lib;LIBCMT.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
-      <ModuleDefinitionFile>..\..\..\gdk-pixbuf\gdk-pixbuf.def</ModuleDefinitionFile>
+      <ModuleDefinitionFile>$(IntDir)\gdk-pixbuf.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(OutDir)gdk-pixbuf.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
@@ -284,7 +284,7 @@
       <AdditionalDependencies>libpng15.lib;zlib1.lib;intl.lib;libjpeg.lib;libjasper.lib;libtiff_i.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(GdkPixbufDllPrefix)gdk_pixbuf$(GdkPixbufDllSuffix).dll</OutputFile>
       <IgnoreSpecificDefaultLibraries>LIBCMT.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
-      <ModuleDefinitionFile>..\..\..\gdk-pixbuf\gdk-pixbuf.def</ModuleDefinitionFile>
+      <ModuleDefinitionFile>$(IntDir)\gdk-pixbuf.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
@@ -316,7 +316,7 @@
       <AdditionalDependencies>libpng15d.lib;zlib1d.lib;intld.lib;libjpegd.lib;libjasper.lib;libtiffd_i.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(GdkPixbufDllPrefix)gdk_pixbuf$(GdkPixbufDllSuffix).dll</OutputFile>
       <IgnoreSpecificDefaultLibraries>LIBCMTD.lib;LIBCMT.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
-      <ModuleDefinitionFile>..\..\..\gdk-pixbuf\gdk-pixbuf.def</ModuleDefinitionFile>
+      <ModuleDefinitionFile>$(IntDir)\gdk-pixbuf.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <ImportLibrary>$(OutDir)gdk_pixbuf-$(GdkPixbufApiVersion).lib</ImportLibrary>
@@ -339,7 +339,7 @@
       <AdditionalDependencies>libpng15.lib;zlib1.lib;intl.lib;libjpeg.lib;libjasper.lib;libtiff_i.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(GdkPixbufDllPrefix)gdk_pixbuf$(GdkPixbufDllSuffix).dll</OutputFile>
       <IgnoreSpecificDefaultLibraries>LIBCMT.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
-      <ModuleDefinitionFile>..\..\..\gdk-pixbuf\gdk-pixbuf.def</ModuleDefinitionFile>
+      <ModuleDefinitionFile>$(IntDir)\gdk-pixbuf.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
diff --git a/build/win32/vs9/gdk-pixbuf.vcprojin b/build/win32/vs9/gdk-pixbuf.vcprojin
index 91c8998..33a86e7 100644
--- a/build/win32/vs9/gdk-pixbuf.vcprojin
+++ b/build/win32/vs9/gdk-pixbuf.vcprojin
@@ -50,7 +50,7 @@
 				AdditionalDependencies="Gdiplus.lib libpng15d.lib zlib1d.lib"
 				OutputFile="$(OutDir)/$(GdkPixbufDllPrefix)gdk_pixbuf$(GdkPixbufDllSuffix).dll"
 				LinkIncremental="2"
-				ModuleDefinitionFile="..\..\..\gdk-pixbuf\gdk-pixbuf.def"
+				ModuleDefinitionFile="$(IntDir)\gdk-pixbuf.def"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)/gdk-pixbuf.pdb"
 				SubSystem="2"
@@ -89,7 +89,7 @@
 				AdditionalDependencies="Gdiplus.lib libpng15.lib zlib1.lib"
 				OutputFile="$(OutDir)/$(GdkPixbufDllPrefix)gdk_pixbuf$(GdkPixbufDllSuffix).dll"
 				LinkIncremental="1"
-				ModuleDefinitionFile="..\..\..\gdk-pixbuf\gdk-pixbuf.def"
+				ModuleDefinitionFile="$(IntDir)\gdk-pixbuf.def"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
@@ -130,7 +130,7 @@
 				AdditionalDependencies="Gdiplus.lib libpng15d.lib zlib1d.lib"
 				OutputFile="$(OutDir)\$(GdkPixbufDllPrefix)gdk_pixbuf$(GdkPixbufDllSuffix).dll"
 				LinkIncremental="2"
-				ModuleDefinitionFile="..\..\..\gdk-pixbuf\gdk-pixbuf.def"
+				ModuleDefinitionFile="$(IntDir)\gdk-pixbuf.def"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				ImportLibrary="$(OutDir)/gdk_pixbuf-$(GdkPixbufApiVersion).lib"
@@ -163,7 +163,7 @@
 				AdditionalDependencies="Gdiplus.lib libpng15.lib zlib1.lib"
 				OutputFile="$(OutDir)\$(GdkPixbufDllPrefix)gdk_pixbuf$(GdkPixbufDllSuffix).dll"
 				LinkIncremental="2"
-				ModuleDefinitionFile="..\..\..\gdk-pixbuf\gdk-pixbuf.def"
+				ModuleDefinitionFile="$(IntDir)\gdk-pixbuf.def"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
@@ -206,7 +206,7 @@
 				OutputFile="$(OutDir)/$(GdkPixbufDllPrefix)gdk_pixbuf$(GdkPixbufDllSuffix).dll"
 				LinkIncremental="2"
 				IgnoreDefaultLibraryNames="LIBCMTD.lib;LIBCMT.lib"
-				ModuleDefinitionFile="..\..\..\gdk-pixbuf\gdk-pixbuf.def"
+				ModuleDefinitionFile="$(IntDir)\gdk-pixbuf.def"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)/gdk-pixbuf.pdb"
 				SubSystem="2"
@@ -247,7 +247,7 @@
 				OutputFile="$(OutDir)/$(GdkPixbufDllPrefix)gdk_pixbuf$(GdkPixbufDllSuffix).dll"
 				LinkIncremental="1"
 				IgnoreDefaultLibraryNames="LIBCMT.lib"
-				ModuleDefinitionFile="..\..\..\gdk-pixbuf\gdk-pixbuf.def"
+				ModuleDefinitionFile="$(IntDir)\gdk-pixbuf.def"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
@@ -290,7 +290,7 @@
 				OutputFile="$(OutDir)\$(GdkPixbufDllPrefix)gdk_pixbuf$(GdkPixbufDllSuffix).dll"
 				LinkIncremental="2"
 				IgnoreDefaultLibraryNames="LIBCMTD.lib;LIBCMT.lib"
-				ModuleDefinitionFile="..\..\..\gdk-pixbuf\gdk-pixbuf.def"
+				ModuleDefinitionFile="$(IntDir)\gdk-pixbuf.def"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				ImportLibrary="$(OutDir)/gdk_pixbuf-$(GdkPixbufApiVersion).lib"
@@ -325,7 +325,7 @@
 				OutputFile="$(OutDir)\$(GdkPixbufDllPrefix)gdk_pixbuf$(GdkPixbufDllSuffix).dll"
 				LinkIncremental="2"
 				IgnoreDefaultLibraryNames="LIBCMT.lib"
-				ModuleDefinitionFile="..\..\..\gdk-pixbuf\gdk-pixbuf.def"
+				ModuleDefinitionFile="$(IntDir)\gdk-pixbuf.def"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
diff --git a/build/win32/vs9/gdk-pixbuf.vsprops b/build/win32/vs9/gdk-pixbuf.vsprops
index 447bde0..2ee1d71 100644
--- a/build/win32/vs9/gdk-pixbuf.vsprops
+++ b/build/win32/vs9/gdk-pixbuf.vsprops
@@ -108,7 +108,7 @@ copy $(ConfigurationName)\$(PlatformName)\bin\*-$(GdkPixbufApiVersion).lib $(Out
 	/>
 	<UserMacro
 		Name="GdkPixbufGenerateGdkPixbufDef"
-		Value="echo EXPORTS &gt;&quot;..\..\..\gdk-pixbuf\gdk-pixbuf.def&quot; &amp;&amp; cl /EP -DG_OS_WIN32 -DINCLUDE_VARIABLES -DALL_FILES -DG_GNUC_CONST= -DG_GNUC_NULL_TERMINATED= ..\..\..\gdk-pixbuf\gdk-pixbuf.symbols &gt;&gt;&quot;..\..\..\gdk-pixbuf\gdk-pixbuf.def&quot;"
+		Value="echo EXPORTS &gt; $(IntDir)\gdk-pixbuf.def &amp;&amp; cl /EP -DG_OS_WIN32 -DINCLUDE_VARIABLES -DALL_FILES -DG_GNUC_CONST= -DG_GNUC_NULL_TERMINATED= ..\..\..\gdk-pixbuf\gdk-pixbuf.symbols &gt;&gt;$(IntDir)gdk-pixbuf.def"
 	/>
 	<UserMacro
 		Name="GdkPixbufLibtoolCompatibleDllPrefix"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]