From 369a828af6ed09e7f4160cb353b9f9de2dfe495c Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Thu, 26 Dec 2013 19:37:08 +0800 Subject: Visual Studio Projects: Split the Property Sheets Split up the Visual Studio 2008/2010 property sheets, so that they can be more easily maintained; also remove items that aren't really needed for the build and merge a few items that are frequently repeated. Also make the copying of config.h from config.h.win32 done with a custom build rule so that we have a clean source tree when cleaning the build from the IDE. --- build/win32/vs10/Makefile.am | 30 ++-- build/win32/vs10/gdk-pixbuf-build-defines.props | 62 ++++++++ build/win32/vs10/gdk-pixbuf-csource.vcxproj | 8 +- build/win32/vs10/gdk-pixbuf-gen-srcs.props | 21 +++ build/win32/vs10/gdk-pixbuf-gengir.props | 26 ++++ build/win32/vs10/gdk-pixbuf-install.props | 55 +++++++ build/win32/vs10/gdk-pixbuf-pixdata.vcxproj | 8 +- build/win32/vs10/gdk-pixbuf-query-loaders.vcxproj | 8 +- build/win32/vs10/gdk-pixbuf-version-paths.props | 54 +++++++ build/win32/vs10/gdk-pixbuf.props | 180 ---------------------- build/win32/vs10/gdk-pixbuf.vcxprojin | 74 ++++++--- build/win32/vs10/gengir.vcxproj | 8 +- build/win32/vs10/install.vcxproj | 8 +- build/win32/vs9/Makefile.am | 22 +-- build/win32/vs9/gdk-pixbuf-build-defines.vsprops | 57 +++++++ build/win32/vs9/gdk-pixbuf-csource.vcproj | 8 +- build/win32/vs9/gdk-pixbuf-gen-srcs.vsprops | 16 ++ build/win32/vs9/gdk-pixbuf-gengir.vsprops | 21 +++ build/win32/vs9/gdk-pixbuf-install.vsprops | 32 ++++ build/win32/vs9/gdk-pixbuf-pixdata.vcproj | 8 +- build/win32/vs9/gdk-pixbuf-query-loaders.vcproj | 8 +- build/win32/vs9/gdk-pixbuf-version-paths.vsprops | 53 +++++++ build/win32/vs9/gdk-pixbuf.vcprojin | 114 +++++++++++--- build/win32/vs9/gdk-pixbuf.vsprops | 157 ------------------- build/win32/vs9/gengir.vcproj | 8 +- build/win32/vs9/install.vcproj | 8 +- 26 files changed, 607 insertions(+), 447 deletions(-) create mode 100644 build/win32/vs10/gdk-pixbuf-build-defines.props create mode 100644 build/win32/vs10/gdk-pixbuf-gen-srcs.props create mode 100644 build/win32/vs10/gdk-pixbuf-gengir.props create mode 100644 build/win32/vs10/gdk-pixbuf-install.props create mode 100644 build/win32/vs10/gdk-pixbuf-version-paths.props delete mode 100644 build/win32/vs10/gdk-pixbuf.props create mode 100644 build/win32/vs9/gdk-pixbuf-build-defines.vsprops create mode 100644 build/win32/vs9/gdk-pixbuf-gen-srcs.vsprops create mode 100644 build/win32/vs9/gdk-pixbuf-gengir.vsprops create mode 100644 build/win32/vs9/gdk-pixbuf-install.vsprops create mode 100644 build/win32/vs9/gdk-pixbuf-version-paths.vsprops delete mode 100644 build/win32/vs9/gdk-pixbuf.vsprops diff --git a/build/win32/vs10/Makefile.am b/build/win32/vs10/Makefile.am index 32067550e..ab593662e 100644 --- a/build/win32/vs10/Makefile.am +++ b/build/win32/vs10/Makefile.am @@ -1,17 +1,21 @@ EXTRA_DIST = \ - README.txt \ - gdk-pixbuf.sln \ - gdk-pixbuf.props \ - gdk-pixbuf.vcxproj \ - gdk-pixbuf.vcxprojin \ - gdk-pixbuf.vcxproj.filters \ - gdk-pixbuf.vcxproj.filtersin \ - gdk-pixbuf-csource.vcxproj \ - gdk-pixbuf-csource.vcxproj.filters \ - gdk-pixbuf-query-loaders.vcxproj \ - gdk-pixbuf-query-loaders.vcxproj.filters \ - gdk-pixbuf-pixdata.vcxproj \ - gdk-pixbuf-pixdata.vcxproj.filters \ + README.txt \ + gdk-pixbuf.sln \ + gdk-pixbuf-version-paths.props \ + gdk-pixbuf-build-defines.props \ + gdk-pixbuf-gen-srcs.props \ + gdk-pixbuf-gengir.props \ + gdk-pixbuf-install.props \ + gdk-pixbuf.vcxproj \ + gdk-pixbuf.vcxprojin \ + gdk-pixbuf.vcxproj.filters \ + gdk-pixbuf.vcxproj.filtersin \ + gdk-pixbuf-csource.vcxproj \ + gdk-pixbuf-csource.vcxproj.filters \ + gdk-pixbuf-query-loaders.vcxproj \ + gdk-pixbuf-query-loaders.vcxproj.filters \ + gdk-pixbuf-pixdata.vcxproj \ + gdk-pixbuf-pixdata.vcxproj.filters \ install.vcxproj \ gengir.vcxproj diff --git a/build/win32/vs10/gdk-pixbuf-build-defines.props b/build/win32/vs10/gdk-pixbuf-build-defines.props new file mode 100644 index 000000000..7370c4ea6 --- /dev/null +++ b/build/win32/vs10/gdk-pixbuf-build-defines.props @@ -0,0 +1,62 @@ + + + + + + + 2.10.0 + INCLUDE_gdiplus + JAS_WIN_MSVC_BUILD;INCLUDE_bmp;INCLUDE_gif;INCLUDE_ico;INCLUDE_jasper;INCLUDE_jpeg;INCLUDE_tiff; + INCLUDE_ani;INCLUDE_pcx;INCLUDE_tga;INCLUDE_xbm;INCLUDE_png;INCLUDE_qtif;INCLUDE_pnm;INCLUDE_icns;INCLUDE_ras;INCLUDE_wbmp;INCLUDE_xpm + /dummy + GDK_PIXBUF_PREFIX="$(GdkPixbufDummyPrefix)" + PIXBUF_LIBDIR="$(GdkPixbufDummyPrefix)/lib/gdk-pixbuf-$(ApiVersion)/$(GdkPixbufBinaryVersion)/loaders" + GDK_PIXBUF_BINARY_VERSION="$(GdkPixbufBinaryVersion)" + HAVE_CONFIG_H;GDK_PIXBUF_COMPILATION;GDK_PIXBUF_ENABLE_BACKEND;DLL_EXPORT;$(GdkPixbufPrefixDefine);$(GdkPixbufBinVerDefine);$(MODULAR_MACROS) + + + <_PropertySheetDisplayName>gdk-pixbufbuilddefinesprops + $(SolutionDir)$(Configuration)\$(PlatformName)\bin\ + $(SolutionDir)$(Configuration)\$(PlatformName)\obj\$(ProjectName)\ + + + + ..\..\..;..\..\..\gdk-pixbuf;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\atk-1.0;$(GlibEtcInstallRoot)\include\pango-1.0;%(AdditionalIncludeDirectories) + HAVE_CONFIG_H;G_DISABLE_SINGLE_INCLUDES;GDK_PIXBUF_DISABLE_SINGLE_INCLUDES;%(PreprocessorDefinitions) + msvc_recommended_pragmas.h;%(ForcedIncludeFiles) + + + gio-2.0.lib;gmodule-2.0.lib;gobject-2.0.lib;glib-2.0.lib;gthread-2.0.lib;intl.lib;%(AdditionalDependencies) + $(GlibEtcInstallRoot)\lib;%(AdditionalLibraryDirectories) + + + + + $(GdkPixbufBinaryVersion) + + + $(GDIP_MACROS) + + + $(NOGDIP_MACROS) + + + $(MODULAR_MACROS) + + + $(GdkPixbufDummyPrefix) + + + $(GdkPixbufPrefixDefine) + + + $(GdkPixbufLibdirDefine) + + + $(GdkPixbufBinVerDefine) + + + $(GdkPixbufDefines) + + + diff --git a/build/win32/vs10/gdk-pixbuf-csource.vcxproj b/build/win32/vs10/gdk-pixbuf-csource.vcxproj index 2171aa554..898492f74 100644 --- a/build/win32/vs10/gdk-pixbuf-csource.vcxproj +++ b/build/win32/vs10/gdk-pixbuf-csource.vcxproj @@ -50,19 +50,19 @@ - + - + - + - + diff --git a/build/win32/vs10/gdk-pixbuf-gen-srcs.props b/build/win32/vs10/gdk-pixbuf-gen-srcs.props new file mode 100644 index 000000000..69f247b12 --- /dev/null +++ b/build/win32/vs10/gdk-pixbuf-gen-srcs.props @@ -0,0 +1,21 @@ + + + + + + + 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 + copy ..\..\..\config.h.win32 ..\..\..\config.h + + + <_PropertySheetDisplayName>gdk-pixbufgensrcsprops + + + + $(GenerateGdkPixbufDef) + + + $(GenConfigH) + + + \ No newline at end of file diff --git a/build/win32/vs10/gdk-pixbuf-gengir.props b/build/win32/vs10/gdk-pixbuf-gengir.props new file mode 100644 index 000000000..bf515e0ff --- /dev/null +++ b/build/win32/vs10/gdk-pixbuf-gengir.props @@ -0,0 +1,26 @@ + + + + + + + +set VSVER=$(VSVer) +set CONF=$(Configuration) +set PLAT=$(Platform) +set BASEDIR=$(GlibEtcInstallRoot) +cd .. +call gengir_gdkpixbuf.bat + +cd vs$(VSVer) + + + + <_PropertySheetDisplayName>gdk-pixbufgengirprops + + + + $(DoGenGir) + + + \ No newline at end of file diff --git a/build/win32/vs10/gdk-pixbuf-install.props b/build/win32/vs10/gdk-pixbuf-install.props new file mode 100644 index 000000000..c39e08b86 --- /dev/null +++ b/build/win32/vs10/gdk-pixbuf-install.props @@ -0,0 +1,55 @@ + + + + + + + +echo on + +mkdir $(CopyDir)\bin + +copy $(Configuration)\$(Platform)\bin\*.dll $(CopyDir)\bin + +copy $(Configuration)\$(Platform)\bin\*.exe $(CopyDir)\bin + + +mkdir $(CopyDir)\lib + +copy $(Configuration)\$(Platform)\bin\*-$(ApiVersion).lib $(CopyDir)\lib + + +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 + + + + <_PropertySheetDisplayName>gdk-pixbufinstallprops + + + + $(GdkPixbufDoInstall) + + + diff --git a/build/win32/vs10/gdk-pixbuf-pixdata.vcxproj b/build/win32/vs10/gdk-pixbuf-pixdata.vcxproj index f646ee982..c23b8779b 100644 --- a/build/win32/vs10/gdk-pixbuf-pixdata.vcxproj +++ b/build/win32/vs10/gdk-pixbuf-pixdata.vcxproj @@ -51,19 +51,19 @@ - + - + - + - + diff --git a/build/win32/vs10/gdk-pixbuf-query-loaders.vcxproj b/build/win32/vs10/gdk-pixbuf-query-loaders.vcxproj index 96481846b..a87fa5dc5 100644 --- a/build/win32/vs10/gdk-pixbuf-query-loaders.vcxproj +++ b/build/win32/vs10/gdk-pixbuf-query-loaders.vcxproj @@ -51,19 +51,19 @@ - + - + - + - + diff --git a/build/win32/vs10/gdk-pixbuf-version-paths.props b/build/win32/vs10/gdk-pixbuf-version-paths.props new file mode 100644 index 000000000..33aee7ecf --- /dev/null +++ b/build/win32/vs10/gdk-pixbuf-version-paths.props @@ -0,0 +1,54 @@ + + + + 10 + $(SolutionDir)\..\..\..\..\vs$(VSVer)\$(Platform) + $(GlibEtcInstallRoot) + 2.0 + lib + -$(ApiVersion)-0 + + -2-vs$(VSVer) + $(GdkPixbufSeparateVSDllPrefix) + $(GdkPixbufSeparateVSDllSuffix) + $(SolutionDir)$(Configuration)\$(PlatformName)\obj\$(ProjectName)\ + + + <_PropertySheetDisplayName>gdk-versionpathsprops + + + + $(VSVer) + + + $(GlibEtcInstallRoot) + + + $(CopyDir) + + + $(ApiVersion) + + + $(GdkPixbufLibtoolCompatibleDllPrefix) + + + $(GdkPixbufLibtoolCompatibleDllSuffix) + + + $(GdkPixbufSeparateVSDllPrefix) + + + $(GdkPixbufSeparateVSDllSuffix) + + + $(GdkPixbufDllPrefix) + + + $(GdkPixbufDllSuffix) + + + $(DefDir) + + + \ No newline at end of file diff --git a/build/win32/vs10/gdk-pixbuf.props b/build/win32/vs10/gdk-pixbuf.props deleted file mode 100644 index 0b85e2d73..000000000 --- a/build/win32/vs10/gdk-pixbuf.props +++ /dev/null @@ -1,180 +0,0 @@ - - - - 10 - $(SolutionDir)\..\..\..\..\vs$(VSVer)\$(Platform) - $(GlibEtcInstallRoot) - 2.0 - 2.10.0 - INCLUDE_gdiplus - JAS_WIN_MSVC_BUILD;INCLUDE_bmp;INCLUDE_gif;INCLUDE_ico;INCLUDE_jasper;INCLUDE_jpeg;INCLUDE_tiff; - INCLUDE_ani;INCLUDE_pcx;INCLUDE_tga;INCLUDE_xbm;INCLUDE_png;INCLUDE_qtif;INCLUDE_pnm;INCLUDE_icns;INCLUDE_ras;INCLUDE_wbmp;INCLUDE_xpm - /dummy - GDK_PIXBUF_PREFIX="$(GdkPixbufDummyPrefix)" - PIXBUF_LIBDIR="$(GdkPixbufDummyPrefix)/lib/gdk-pixbuf-$(ApiVersion)/$(GdkPixbufBinaryVersion)/loaders" - GDK_PIXBUF_LIBDIR="$(GdkPixbufDummyPrefix)/lib" - GDK_PIXBUF_BINARY_VERSION="$(GdkPixbufBinaryVersion)" - GDK_PIXBUF_LOCALEDIR="./locale/" - HAVE_CONFIG_H;GDK_PIXBUF_COMPILATION;GDK_PIXBUF_ENABLE_BACKEND;$(GdkPixbufPrefixDefine);$(GdkPixbufBinVerDefine);$(MODULAR_MACROS);$(GPBLibdirDefine);$(GdkPixbufLocaleDir) - $(SolutionDir)$(Configuration)\$(PlatformName)\obj\$(ProjectName)\ - -echo on - -mkdir $(CopyDir)\bin - -copy $(Configuration)\$(Platform)\bin\*.dll $(CopyDir)\bin - -copy $(Configuration)\$(Platform)\bin\*.exe $(CopyDir)\bin - - -mkdir $(CopyDir)\lib - -copy $(Configuration)\$(Platform)\bin\*-$(ApiVersion).lib $(CopyDir)\lib - - -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 $(Configuration)\$(Platform)\bin\*-$(ApiVersion).lib $(CopyDir)\\lib - - - -set VSVER=$(VSVer) -set CONF=$(Configuration) -set PLAT=$(Platform) -set BASEDIR=$(GlibEtcInstallRoot) -cd .. -call gengir_gdkpixbuf.bat - -cd vs$(VSVer) - - 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 - lib - -$(ApiVersion)-0 - - -2-vs$(VSVer) - $(GdkPixbufSeparateVSDllPrefix) - $(GdkPixbufSeparateVSDllSuffix) - - - <_PropertySheetDisplayName>gdk-pixbufprops - $(SolutionDir)$(Configuration)\$(PlatformName)\bin\ - $(SolutionDir)$(Configuration)\$(PlatformName)\obj\$(ProjectName)\ - - - - ..\..\..;..\..\..\gdk-pixbuf;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\atk-1.0;$(GlibEtcInstallRoot)\include\pango-1.0;%(AdditionalIncludeDirectories) - HAVE_CONFIG_H;G_DISABLE_SINGLE_INCLUDES;GDK_PIXBUF_DISABLE_SINGLE_INCLUDES;%(PreprocessorDefinitions) - msvc_recommended_pragmas.h;%(ForcedIncludeFiles) - - - gio-2.0.lib;gmodule-2.0.lib;gobject-2.0.lib;glib-2.0.lib;gthread-2.0.lib;intl.lib;%(AdditionalDependencies) - $(GlibEtcInstallRoot)\lib;%(AdditionalLibraryDirectories) - - - -if exist ..\..\..\config.h goto DONE_CONFIG_H - -copy ..\..\..\config.h.win32 ..\..\..\config.h - -:DONE_CONFIG_H - - - - - - $(VSVer) - - - $(GlibEtcInstallRoot) - - - $(CopyDir) - - - $(ApiVersion) - - - $(GdkPixbufBinaryVersion) - - - $(GDIP_MACROS) - - - $(NOGDIP_MACROS) - - - $(MODULAR_MACROS) - - - $(GdkPixbufDummyPrefix) - - - $(GdkPixbufPrefixDefine) - - - $(GdkPixbufLibdirDefine) - - - $(GPBLibdirDefine) - - - $(GdkPixbufBinVerDefine) - - - $(GdkPixbufLocaleDir) - - - $(GdkPixbufDefines) - - - $(GdkPixbufDoInstall) - - - $(GdkPixbufGenerateGdkPixbufDef) - - - $(GdkPixbufLibtoolCompatibleDllPrefix) - - - $(GdkPixbufLibtoolCompatibleDllSuffix) - - - $(GdkPixbufSeparateVSDllPrefix) - - - $(GdkPixbufSeparateVSDllSuffix) - - - $(GdkPixbufDllPrefix) - - - $(GdkPixbufDllSuffix) - - - $(DefDir) - - - diff --git a/build/win32/vs10/gdk-pixbuf.vcxprojin b/build/win32/vs10/gdk-pixbuf.vcxprojin index 59ac99af2..8531329a5 100644 --- a/build/win32/vs10/gdk-pixbuf.vcxprojin +++ b/build/win32/vs10/gdk-pixbuf.vcxprojin @@ -85,35 +85,35 @@ - + - + - + - + - + - + - + - + @@ -135,7 +135,7 @@ %(AdditionalOptions) Disabled %(AdditionalIncludeDirectories) - _DEBUG;$(GdkPixbufDefines);$(GDIP_MACROS);DLL_EXPORT;%(PreprocessorDefinitions) + _DEBUG;$(GdkPixbufDefines);$(GDIP_MACROS);%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -163,7 +163,7 @@ %(AdditionalOptions) Full %(AdditionalIncludeDirectories) - $(GdkPixbufDefines);$(GDIP_MACROS);DLL_EXPORT;%(PreprocessorDefinitions) + $(GdkPixbufDefines);$(GDIP_MACROS);%(PreprocessorDefinitions) MultiThreadedDLL @@ -189,7 +189,7 @@ Disabled %(AdditionalIncludeDirectories) - _DEBUG;$(GdkPixbufDefines);$(GDIP_MACROS);DLL_EXPORT;%(PreprocessorDefinitions) + _DEBUG;$(GdkPixbufDefines);$(GDIP_MACROS);%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -210,7 +210,7 @@ - $(GdkPixbufDefines);$(GDIP_MACROS);DLL_EXPORT;%(PreprocessorDefinitions) + $(GdkPixbufDefines);$(GDIP_MACROS);%(PreprocessorDefinitions) MultiThreadedDLL @@ -234,7 +234,7 @@ Disabled %(AdditionalOptions) %(AdditionalIncludeDirectories) - $(GdkPixbufDefines);$(NOGDIP_MACROS);DLL_EXPORT;%(PreprocessorDefinitions) + $(GdkPixbufDefines);$(NOGDIP_MACROS);%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -263,7 +263,7 @@ %(AdditionalOptions) Full %(AdditionalIncludeDirectories) - $(GdkPixbufDefines);$(NOGDIP_MACROS);DLL_EXPORT;%(PreprocessorDefinitions) + $(GdkPixbufDefines);$(NOGDIP_MACROS);%(PreprocessorDefinitions) MultiThreadedDLL @@ -290,7 +290,7 @@ Disabled %(AdditionalIncludeDirectories) - _DEBUG;$(GdkPixbufDefines);$(NOGDIP_MACROS);DLL_EXPORT;%(PreprocessorDefinitions) + _DEBUG;$(GdkPixbufDefines);$(NOGDIP_MACROS);%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -312,7 +312,7 @@ - $(GdkPixbufDefines);$(NOGDIP_MACROS);DLL_EXPORT;%(PreprocessorDefinitions) + $(GdkPixbufDefines);$(NOGDIP_MACROS);%(PreprocessorDefinitions) MultiThreadedDLL @@ -441,30 +441,56 @@ + + Copying config.h from config.h.win32... + $(GenConfigH) + ..\..\..\config.h;%(Outputs) + Copying config.h from config.h.win32... + $(GenConfigH) + ..\..\..\config.h;%(Outputs) + Copying config.h from config.h.win32... + $(GenConfigH) + ..\..\..\config.h;%(Outputs) + Copying config.h from config.h.win32... + $(GenConfigH) + ..\..\..\config.h;%(Outputs) + Copying config.h from config.h.win32... + $(GenConfigH) + ..\..\..\config.h;%(Outputs) + Copying config.h from config.h.win32... + $(GenConfigH) + ..\..\..\config.h;%(Outputs) + Copying config.h from config.h.win32... + $(GenConfigH) + ..\..\..\config.h;%(Outputs) + Copying config.h from config.h.win32... + $(GenConfigH) + ..\..\..\config.h;%(Outputs) + Generating gdk-pixbuf.def... - $(GdkPixbufGenerateGdkPixbufDef) + $(GenerateGdkPixbufDef) $(IntDir)gdk-pixbuf.def;%(Outputs) Generating gdk-pixbuf.def... - $(GdkPixbufGenerateGdkPixbufDef) + $(GenerateGdkPixbufDef) $(IntDir)gdk-pixbuf.def;%(Outputs) Generating gdk-pixbuf.def... - $(GdkPixbufGenerateGdkPixbufDef) + $(GenerateGdkPixbufDef) $(IntDir)gdk-pixbuf.def;%(Outputs) Generating gdk-pixbuf.def... - $(GdkPixbufGenerateGdkPixbufDef) + $(GenerateGdkPixbufDef) $(IntDir)gdk-pixbuf.def;%(Outputs) Generating gdk-pixbuf.def... - $(GdkPixbufGenerateGdkPixbufDef) + $(GenerateGdkPixbufDef) $(IntDir)gdk-pixbuf.def;%(Outputs) Generating gdk-pixbuf.def... - $(GdkPixbufGenerateGdkPixbufDef) + $(GenerateGdkPixbufDef) $(IntDir)gdk-pixbuf.def;%(Outputs) Generating gdk-pixbuf.def... - $(GdkPixbufGenerateGdkPixbufDef) + $(GenerateGdkPixbufDef) $(IntDir)gdk-pixbuf.def;%(Outputs) Generating gdk-pixbuf.def... - $(GdkPixbufGenerateGdkPixbufDef) + $(GenerateGdkPixbufDef) $(IntDir)gdk-pixbuf.def;%(Outputs) diff --git a/build/win32/vs10/gengir.vcxproj b/build/win32/vs10/gengir.vcxproj index e8d9d13c6..39d6ad0bc 100644 --- a/build/win32/vs10/gengir.vcxproj +++ b/build/win32/vs10/gengir.vcxproj @@ -51,19 +51,19 @@ - + - + - + - + diff --git a/build/win32/vs10/install.vcxproj b/build/win32/vs10/install.vcxproj index 6d2384469..d90859732 100644 --- a/build/win32/vs10/install.vcxproj +++ b/build/win32/vs10/install.vcxproj @@ -51,19 +51,19 @@ - + - + - + - + diff --git a/build/win32/vs9/Makefile.am b/build/win32/vs9/Makefile.am index f2c69050d..f44dae848 100644 --- a/build/win32/vs9/Makefile.am +++ b/build/win32/vs9/Makefile.am @@ -1,12 +1,16 @@ -EXTRA_DIST = \ - README.txt \ - gdk-pixbuf.sln \ - gdk-pixbuf.vsprops \ - gdk-pixbuf.vcproj \ - gdk-pixbuf.vcprojin \ - gdk-pixbuf-csource.vcproj \ - gdk-pixbuf-query-loaders.vcproj \ - gdk-pixbuf-pixdata.vcproj \ +EXTRA_DIST = \ + README.txt \ + gdk-pixbuf.sln \ + gdk-pixbuf-version-paths.vsprops \ + gdk-pixbuf-build-defines.vsprops \ + gdk-pixbuf-gen-srcs.vsprops \ + gdk-pixbuf-gengir.vsprops \ + gdk-pixbuf-install.vsprops \ + gdk-pixbuf.vcproj \ + gdk-pixbuf.vcprojin \ + gdk-pixbuf-csource.vcproj \ + gdk-pixbuf-query-loaders.vcproj \ + gdk-pixbuf-pixdata.vcproj \ install.vcproj \ gengir.vcproj diff --git a/build/win32/vs9/gdk-pixbuf-build-defines.vsprops b/build/win32/vs9/gdk-pixbuf-build-defines.vsprops new file mode 100644 index 000000000..534dbf260 --- /dev/null +++ b/build/win32/vs9/gdk-pixbuf-build-defines.vsprops @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + diff --git a/build/win32/vs9/gdk-pixbuf-csource.vcproj b/build/win32/vs9/gdk-pixbuf-csource.vcproj index a11fb69b5..ad6a33c64 100644 --- a/build/win32/vs9/gdk-pixbuf-csource.vcproj +++ b/build/win32/vs9/gdk-pixbuf-csource.vcproj @@ -22,7 +22,7 @@ @@ -86,7 +86,7 @@ diff --git a/build/win32/vs9/gdk-pixbuf-gen-srcs.vsprops b/build/win32/vs9/gdk-pixbuf-gen-srcs.vsprops new file mode 100644 index 000000000..610feb2ff --- /dev/null +++ b/build/win32/vs9/gdk-pixbuf-gen-srcs.vsprops @@ -0,0 +1,16 @@ + + + + + diff --git a/build/win32/vs9/gdk-pixbuf-gengir.vsprops b/build/win32/vs9/gdk-pixbuf-gengir.vsprops new file mode 100644 index 000000000..294e25306 --- /dev/null +++ b/build/win32/vs9/gdk-pixbuf-gengir.vsprops @@ -0,0 +1,21 @@ + + + + diff --git a/build/win32/vs9/gdk-pixbuf-install.vsprops b/build/win32/vs9/gdk-pixbuf-install.vsprops new file mode 100644 index 000000000..58a7652dc --- /dev/null +++ b/build/win32/vs9/gdk-pixbuf-install.vsprops @@ -0,0 +1,32 @@ + + + + diff --git a/build/win32/vs9/gdk-pixbuf-pixdata.vcproj b/build/win32/vs9/gdk-pixbuf-pixdata.vcproj index 192480d1e..6c07e981d 100644 --- a/build/win32/vs9/gdk-pixbuf-pixdata.vcproj +++ b/build/win32/vs9/gdk-pixbuf-pixdata.vcproj @@ -21,7 +21,7 @@ @@ -50,7 +50,7 @@ diff --git a/build/win32/vs9/gdk-pixbuf-query-loaders.vcproj b/build/win32/vs9/gdk-pixbuf-query-loaders.vcproj index 65447013a..e244d8074 100644 --- a/build/win32/vs9/gdk-pixbuf-query-loaders.vcproj +++ b/build/win32/vs9/gdk-pixbuf-query-loaders.vcproj @@ -22,7 +22,7 @@ @@ -118,7 +118,7 @@ diff --git a/build/win32/vs9/gdk-pixbuf-version-paths.vsprops b/build/win32/vs9/gdk-pixbuf-version-paths.vsprops new file mode 100644 index 000000000..1f167bd88 --- /dev/null +++ b/build/win32/vs9/gdk-pixbuf-version-paths.vsprops @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + diff --git a/build/win32/vs9/gdk-pixbuf.vcprojin b/build/win32/vs9/gdk-pixbuf.vcprojin index 4034aa369..be3098f90 100644 --- a/build/win32/vs9/gdk-pixbuf.vcprojin +++ b/build/win32/vs9/gdk-pixbuf.vcprojin @@ -22,7 +22,7 @@ @@ -105,7 +105,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" - PreprocessorDefinitions="_DEBUG;$(GdkPixbufDefines);$(GDIP_MACROS);DLL_EXPORT" + PreprocessorDefinitions="_DEBUG;$(GdkPixbufDefines);$(GDIP_MACROS)" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -127,7 +127,7 @@ @@ -136,7 +136,7 @@ /> @@ -248,7 +248,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" - PreprocessorDefinitions="_DEBUG;$(GdkPixbufDefines);$(NOGDIP_MACROS);DLL_EXPORT" + PreprocessorDefinitions="_DEBUG;$(GdkPixbufDefines);$(NOGDIP_MACROS)" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -272,7 +272,7 @@ @@ -281,7 +281,7 @@ /> + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -446,7 +512,7 @@ @@ -454,7 +520,7 @@ @@ -462,7 +528,7 @@ @@ -470,7 +536,7 @@ @@ -478,7 +544,7 @@ @@ -486,7 +552,7 @@ @@ -494,7 +560,7 @@ diff --git a/build/win32/vs9/gdk-pixbuf.vsprops b/build/win32/vs9/gdk-pixbuf.vsprops deleted file mode 100644 index ffed53508..000000000 --- a/build/win32/vs9/gdk-pixbuf.vsprops +++ /dev/null @@ -1,157 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/win32/vs9/gengir.vcproj b/build/win32/vs9/gengir.vcproj index ac6c0368a..854da3130 100644 --- a/build/win32/vs9/gengir.vcproj +++ b/build/win32/vs9/gengir.vcproj @@ -21,7 +21,7 @@ @@ -36,7 +36,7 @@ Name="Release|Win32" OutputDirectory="$(GlibEtcInstallRoot)" ConfigurationType="10" - InheritedPropertySheets=".\gdk-pixbuf.vsprops" + InheritedPropertySheets=".\gdk-pixbuf-install.vsprops" CharacterSet="2" DeleteExtensionsOnClean="" WholeProgramOptimization="1" @@ -48,7 +48,7 @@