From 8cda93d389a3d7c38667d88b5d4ef0dec145a5b9 Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Mon, 9 May 2016 15:35:26 +0800 Subject: [PATCH] Visual Studio builds: Clean up projects a bit Consolidate the .lib's that we need to link to for GDK and GTK+ into the property sheets, and also link to setupapi.lib as that is needed by the port to the new GdkMonitor API. --- build/win32/vs10/gdk-3.vcxprojin | 18 +++++++++--------- build/win32/vs10/gtk-3.vcxprojin | 10 +++++----- build/win32/vs10/gtk3-build-defines.props | 20 ++++++++++++++++++-- build/win32/vs9/gdk-3.vcprojin | 16 ++++++++-------- build/win32/vs9/gtk-3.vcprojin | 8 ++++---- build/win32/vs9/gtk3-build-defines.vsprops | 16 ++++++++++++++++ 6 files changed, 60 insertions(+), 28 deletions(-) diff --git a/build/win32/vs10/gdk-3.vcxprojin b/build/win32/vs10/gdk-3.vcxprojin index 03fc2e716f..1de4b9a4a7 100644 --- a/build/win32/vs10/gdk-3.vcxprojin +++ b/build/win32/vs10/gdk-3.vcxprojin @@ -1,4 +1,4 @@ - + @@ -144,7 +144,7 @@ EditAndContinue - imm32.lib;winmm.lib;dwmapi.lib;%(AdditionalDependencies) + $(GdkAdditionalLibs);%(AdditionalDependencies) $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll true $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb @@ -167,7 +167,7 @@ EditAndContinue - imm32.lib;winmm.lib;ws2_32.lib;dwmapi.lib;%(AdditionalDependencies) + $(GdkAdditionalLibs);$(GdkBroadwayAdditionalLibs);%(AdditionalDependencies) $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll $(TargetDir)$(ProjectName).0.lib true @@ -187,7 +187,7 @@ ProgramDatabase - imm32.lib;winmm.lib;dwmapi.lib;%(AdditionalDependencies) + $(GdkAdditionalLibs);%(AdditionalDependencies) $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll $(TargetDir)$(ProjectName).0.lib true @@ -209,7 +209,7 @@ ProgramDatabase - imm32.lib;winmm.lib;ws2_32.lib;dwmapi.lib;%(AdditionalDependencies) + $(GdkAdditionalLibs);$(GdkBroadwayAdditionalLibs);%(AdditionalDependencies) $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll $(TargetDir)$(ProjectName).0.lib true @@ -234,7 +234,7 @@ ProgramDatabase - imm32.lib;winmm.lib;dwmapi.lib;%(AdditionalDependencies) + $(GdkAdditionalLibs);%(AdditionalDependencies) $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll $(TargetDir)$(ProjectName).0.lib true @@ -257,7 +257,7 @@ ProgramDatabase - imm32.lib;winmm.lib;ws2_32.lib;dwmapi.lib;%(AdditionalDependencies) + $(GdkAdditionalLibs);$(GdkBroadwayAdditionalLibs);%(AdditionalDependencies) $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll $(TargetDir)$(ProjectName).0.lib true @@ -277,7 +277,7 @@ ProgramDatabase - imm32.lib;winmm.lib;dwmapi.lib;%(AdditionalDependencies) + $(GdkAdditionalLibs);%(AdditionalDependencies) $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll $(TargetDir)$(ProjectName).0.lib true @@ -299,7 +299,7 @@ ProgramDatabase - imm32.lib;winmm.lib;ws2_32.lib;dwmapi.lib;%(AdditionalDependencies) + $(GdkAdditionalLibs);$(GdkBroadwayAdditionalLibs);%(AdditionalDependencies) $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll $(TargetDir)$(ProjectName).0.lib true diff --git a/build/win32/vs10/gtk-3.vcxprojin b/build/win32/vs10/gtk-3.vcxprojin index c1c6c6b1ac..b6b104cc62 100644 --- a/build/win32/vs10/gtk-3.vcxprojin +++ b/build/win32/vs10/gtk-3.vcxprojin @@ -1,4 +1,4 @@ - + @@ -86,7 +86,7 @@ EditAndContinue - atk-1.0.lib;pangowin32-1.0.lib;imm32.lib;winspool.lib;comctl32.lib;%(AdditionalDependencies) + $(GtkAdditionalLibs);%(AdditionalDependencies) $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll $(TargetDir)$(ProjectName).0.lib true @@ -106,7 +106,7 @@ ProgramDatabase - atk-1.0.lib;pangowin32-1.0.lib;imm32.lib;winspool.lib;comctl32.lib;%(AdditionalDependencies) + $(GtkAdditionalLibs);%(AdditionalDependencies) $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll $(TargetDir)$(ProjectName).0.lib true @@ -131,7 +131,7 @@ ProgramDatabase - atk-1.0.lib;pangowin32-1.0.lib;imm32.lib;winspool.lib;comctl32.lib;%(AdditionalDependencies) + $(GtkAdditionalLibs);%(AdditionalDependencies) $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll $(TargetDir)$(ProjectName).0.lib true @@ -151,7 +151,7 @@ ProgramDatabase - atk-1.0.lib;pangowin32-1.0.lib;imm32.lib;winspool.lib;comctl32.lib;%(AdditionalDependencies) + $(GtkAdditionalLibs);%(AdditionalDependencies) $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll $(TargetDir)$(ProjectName).0.lib true diff --git a/build/win32/vs10/gtk3-build-defines.props b/build/win32/vs10/gtk3-build-defines.props index 2b0214f62f..d695642cb4 100644 --- a/build/win32/vs10/gtk3-build-defines.props +++ b/build/win32/vs10/gtk3-build-defines.props @@ -1,4 +1,4 @@ - + @@ -10,6 +10,10 @@ GDK_COMPILATION;G_LOG_DOMAIN="Gdk" INCLUDE_IM_am_et;INCLUDE_IM_cedilla;INCLUDE_IM_cyrillic_translit;INCLUDE_IM_ime;INCLUDE_IM_inuktitut;INCLUDE_IM_ipa;INCLUDE_IM_multipress;INCLUDE_IM_thai;INCLUDE_IM_ti_er;INCLUDE_IM_ti_et;INCLUDE_IM_viqr GTK_COMPILATION;G_LOG_DOMAIN="Gtk";GTK_HOST="i686-pc-vs$(VSVer)";GTK_PRINT_BACKENDS="file";GTK_PRINT_BACKEND_ENABLE_UNSUPPORTED;$(GtkIncludedImmodulesDefines);GTK_LIBDIR="$(GtkDummyPrefix)/lib";GTK_DATADIR="$(GtkDummyPrefix)/share";GTK_DATA_PREFIX="$(GtkDummyPrefix)";GTK_SYSCONFDIR="$(GtkDummyPrefix)/etc";MULTIPRESS_CONFDIR="$(GtkDummyPrefix)/etc/gtk-$(ApiVersion)";MULTIPRESS_LOCALEDIR="$(GtkDummyPrefix)/share/locale";GTK_VERSION="$(GtkVersion)/etc";GTK_BINARY_VERSION="$(GtkBinaryVersion)/etc";GDK_DISABLE_DEPRECATED;ISOLATION_AWARE_ENABLED + imm32.lib + winmm.lib;dwmapi.lib;setupapi.lib;$(GtkGdkCommonLibs) + ws2_32.lib + atk-1.0.lib;pangowin32-1.0.lib;winspool.lib;comctl32.lib;$(GtkGdkCommonLibs) <_PropertySheetDisplayName>gtk3builddefinesprops @@ -24,7 +28,7 @@ true /d2Zi+ %(AdditionalOptions) - + pangocairo-1.0.lib;cairo.lib;cairo-gobject.lib;pango-1.0.lib;gdk_pixbuf-2.0.lib;gio-2.0.lib;gmodule-2.0.lib;gobject-2.0.lib;glib-2.0.lib;intl.lib;epoxy.lib;%(AdditionalDependencies) $(GlibEtcInstallRoot)\lib;%(AdditionalLibraryDirectories) @@ -48,5 +52,17 @@ $(GtkDefines) + + $(GtkGdkCommonLibs) + + + $(GdkAdditionalLibs) + + + $(GdkBroadwayAdditionalLibs) + + + $(GtkAdditionalLibs) + diff --git a/build/win32/vs9/gdk-3.vcprojin b/build/win32/vs9/gdk-3.vcprojin index f597064694..5f228db34e 100644 --- a/build/win32/vs9/gdk-3.vcprojin +++ b/build/win32/vs9/gdk-3.vcprojin @@ -42,7 +42,7 @@ /> + + + +