Enable libtool compatible DLL naming in the VS9 projects

[platform/upstream/glib.git] / build / win32 / vs9 / glib.vsprops

diff --git a/build/win32/vs9/glib.vsprops b/build/win32/vs9/glib.vsprops
index 6f7a234..75006d4 100644 (file)
--- a/build/win32/vs9/glib.vsprops
+++ b/build/win32/vs9/glib.vsprops
@@ -37,7 +37,7 @@ copy ..\..\..\gmodule\gmoduleconf.h.win32 ..\..\..\gmodule\gmoduleconf.h
&#
                Name="GlibDoInstall"\r
                Value="\r
 mkdir $(OutDir)\bin
\r
-copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\*-2-vs9.dll $(OutDir)\bin
\r
+copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\*.dll $(OutDir)\bin
\r
 copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\glib-genmarshal.exe $(OutDir)\bin
\r
 copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\gspawn-win32-helper*.exe $(OutDir)\bin
\r
 \r
@@ -193,4 +193,30 @@ copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\*-2.0.lib $(OutDir)\
                Name="GlibGenerateGioDef"\r
                Value="echo EXPORTS >"$(IntDir)\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 >>"$(IntDir)\gio.def""\r
        />\r
+       <UserMacro\r
+               Name="GlibLibtoolCompatibleDllPrefix"\r
+               Value="lib"\r
+       />\r
+       <UserMacro\r
+               Name="GlibLibtoolCompatibleDllSuffix"\r
+               Value="-2.0-0"\r
+       />\r
+       <UserMacro\r
+               Name="GlibSeparateVS9DllPrefix"\r
+               Value=""\r
+       />\r
+       <UserMacro\r
+               Name="GlibSeparateVS9DllSuffix"\r
+               Value="-2-vs9"\r
+       />\r
+       <!-- Change these two to GlibLibtoolCompatibleDllPrefix and\r
+       GlibLibtoolCompatibleDllSuffix if that is what you want -->\r
+       <UserMacro\r
+               Name="GlibDllPrefix"\r
+               Value="$(GlibSeparateVS9DllPrefix)"\r
+       />\r
+       <UserMacro\r
+               Name="GlibDllSuffix"\r
+               Value="$(GlibSeparateVS9DllSuffix)"\r
+       />\r
 </VisualStudioPropertySheet>\r