diff options
| author | Chun-wei Fan <fanchunwei@src.gnome.org> | 2011-06-20 17:07:17 +0800 |
|---|---|---|
| committer | Chun-wei Fan <fanchunwei@src.gnome.org> | 2011-06-20 17:07:17 +0800 |
| commit | 735a40eea71a7bd12d420e0b6f887db290dfed03 (patch) | |
| tree | 6cc1553cad70d77d7838938d2023039ba6c7e104 | |
| parent | 14dad8ca4c55fb2a6a5985bd4b6230509ee530bd (diff) | |
| download | gtk+-735a40eea71a7bd12d420e0b6f887db290dfed03.tar.gz | |
Update VS property sheets
As Cairo and Cairo-GObject are often built as two seperate DLLs/modules,
set the property sheets to link to both libraries, instead of using the
previous approach where a monolithic Cairo DLL which contains GObject
support is used.
| -rw-r--r-- | build/win32/vs10/gtk+.props | 2 | ||||
| -rw-r--r-- | build/win32/vs9/gtk+.vsprops | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/build/win32/vs10/gtk+.props b/build/win32/vs10/gtk+.props index 7caca5c5d2..1af391abb0 100644 --- a/build/win32/vs10/gtk+.props +++ b/build/win32/vs10/gtk+.props @@ -560,7 +560,7 @@ $(CopyDir)\bin\glib-compile-schemas.exe $(CopyDir)\share\glib-2.0\schemas <ForcedIncludeFiles>msvc_recommended_pragmas.h;%(ForcedIncludeFiles)</ForcedIncludeFiles> </ClCompile> <Link> - <AdditionalDependencies>pangocairo-1.0.lib;cairo.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;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>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;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalLibraryDirectories>$(GlibEtcInstallRoot)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> </Link> <PreBuildEvent> diff --git a/build/win32/vs9/gtk+.vsprops b/build/win32/vs9/gtk+.vsprops index b81b7d8cff..82f0de19ab 100644 --- a/build/win32/vs9/gtk+.vsprops +++ b/build/win32/vs9/gtk+.vsprops @@ -14,7 +14,7 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="gdk_pixbuf-2.0.lib pangocairo-1.0.lib pango-1.0.lib cairo.lib gio-2.0.lib gmodule-2.0.lib gobject-2.0.lib glib-2.0.lib intl.lib"
+ AdditionalDependencies="gdk_pixbuf-2.0.lib pangocairo-1.0.lib pango-1.0.lib cairo.lib cairo-gobject.lib gio-2.0.lib gmodule-2.0.lib gobject-2.0.lib glib-2.0.lib intl.lib"
AdditionalLibraryDirectories="$(GlibEtcInstallRoot)\lib"
/>
<Tool
|