From 5fbf3c93b236970e1c68be05c08322099a51e6bf Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Mon, 22 Aug 2011 22:35:31 +0800 Subject: [PATCH] Update VS property sheets -Added glib/ghmac.h to the list of files to copy during the "install" stage -Cleaned up a bit (glib-2.0->glib-$(ApiVersion), where $(ApiVersion) is 2.0) --- build/win32/vs10/glib.props | 8 +- build/win32/vs9/glib.vsprops | 443 ++++++++++++++++++++++--------------------- 2 files changed, 229 insertions(+), 222 deletions(-) diff --git a/build/win32/vs10/glib.props b/build/win32/vs10/glib.props index 5640812..6bd6a16 100644 --- a/build/win32/vs10/glib.props +++ b/build/win32/vs10/glib.props @@ -65,6 +65,8 @@ copy ..\..\..\glib\gfileutils.h $(CopyDir)\include\glib-$(ApiVersion)\glib copy ..\..\..\glib\ghash.h $(CopyDir)\include\glib-$(ApiVersion)\glib +copy ..\..\..\glib\ghmac.h $(CopyDir)\include\glib-$(ApiVersion)\glib + copy ..\..\..\glib\ghook.h $(CopyDir)\include\glib-$(ApiVersion)\glib copy ..\..\..\glib\ghostutils.h $(CopyDir)\include\glib-$(ApiVersion)\glib @@ -458,9 +460,9 @@ copy ..\..\..\glib\glibconfig.h $(CopyDir)\lib\glib-$(ApiVersion)\include copy $(SolutionDir)$(Configuration)\$(Platform)\bin\*-$(ApiVersion).lib $(CopyDir)\lib -mkdir $(CopyDir)\share\glib-2.0\schemas +mkdir $(CopyDir)\share\glib-$(ApiVersion)\schemas -copy ..\..\..\gio\gschema.dtd $(CopyDir)\share\glib-2.0\schemas +copy ..\..\..\gio\gschema.dtd $(CopyDir)\share\glib-$(ApiVersion)\schemas echo EXPORTS >"$(DefDir)glib.def" && cl /EP -DG_OS_WIN32 -DINCLUDE_INTERNAL_SYMBOLS -DALL_FILES -DG_GNUC_MALLOC= -DG_GNUC_CONST= -DG_GNUC_NULL_TERMINATED= -DG_GNUC_NORETURN= -DG_GNUC_PRINTF=;G_GNUC_PRINTF -DG_GNUC_FORMAT=;G_GNUC_FORMAT ..\..\..\glib\glib.symbols >>"$(DefDir)glib.def" @@ -470,7 +472,7 @@ copy ..\..\..\gio\gschema.dtd $(CopyDir)\share\glib-2.0\schemas echo EXPORTS >"$(DefDir)gobject.def" && cl /EP -DINCLUDE_VARIABLES -DG_OS_WIN32 -DALL_FILES -DG_GNUC_MALLOC= -DG_GNUC_CONST= -DG_GNUC_NULL_TERMINATED= -DG_GNUC_NORETURN= -DG_GNUC_PRINTF=;G_GNUC_PRINTF ..\..\..\gobject\gobject.symbols >>"$(DefDir)gobject.def" echo EXPORTS >"$(DefDir)gio.def" && cl /EP -DINCLUDE_VARIABLES -DG_OS_WIN32 -DINCLUDE_INTERNAL_SYMBOLS -DALL_FILES -DG_GNUC_MALLOC= -DG_GNUC_CONST= -DG_GNUC_NULL_TERMINATED= -DG_GNUC_NORETURN= -DG_GNUC_PRINTF=;G_GNUC_PRINTF ..\..\..\gio\gio.symbols >>"$(DefDir)gio.def" lib - -2.0-0 + -$(ApiVersion)-0 -2-vs10 $(GlibSeparateVS10DllPrefix) diff --git a/build/win32/vs9/glib.vsprops b/build/win32/vs9/glib.vsprops index 3c65bed..b9cc38a 100644 --- a/build/win32/vs9/glib.vsprops +++ b/build/win32/vs9/glib.vsprops @@ -34,6 +34,10 @@ copy ..\..\..\gmodule\gmoduleconf.h.win32 ..\..\..\gmodule\gmoduleconf.h &# " /> +