[gdk-pixbuf] Update Visual Studio property sheets
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gdk-pixbuf] Update Visual Studio property sheets
- Date: Thu, 21 Feb 2013 04:56:29 +0000 (UTC)
commit 8e1f08e6f4d7c2170d653cba50beaff8cd99408a
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Thu Feb 21 12:56:20 2013 +0800
Update Visual Studio property sheets
Improve consistency and cosmetic layout.
build/win32/vs10/gdk-pixbuf.props | 80 ++++++++++++++-----------
build/win32/vs10/gdk-pixbuf.vcxprojin | 16 +++---
build/win32/vs9/gdk-pixbuf.vcprojin | 16 +++---
build/win32/vs9/gdk-pixbuf.vsprops | 104 ++++++++++++++++++++-------------
4 files changed, 124 insertions(+), 92 deletions(-)
---
diff --git a/build/win32/vs10/gdk-pixbuf.props b/build/win32/vs10/gdk-pixbuf.props
index 474ab3c..64a4113 100644
--- a/build/win32/vs10/gdk-pixbuf.props
+++ b/build/win32/vs10/gdk-pixbuf.props
@@ -1,21 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0"
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
<PropertyGroup Label="UserMacros">
- <GdkPixbufApiVersion>2.0</GdkPixbufApiVersion>
+ <VSVer>10</VSVer>
+ <GlibEtcInstallRoot>..\..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot>
+ <GlibEtcInstallRootFromBuildWin32>..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRootFromBuildWin32>
+ <CopyDir>$(GlibEtcInstallRoot)</CopyDir>
+ <ApiVersion>2.0</ApiVersion>
<GdkPixbufBinaryVersion>2.10.0</GdkPixbufBinaryVersion>
<GDIP_MACROS>INCLUDE_gdiplus</GDIP_MACROS>
<NOGDIP_MACROS>JAS_WIN_MSVC_BUILD;INCLUDE_bmp;INCLUDE_gif;INCLUDE_ico;INCLUDE_jasper;INCLUDE_jpeg;INCLUDE_tiff;</NOGDIP_MACROS>
<MODULAR_MACROS>INCLUDE_ani;INCLUDE_pcx;INCLUDE_tga;INCLUDE_xbm;INCLUDE_png;INCLUDE_qtif;INCLUDE_pnm;INCLUDE_icns;INCLUDE_ras;INCLUDE_wbmp;INCLUDE_xpm</MODULAR_MACROS>
<GdkPixbufDummyPrefix>\"/dummy\"</GdkPixbufDummyPrefix>
<GdkPixbufPrefixDefine>GDK_PIXBUF_PREFIX="\"$(GdkPixbufDummyPrefix)\""</GdkPixbufPrefixDefine>
-
<GdkPixbufLibdirDefine>PIXBUF_LIBDIR="\"$(GdkPixbufDummyPrefix)/lib/gdk-pixbuf-$(GdkPixbufApiVersion)/$(GdkPixbufBinaryVersion)/loaders\""</GdkPixbufLibdirDefine>
+
<GdkPixbufLibdirDefine>PIXBUF_LIBDIR="\"$(GdkPixbufDummyPrefix)/lib/gdk-pixbuf-$(ApiVersion)/$(GdkPixbufBinaryVersion)/loaders\""</GdkPixbufLibdirDefine>
<GPBLibdirDefine>GDK_PIXBUF_LIBDIR="\"$(GdkPixbufDummyPrefix)/lib\""</GPBLibdirDefine>
<GdkPixbufBinVerDefine>GDK_PIXBUF_BINARY_VERSION="\"$(GdkPixbufBinaryVersion)\""</GdkPixbufBinVerDefine>
<GdkPixbufLocaleDir>GDK_PIXBUF_LOCALEDIR="\"./locale/\""</GdkPixbufLocaleDir>
<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>
+ <DefDir>$(SolutionDir)$(Configuration)\$(PlatformName)\obj\$(ProjectName)\</DefDir>
<GdkPixbufDoInstall>
echo on
@@ -28,44 +30,44 @@ copy $(Configuration)\$(Platform)\bin\*.exe $(CopyDir)\bin
mkdir $(CopyDir)\lib
-copy $(Configuration)\$(Platform)\bin\*-$(GdkPixbufApiVersion).lib $(CopyDir)\lib
+copy $(Configuration)\$(Platform)\bin\*-$(ApiVersion).lib $(CopyDir)\lib
-mkdir $(CopyDir)\include\gdk-pixbuf-$(GdkPixbufApiVersion)\gdk-pixbuf
+mkdir $(CopyDir)\include\gdk-pixbuf-$(ApiVersion)\gdk-pixbuf
-copy ..\..\..\gdk-pixbuf\gdk-pixbuf-animation.h
$(CopyDir)\include\gdk-pixbuf-$(GdkPixbufApiVersion)\gdk-pixbuf
+copy ..\..\..\gdk-pixbuf\gdk-pixbuf-animation.h $(CopyDir)\include\gdk-pixbuf-$(ApiVersion)\gdk-pixbuf
-copy ..\..\..\gdk-pixbuf\gdk-pixbuf-core.h $(CopyDir)\include\gdk-pixbuf-$(GdkPixbufApiVersion)\gdk-pixbuf
+copy ..\..\..\gdk-pixbuf\gdk-pixbuf-core.h $(CopyDir)\include\gdk-pixbuf-$(ApiVersion)\gdk-pixbuf
-copy ..\..\..\gdk-pixbuf\gdk-pixbuf-enum-types.h
$(CopyDir)\include\gdk-pixbuf-$(GdkPixbufApiVersion)\gdk-pixbuf
+copy ..\..\..\gdk-pixbuf\gdk-pixbuf-enum-types.h $(CopyDir)\include\gdk-pixbuf-$(ApiVersion)\gdk-pixbuf
-copy ..\..\..\gdk-pixbuf\gdk-pixbuf-features.h
$(CopyDir)\include\gdk-pixbuf-$(GdkPixbufApiVersion)\gdk-pixbuf
+copy ..\..\..\gdk-pixbuf\gdk-pixbuf-features.h $(CopyDir)\include\gdk-pixbuf-$(ApiVersion)\gdk-pixbuf
-copy ..\..\..\gdk-pixbuf\gdk-pixbuf-io.h $(CopyDir)\include\gdk-pixbuf-$(GdkPixbufApiVersion)\gdk-pixbuf
+copy ..\..\..\gdk-pixbuf\gdk-pixbuf-io.h $(CopyDir)\include\gdk-pixbuf-$(ApiVersion)\gdk-pixbuf
-copy ..\..\..\gdk-pixbuf\gdk-pixbuf-loader.h $(CopyDir)\include\gdk-pixbuf-$(GdkPixbufApiVersion)\gdk-pixbuf
+copy ..\..\..\gdk-pixbuf\gdk-pixbuf-loader.h $(CopyDir)\include\gdk-pixbuf-$(ApiVersion)\gdk-pixbuf
-copy ..\..\..\gdk-pixbuf\gdk-pixbuf-marshal.h $(CopyDir)\include\gdk-pixbuf-$(GdkPixbufApiVersion)\gdk-pixbuf
+copy ..\..\..\gdk-pixbuf\gdk-pixbuf-marshal.h $(CopyDir)\include\gdk-pixbuf-$(ApiVersion)\gdk-pixbuf
-copy ..\..\..\gdk-pixbuf\gdk-pixbuf-simple-anim.h
$(CopyDir)\include\gdk-pixbuf-$(GdkPixbufApiVersion)\gdk-pixbuf
+copy ..\..\..\gdk-pixbuf\gdk-pixbuf-simple-anim.h $(CopyDir)\include\gdk-pixbuf-$(ApiVersion)\gdk-pixbuf
-copy ..\..\..\gdk-pixbuf\gdk-pixbuf-transform.h
$(CopyDir)\include\gdk-pixbuf-$(GdkPixbufApiVersion)\gdk-pixbuf
+copy ..\..\..\gdk-pixbuf\gdk-pixbuf-transform.h $(CopyDir)\include\gdk-pixbuf-$(ApiVersion)\gdk-pixbuf
-copy ..\..\..\gdk-pixbuf\gdk-pixbuf.h $(CopyDir)\include\gdk-pixbuf-$(GdkPixbufApiVersion)\gdk-pixbuf
+copy ..\..\..\gdk-pixbuf\gdk-pixbuf.h $(CopyDir)\include\gdk-pixbuf-$(ApiVersion)\gdk-pixbuf
-copy ..\..\..\gdk-pixbuf\gdk-pixdata.h $(CopyDir)\include\gdk-pixbuf-$(GdkPixbufApiVersion)\gdk-pixbuf
+copy ..\..\..\gdk-pixbuf\gdk-pixdata.h $(CopyDir)\include\gdk-pixbuf-$(ApiVersion)\gdk-pixbuf
-copy $(Configuration)\$(Platform)\bin\*-$(GdkPixbufApiVersion).lib $(CopyDir)\\lib
+copy $(Configuration)\$(Platform)\bin\*-$(ApiVersion).lib $(CopyDir)\\lib
</GdkPixbufDoInstall>
<GdkPixbufGenerateGdkPixbufDef>echo EXPORTS >$(DefDir)\gdk-pixbuf.def && cl /EP -DG_OS_WIN32
-DINCLUDE_VARIABLES -DALL_FILES -DG_GNUC_CONST= -DG_GNUC_NULL_TERMINATED=
..\..\..\gdk-pixbuf\gdk-pixbuf.symbols >>$(DefDir)\gdk-pixbuf.def</GdkPixbufGenerateGdkPixbufDef>
<GdkPixbufLibtoolCompatibleDllPrefix>lib</GdkPixbufLibtoolCompatibleDllPrefix>
- <GdkPixbufLibtoolCompatibleDllSuffix>-$(GdkPixbufApiVersion)-0</GdkPixbufLibtoolCompatibleDllSuffix>
- <GdkPixbufSeparateVS10DllPrefix />
- <GdkPixbufSeparateVS10DllSuffix>-2-vs10</GdkPixbufSeparateVS10DllSuffix>
- <GdkPixbufDllPrefix>$(GdkPixbufSeparateVS10DllPrefix)</GdkPixbufDllPrefix>
- <GdkPixbufDllSuffix>$(GdkPixbufSeparateVS10DllSuffix)</GdkPixbufDllSuffix>
+ <GdkPixbufLibtoolCompatibleDllSuffix>-$(ApiVersion)-0</GdkPixbufLibtoolCompatibleDllSuffix>
+ <GdkPixbufSeparateVSDllPrefix />
+ <GdkPixbufSeparateVSDllSuffix>-2-vs$(VSVer)</GdkPixbufSeparateVSDllSuffix>
+ <GdkPixbufDllPrefix>$(GdkPixbufSeparateVSDllPrefix)</GdkPixbufDllPrefix>
+ <GdkPixbufDllSuffix>$(GdkPixbufSeparateVSDllSuffix)</GdkPixbufDllSuffix>
</PropertyGroup>
<PropertyGroup>
<_PropertySheetDisplayName>gdk-pixbufprops</_PropertySheetDisplayName>
@@ -106,8 +108,20 @@ glib-genmarshal.exe --prefix=_gdk_pixbuf_marshal ..\..\..\gdk-pixbuf\gdk-pixbuf-
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
- <BuildMacro Include="GdkPixbufApiVersion">
- <Value>$(GdkPixbufApiVersion)</Value>
+ <BuildMacro Include="VSVer">
+ <Value>$(VSVer)</Value>
+ </BuildMacro>
+ <BuildMacro Include="GlibEtcInstallRoot">
+ <Value>$(GlibEtcInstallRoot)</Value>
+ </BuildMacro>
+ <BuildMacro Include="GlibEtcInstallRootFromBuildWin32">
+ <Value>$(GlibEtcInstallRootFromBuildWin32)</Value>
+ </BuildMacro>
+ <BuildMacro Include="CopyDir">
+ <Value>$(CopyDir)</Value>
+ </BuildMacro>
+ <BuildMacro Include="ApiVersion">
+ <Value>$(ApiVersion)</Value>
</BuildMacro>
<BuildMacro Include="GdkPixbufBinaryVersion">
<Value>$(GdkPixbufBinaryVersion)</Value>
@@ -154,11 +168,11 @@ glib-genmarshal.exe --prefix=_gdk_pixbuf_marshal ..\..\..\gdk-pixbuf\gdk-pixbuf-
<BuildMacro Include="GdkPixbufLibtoolCompatibleDllSuffix">
<Value>$(GdkPixbufLibtoolCompatibleDllSuffix)</Value>
</BuildMacro>
- <BuildMacro Include="GdkPixbufSeparateVS10DllPrefix">
- <Value>$(GdkPixbufSeparateVS10DllPrefix)</Value>
+ <BuildMacro Include="GdkPixbufSeparateVSDllPrefix">
+ <Value>$(GdkPixbufSeparateVSDllPrefix)</Value>
</BuildMacro>
- <BuildMacro Include="GdkPixbufSeparateVS10DllSuffix">
- <Value>$(GdkPixbufSeparateVS10DllSuffix)</Value>
+ <BuildMacro Include="GdkPixbufSeparateVSDllSuffix">
+ <Value>$(GdkPixbufSeparateVSDllSuffix)</Value>
</BuildMacro>
<BuildMacro Include="GdkPixbufDllPrefix">
<Value>$(GdkPixbufDllPrefix)</Value>
@@ -166,12 +180,6 @@ glib-genmarshal.exe --prefix=_gdk_pixbuf_marshal ..\..\..\gdk-pixbuf\gdk-pixbuf-
<BuildMacro Include="GdkPixbufDllSuffix">
<Value>$(GdkPixbufDllSuffix)</Value>
</BuildMacro>
- <BuildMacro Include="GlibEtcInstallRoot">
- <Value>$(GlibEtcInstallRoot)</Value>
- </BuildMacro>
- <BuildMacro Include="CopyDir">
- <Value>$(CopyDir)</Value>
- </BuildMacro>
<BuildMacro Include="DefDir">
<Value>$(DefDir)</Value>
</BuildMacro>
diff --git a/build/win32/vs10/gdk-pixbuf.vcxprojin b/build/win32/vs10/gdk-pixbuf.vcxprojin
index 459a7e0..84e6a31 100644
--- a/build/win32/vs10/gdk-pixbuf.vcxprojin
+++ b/build/win32/vs10/gdk-pixbuf.vcxprojin
@@ -157,7 +157,7 @@
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
</DataExecutionPrevention>
- <ImportLibrary>$(OutDir)gdk_pixbuf-2.0.lib</ImportLibrary>
+ <ImportLibrary>$(OutDir)gdk_pixbuf-$(ApiVersion).lib</ImportLibrary>
<TargetMachine>MachineX86</TargetMachine>
</Link>
</ItemDefinitionGroup>
@@ -187,7 +187,7 @@
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
</DataExecutionPrevention>
- <ImportLibrary>$(OutDir)gdk_pixbuf-$(GdkPixbufApiVersion).lib</ImportLibrary>
+ <ImportLibrary>$(OutDir)gdk_pixbuf-$(ApiVersion).lib</ImportLibrary>
<TargetMachine>MachineX86</TargetMachine>
</Link>
</ItemDefinitionGroup>
@@ -213,7 +213,7 @@
<ModuleDefinitionFile>$(IntDir)\gdk-pixbuf.def</ModuleDefinitionFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
- <ImportLibrary>$(OutDir)gdk_pixbuf-$(GdkPixbufApiVersion).lib</ImportLibrary>
+ <ImportLibrary>$(OutDir)gdk_pixbuf-$(ApiVersion).lib</ImportLibrary>
<TargetMachine>MachineX64</TargetMachine>
</Link>
</ItemDefinitionGroup>
@@ -237,7 +237,7 @@
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
- <ImportLibrary>$(OutDir)gdk_pixbuf-$(GdkPixbufApiVersion).lib</ImportLibrary>
+ <ImportLibrary>$(OutDir)gdk_pixbuf-$(ApiVersion).lib</ImportLibrary>
<TargetMachine>MachineX64</TargetMachine>
</Link>
</ItemDefinitionGroup>
@@ -269,7 +269,7 @@
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
</DataExecutionPrevention>
- <ImportLibrary>$(OutDir)gdk_pixbuf-2.0.lib</ImportLibrary>
+ <ImportLibrary>$(OutDir)gdk_pixbuf-$(ApiVersion).lib</ImportLibrary>
<TargetMachine>MachineX86</TargetMachine>
</Link>
</ItemDefinitionGroup>
@@ -300,7 +300,7 @@
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
</DataExecutionPrevention>
- <ImportLibrary>$(OutDir)gdk_pixbuf-2.0.lib</ImportLibrary>
+ <ImportLibrary>$(OutDir)gdk_pixbuf-$(ApiVersion).lib</ImportLibrary>
<TargetMachine>MachineX86</TargetMachine>
</Link>
</ItemDefinitionGroup>
@@ -327,7 +327,7 @@
<ModuleDefinitionFile>$(IntDir)\gdk-pixbuf.def</ModuleDefinitionFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
- <ImportLibrary>$(OutDir)gdk_pixbuf-$(GdkPixbufApiVersion).lib</ImportLibrary>
+ <ImportLibrary>$(OutDir)gdk_pixbuf-$(ApiVersion).lib</ImportLibrary>
<TargetMachine>MachineX64</TargetMachine>
</Link>
</ItemDefinitionGroup>
@@ -352,7 +352,7 @@
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
- <ImportLibrary>$(OutDir)gdk_pixbuf-$(GdkPixbufApiVersion).lib</ImportLibrary>
+ <ImportLibrary>$(OutDir)gdk_pixbuf-$(ApiVersion).lib</ImportLibrary>
<TargetMachine>MachineX64</TargetMachine>
</Link>
</ItemDefinitionGroup>
diff --git a/build/win32/vs9/gdk-pixbuf.vcprojin b/build/win32/vs9/gdk-pixbuf.vcprojin
index ccbabab..4f7e623 100644
--- a/build/win32/vs9/gdk-pixbuf.vcprojin
+++ b/build/win32/vs9/gdk-pixbuf.vcprojin
@@ -56,7 +56,7 @@
SubSystem="2"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
- ImportLibrary="$(OutDir)/gdk_pixbuf-2.0.lib"
+ ImportLibrary="$(OutDir)/gdk_pixbuf-$(ApiVersion).lib"
TargetMachine="1"
/>
</Configuration>
@@ -96,7 +96,7 @@
EnableCOMDATFolding="2"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
- ImportLibrary="$(OutDir)/gdk_pixbuf-$(GdkPixbufApiVersion).lib"
+ ImportLibrary="$(OutDir)/gdk_pixbuf-$(ApiVersion).lib"
TargetMachine="1"
/>
</Configuration>
@@ -133,7 +133,7 @@
ModuleDefinitionFile="$(IntDir)\gdk-pixbuf.def"
GenerateDebugInformation="true"
SubSystem="2"
- ImportLibrary="$(OutDir)/gdk_pixbuf-$(GdkPixbufApiVersion).lib"
+ ImportLibrary="$(OutDir)/gdk_pixbuf-$(ApiVersion).lib"
TargetMachine="17"
/>
</Configuration>
@@ -168,7 +168,7 @@
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
- ImportLibrary="$(OutDir)/gdk_pixbuf-$(GdkPixbufApiVersion).lib"
+ ImportLibrary="$(OutDir)/gdk_pixbuf-$(ApiVersion).lib"
TargetMachine="17"
/>
</Configuration>
@@ -212,7 +212,7 @@
SubSystem="2"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
- ImportLibrary="$(OutDir)/gdk_pixbuf-2.0.lib"
+ ImportLibrary="$(OutDir)/gdk_pixbuf-$(ApiVersion).lib"
TargetMachine="1"
/>
</Configuration>
@@ -254,7 +254,7 @@
EnableCOMDATFolding="2"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
- ImportLibrary="$(OutDir)/gdk_pixbuf-2.0.lib"
+ ImportLibrary="$(OutDir)/gdk_pixbuf-$(ApiVersion).lib"
TargetMachine="1"
/>
</Configuration>
@@ -293,7 +293,7 @@
ModuleDefinitionFile="$(IntDir)\gdk-pixbuf.def"
GenerateDebugInformation="true"
SubSystem="2"
- ImportLibrary="$(OutDir)/gdk_pixbuf-$(GdkPixbufApiVersion).lib"
+ ImportLibrary="$(OutDir)/gdk_pixbuf-$(ApiVersion).lib"
TargetMachine="17"
/>
</Configuration>
@@ -330,7 +330,7 @@
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
- ImportLibrary="$(OutDir)/gdk_pixbuf-$(GdkPixbufApiVersion).lib"
+ ImportLibrary="$(OutDir)/gdk_pixbuf-$(ApiVersion).lib"
TargetMachine="17"
/>
</Configuration>
diff --git a/build/win32/vs9/gdk-pixbuf.vsprops b/build/win32/vs9/gdk-pixbuf.vsprops
index e881447..680cd1d 100644
--- a/build/win32/vs9/gdk-pixbuf.vsprops
+++ b/build/win32/vs9/gdk-pixbuf.vsprops
@@ -32,25 +32,41 @@ glib-genmarshal.exe --prefix=_gdk_pixbuf_marshal ..\..\..\gdk-pixbuf\gdk-pixbuf-
"
/>
<UserMacro
- Name="GdkPixbufApiVersion"
+ Name="VSVer"
+ Value="9"
+ />
+ <UserMacro
+ Name="GlibEtcInstallRoot"
+ Value="..\..\..\..\vs$(VSVer)\$(PlatformName)"
+ />
+ <UserMacro
+ Name="GlibEtcInstallRootFromBuildWin32"
+ Value="..\..\..\vs$(VSVer)\$(PlatformName)"
+ />
+ <UserMacro
+ Name="CopyDir"
+ Value="$(GlibEtcInstallRoot)"
+ />
+ <UserMacro
+ Name="ApiVersion"
Value="2.0"
/>
<UserMacro
Name="GdkPixbufBinaryVersion"
Value="2.10.0"
/>
- <UserMacro
+ <UserMacro
Name="GDIP_MACROS"
Value="INCLUDE_gdiplus"
/>
- <UserMacro
- Name="NOGDIP_MACROS"
- Value="JAS_WIN_MSVC_BUILD;INCLUDE_bmp;INCLUDE_gif;INCLUDE_ico;INCLUDE_jasper;INCLUDE_jpeg;INCLUDE_tiff;"
- />
- <UserMacro
- Name="MODULAR_MACROS"
-
Value="INCLUDE_ani;INCLUDE_pcx;INCLUDE_tga;INCLUDE_xbm;INCLUDE_png;INCLUDE_qtif;INCLUDE_pnm;INCLUDE_icns;INCLUDE_ras;INCLUDE_wbmp;INCLUDE_xpm"
- />
+ <UserMacro
+ Name="NOGDIP_MACROS"
+
Value="JAS_WIN_MSVC_BUILD;INCLUDE_bmp;INCLUDE_gif;INCLUDE_ico;INCLUDE_jasper;INCLUDE_jpeg;INCLUDE_tiff;"
+ />
+ <UserMacro
+ Name="MODULAR_MACROS"
+
Value="INCLUDE_ani;INCLUDE_pcx;INCLUDE_tga;INCLUDE_xbm;INCLUDE_png;INCLUDE_qtif;INCLUDE_pnm;INCLUDE_icns;INCLUDE_ras;INCLUDE_wbmp;INCLUDE_xpm"
+ />
<UserMacro
Name="GdkPixbufDummyPrefix"
Value="/dummy"
@@ -61,7 +77,7 @@ glib-genmarshal.exe --prefix=_gdk_pixbuf_marshal ..\..\..\gdk-pixbuf\gdk-pixbuf-
/>
<UserMacro
Name="GdkPixbufLibdirDefine"
-
Value="PIXBUF_LIBDIR="\"$(GdkPixbufDummyPrefix)/lib/gdk-pixbuf-$(GdkPixbufApiVersion)/$(GdkPixbufBinaryVersion)/loaders\"""
+
Value="PIXBUF_LIBDIR="\"$(GdkPixbufDummyPrefix)/lib/gdk-pixbuf-$(ApiVersion)/$(GdkPixbufBinaryVersion)/loaders\"""
/>
<UserMacro
Name="GPBLibdirDefine"
@@ -82,31 +98,43 @@ glib-genmarshal.exe --prefix=_gdk_pixbuf_marshal ..\..\..\gdk-pixbuf\gdk-pixbuf-
<UserMacro
Name="GdkPixbufDoInstall"
Value="
-echo on

-mkdir $(OutDir)\bin

-copy $(ConfigurationName)\$(PlatformName)\bin\*.dll $(OutDir)\bin

-copy $(ConfigurationName)\$(PlatformName)\bin\*.exe $(OutDir)\bin

+mkdir $(CopyDir)\bin

+copy $(ConfigurationName)\$(PlatformName)\bin\*.dll $(CopyDir)\bin

+copy $(ConfigurationName)\$(PlatformName)\bin\*.exe $(CopyDir)\bin

-mkdir $(OutDir)\lib

-copy $(ConfigurationName)\$(PlatformName)\bin\*-$(GdkPixbufApiVersion).lib $(OutDir)\lib

+mkdir $(CopyDir)\lib

+copy $(ConfigurationName)\$(PlatformName)\bin\*-$(ApiVersion).lib $(CopyDir)\lib

-mkdir $(OutDir)\include\gdk-pixbuf-$(GdkPixbufApiVersion)\gdk-pixbuf

-copy ..\..\..\gdk-pixbuf\gdk-pixbuf-animation.h
$(OutDir)\include\gdk-pixbuf-$(GdkPixbufApiVersion)\gdk-pixbuf

-copy ..\..\..\gdk-pixbuf\gdk-pixbuf-core.h
$(OutDir)\include\gdk-pixbuf-$(GdkPixbufApiVersion)\gdk-pixbuf

-copy ..\..\..\gdk-pixbuf\gdk-pixbuf-enum-types.h
$(OutDir)\include\gdk-pixbuf-$(GdkPixbufApiVersion)\gdk-pixbuf

-copy ..\..\..\gdk-pixbuf\gdk-pixbuf-features.h
$(OutDir)\include\gdk-pixbuf-$(GdkPixbufApiVersion)\gdk-pixbuf

-copy ..\..\..\gdk-pixbuf\gdk-pixbuf-io.h
$(OutDir)\include\gdk-pixbuf-$(GdkPixbufApiVersion)\gdk-pixbuf

-copy ..\..\..\gdk-pixbuf\gdk-pixbuf-loader.h
$(OutDir)\include\gdk-pixbuf-$(GdkPixbufApiVersion)\gdk-pixbuf

-copy ..\..\..\gdk-pixbuf\gdk-pixbuf-marshal.h
$(OutDir)\include\gdk-pixbuf-$(GdkPixbufApiVersion)\gdk-pixbuf

-copy ..\..\..\gdk-pixbuf\gdk-pixbuf-simple-anim.h
$(OutDir)\include\gdk-pixbuf-$(GdkPixbufApiVersion)\gdk-pixbuf

-copy ..\..\..\gdk-pixbuf\gdk-pixbuf-transform.h
$(OutDir)\include\gdk-pixbuf-$(GdkPixbufApiVersion)\gdk-pixbuf

-copy ..\..\..\gdk-pixbuf\gdk-pixbuf.h
$(OutDir)\include\gdk-pixbuf-$(GdkPixbufApiVersion)\gdk-pixbuf

-copy ..\..\..\gdk-pixbuf\gdk-pixdata.h
$(OutDir)\include\gdk-pixbuf-$(GdkPixbufApiVersion)\gdk-pixbuf

+mkdir $(CopyDir)\include\gdk-pixbuf-$(ApiVersion)\gdk-pixbuf

+copy ..\..\..\gdk-pixbuf\gdk-pixbuf-animation.h
$(CopyDir)\include\gdk-pixbuf-$(ApiVersion)\gdk-pixbuf

+copy ..\..\..\gdk-pixbuf\gdk-pixbuf-core.h $(CopyDir)\include\gdk-pixbuf-$(ApiVersion)\gdk-pixbuf

+copy ..\..\..\gdk-pixbuf\gdk-pixbuf-enum-types.h
$(CopyDir)\include\gdk-pixbuf-$(ApiVersion)\gdk-pixbuf

+copy ..\..\..\gdk-pixbuf\gdk-pixbuf-features.h
$(CopyDir)\include\gdk-pixbuf-$(ApiVersion)\gdk-pixbuf

+copy ..\..\..\gdk-pixbuf\gdk-pixbuf-io.h $(CopyDir)\include\gdk-pixbuf-$(ApiVersion)\gdk-pixbuf

+copy ..\..\..\gdk-pixbuf\gdk-pixbuf-loader.h
$(CopyDir)\include\gdk-pixbuf-$(ApiVersion)\gdk-pixbuf

+copy ..\..\..\gdk-pixbuf\gdk-pixbuf-marshal.h
$(CopyDir)\include\gdk-pixbuf-$(ApiVersion)\gdk-pixbuf

+copy ..\..\..\gdk-pixbuf\gdk-pixbuf-simple-anim.h
$(CopyDir)\include\gdk-pixbuf-$(ApiVersion)\gdk-pixbuf

+copy ..\..\..\gdk-pixbuf\gdk-pixbuf-transform.h
$(CopyDir)\include\gdk-pixbuf-$(ApiVersion)\gdk-pixbuf

+copy ..\..\..\gdk-pixbuf\gdk-pixbuf.h $(CopyDir)\include\gdk-pixbuf-$(ApiVersion)\gdk-pixbuf

+copy ..\..\..\gdk-pixbuf\gdk-pixdata.h $(CopyDir)\include\gdk-pixbuf-$(ApiVersion)\gdk-pixbuf

-copy $(ConfigurationName)\$(PlatformName)\bin\*-$(GdkPixbufApiVersion).lib $(OutDir)\lib

+copy $(ConfigurationName)\$(PlatformName)\bin\*-$(ApiVersion).lib $(CopyDir)\lib

"
/>
<UserMacro
+ Name="DoGenGir"
+ Value="
+set VSVER=$(VSVer)

+set CONF=$(ConfigurationName)

+set PLAT=$(PlatformName)

+set BASEDIR=$(GlibEtcInstallRootFromBuildWin32)

+cd ..

+
+call gengir_gdkpixbuf.bat

+cd vs$(VSVer)

+ "
+ />
+ <UserMacro
Name="GdkPixbufGenerateGdkPixbufDef"
Value="echo EXPORTS > $(IntDir)\gdk-pixbuf.def && cl /EP -DG_OS_WIN32
-DINCLUDE_VARIABLES -DALL_FILES -DG_GNUC_CONST= -DG_GNUC_NULL_TERMINATED=
..\..\..\gdk-pixbuf\gdk-pixbuf.symbols >>$(IntDir)gdk-pixbuf.def"
/>
@@ -116,28 +144,24 @@ copy $(ConfigurationName)\$(PlatformName)\bin\*-$(GdkPixbufApiVersion).lib $(Out
/>
<UserMacro
Name="GdkPixbufLibtoolCompatibleDllSuffix"
- Value="-$(GdkPixbufApiVersion)-0"
+ Value="-$(ApiVersion)-0"
/>
<UserMacro
- Name="GdkPixbufSeparateVS9DllPrefix"
+ Name="GdkPixbufSeparateVSDllPrefix"
Value=""
/>
<UserMacro
- Name="GdkPixbufSeparateVS9DllSuffix"
- Value="-2-vs9"
+ Name="GdkPixbufSeparateVSDllSuffix"
+ Value="-2-vs$(VSVer)"
/>
<!-- Change these two to GdkPixbufLibtoolCompatibleDllPrefix and
GdkPixbufLibtoolCompatibleDllSuffix if that is what you want -->
<UserMacro
Name="GdkPixbufDllPrefix"
- Value="$(GdkPixbufSeparateVS9DllPrefix)"
+ Value="$(GdkPixbufSeparateVSDllPrefix)"
/>
<UserMacro
Name="GdkPixbufDllSuffix"
- Value="$(GdkPixbufSeparateVS9DllSuffix)"
- />
- <UserMacro
- Name="GlibEtcInstallRoot"
- Value="..\..\..\..\vs9\$(PlatformName)"
+ Value="$(GdkPixbufSeparateVSDllSuffix)"
/>
</VisualStudioPropertySheet>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
