diff options
| author | Chun-wei Fan <fanchunwei@src.gnome.org> | 2011-06-20 17:05:00 +0800 |
|---|---|---|
| committer | Chun-wei Fan <fanchunwei@src.gnome.org> | 2011-06-20 17:05:00 +0800 |
| commit | 7a032ecdfe0bcdc3c8c43499fe8027aab1cd8b0c (patch) | |
| tree | 5fb90a10c9b534cebe10dd38da8b7c9d4be906b6 /build | |
| parent | a49ef87f5f02b31e1ee673d6463c02de23f3dfd2 (diff) | |
| download | gtk+-7a032ecdfe0bcdc3c8c43499fe8027aab1cd8b0c.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.
Diffstat (limited to 'build')
| -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 516bb06948..5623854177 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 94ea1b6424..82a129a549 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
|