[gtk+] Update Visual Studio Property Sheets
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Update Visual Studio Property Sheets
- Date: Thu, 15 Aug 2013 13:45:37 +0000 (UTC)
commit f60e42d7269ce6bead94a55ec74276abeeca2659
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Thu Aug 15 21:45:27 2013 +0800
Update Visual Studio Property Sheets
-For the binary "installation", look for the DLL files with their file
names consistent with the ones that are generated with the respective
Visual Studio projects.
-Remove any stray GDK DLLs that were left over from a Broadway-enabled
GDK when building a non-Broadway-enabled GTK+ binary set.
build/win32/vs10/gtk-install-bin.props | 10 +++++-----
build/win32/vs10/gtkprebuild.props | 4 ++++
build/win32/vs9/gtk-install-bin.vsprops | 14 +++++++-------
build/win32/vs9/gtkprebuild.vsprops | 2 ++
4 files changed, 18 insertions(+), 12 deletions(-)
---
diff --git a/build/win32/vs10/gtk-install-bin.props b/build/win32/vs10/gtk-install-bin.props
index b1602d3..46dd528 100644
--- a/build/win32/vs10/gtk-install-bin.props
+++ b/build/win32/vs10/gtk-install-bin.props
@@ -26,16 +26,16 @@ goto DONE_BIN
:DO_BROADWAY_BIN
-copy $(Configuration)\$(Platform)\bin\gdk-3-vs*.dll $(CopyDir)\bin
+copy $(Configuration)\$(Platform)\bin\$(GtkDllPrefix)gdk$(GtkDllSuffix).dll $(CopyDir)\bin
copy $(Configuration)\$(Platform)\bin\gdk-$(ApiVersion).lib $(CopyDir)\lib
copy $(Configuration)\$(Platform)\bin\broadwayd.exe $(CopyDir)\bin
-if "$(Configuration)" == "Release_Broadway" copy .\Release\$(Platform)\bin\gtk-3-vs*.dll $(CopyDir)\bin
+if "$(Configuration)" == "Release_Broadway" copy
.\Release\$(Platform)\bin\$(GtkDllPrefix)gtk$(GtkDllSuffix).dll $(CopyDir)\bin
-if "$(Configuration)" == "Release_Broadway" copy .\Release\$(Platform)\bin\gailutil-3-vs*.dll $(CopyDir)\bin
+if "$(Configuration)" == "Release_Broadway" copy
.\Release\$(Platform)\bin\$(GtkDllPrefix)gailutil$(GtkDllSuffix).dll $(CopyDir)\bin
if "$(Configuration)" == "Release_Broadway" copy .\Release\$(Platform)\bin\gtk-$(ApiVersion).lib
$(CopyDir)\lib
@@ -44,9 +44,9 @@ if "$(Configuration)" == "Release_Broadway" copy .\Release\$(Platform)\bin\gailu
if "$(Configuration)" == "Release_Broadway" copy .\Release\$(Platform)\bin\*.exe $(CopyDir)\bin
-if "$(Configuration)" == "Debug_Broadway" copy .\Debug\$(Platform)\bin\gtk-3-vs*.dll $(CopyDir)\bin
+if "$(Configuration)" == "Debug_Broadway" copy .\Debug\$(Platform)\bin\$(GtkDllPrefix)gtk$(GtkDllSuffix).dll
$(CopyDir)\bin
-if "$(Configuration)" == "Debug_Broadway" copy .\Debug\$(Platform)\bin\gailutil-3-vs*.dll $(CopyDir)\bin
+if "$(Configuration)" == "Debug_Broadway" copy
.\Debug\$(Platform)\bin\$(GtkDllPrefix)gailutil$(GtkDllSuffix).dll $(CopyDir)\bin
if "$(Configuration)" == "Debug_Broadway" copy .\Debug\$(Platform)\bin\gtk-$(ApiVersion).lib $(CopyDir)\lib
diff --git a/build/win32/vs10/gtkprebuild.props b/build/win32/vs10/gtkprebuild.props
index af4c1b6..5a3cbbf 100644
--- a/build/win32/vs10/gtkprebuild.props
+++ b/build/win32/vs10/gtkprebuild.props
@@ -23,6 +23,10 @@ if exist ..\..\..\MSVC_Release_Broadway del ..\..\..\MSVC_Release_Broadway
if exist ..\..\..\MSVC_Debug_Broadway del ..\..\..\MSVC_Debug_Broadway
+if exist $(Configuration)\$(Platform)\bin\$(GtkDllPrefix)gdk$(GtkDllSuffix).dll del
$(Configuration)\$(Platform)\bin\$(GtkDllPrefix)gdk$(GtkDllSuffix).dll

+
+if exist $(Configuration)\$(Platform)\bin\gdk-$(ApiVersion).lib del
$(Configuration)\$(Platform)\bin\gdk-$(ApiVersion).lib

+
if "$(Configuration)" == "Release" del ..\..\..\MSVC_Debug
if "$(Configuration)" == "Debug" del ..\..\..\MSVC_Release
diff --git a/build/win32/vs9/gtk-install-bin.vsprops b/build/win32/vs9/gtk-install-bin.vsprops
index 47e79e8..e47dc92 100644
--- a/build/win32/vs9/gtk-install-bin.vsprops
+++ b/build/win32/vs9/gtk-install-bin.vsprops
@@ -20,18 +20,18 @@ copy $(ConfigurationName)\$(PlatformName)\bin\*.exe $(CopyDir)\bin

goto DONE_BIN

:DO_BROADWAY_BIN

-copy $(ConfigurationName)\$(PlatformName)\bin\gdk-3-vs*.dll $(CopyDir)\bin

+copy $(ConfigurationName)\$(PlatformName)\bin\$(GtkDllPrefix)gdk$(GtkDllSuffix).dll
$(CopyDir)\bin

copy $(ConfigurationName)\$(PlatformName)\bin\gdk-$(ApiVersion).lib $(CopyDir)\lib

copy $(ConfigurationName)\$(PlatformName)\bin\broadwayd.exe $(CopyDir)\bin

-if "$(ConfigurationName)" == "Release_Broadway" copy
.\Release\$(PlatformName)\bin\gtk-3-*.dll $(CopyDir)\bin

-if "$(ConfigurationName)" == "Release_Broadway" copy
.\Release\$(PlatformName)\bin\gailutil-3-*.dll $(CopyDir)\bin

-if "$(ConfigurationName)" == "Release_Broadway" copy
.\Release\$(PlatformName)\bin\gtk*-$(ApiVersion).lib $(CopyDir)\lib

-if "$(ConfigurationName)" == "Release_Broadway" copy
.\Release\$(PlatformName)\bin\gailutil*-$(ApiVersion).lib $(CopyDir)\lib

+if "$(ConfigurationName)" == "Release_Broadway" copy
.\Release\$(PlatformName)\bin\$(GtkDllPrefix)gtk$(GtkDllSuffix).dll $(CopyDir)\bin

+if "$(ConfigurationName)" == "Release_Broadway" copy
.\Release\$(PlatformName)\bin\$(GtkDllPrefix)gailutil$(GtkDllSuffix).dll $(CopyDir)\bin

+if "$(ConfigurationName)" == "Release_Broadway" copy
.\Release\$(PlatformName)\bin\gtk-$(ApiVersion).lib $(CopyDir)\lib

+if "$(ConfigurationName)" == "Release_Broadway" copy
.\Release\$(PlatformName)\bin\gailutil-$(ApiVersion).lib $(CopyDir)\lib

if "$(ConfigurationName)" == "Release_Broadway" copy .\Release\$(PlatformName)\bin\*.exe
$(CopyDir)\bin

-if "$(ConfigurationName)" == "Debug_Broadway" copy
.\Debug\$(PlatformName)\bin\gtk-3-.dll $(CopyDir)\bin

-if "$(ConfigurationName)" == "Debug_Broadway" copy
.\Debug\$(PlatformName)\bin\gailutil-3-.dll $(CopyDir)\bin

+if "$(ConfigurationName)" == "Debug_Broadway" copy
.\Debug\$(PlatformName)\bin\$(GtkDllPrefix)gtk$(GtkDllSuffix).dll $(CopyDir)\bin

+if "$(ConfigurationName)" == "Debug_Broadway" copy
.\Debug\$(PlatformName)\bin\$(GtkDllPrefix)gailutil$(GtkDllSuffix).dll $(CopyDir)\bin

if "$(ConfigurationName)" == "Debug_Broadway" copy
.\Debug\$(PlatformName)\bin\gtk-$(ApiVersion).lib $(CopyDir)\lib

if "$(ConfigurationName)" == "Debug_Broadway" copy
.\Debug\$(PlatformName)\bin\gailutil-$(ApiVersion).lib $(CopyDir)\lib

if "$(ConfigurationName)" == "Debug_Broadway" copy .\Debug\$(PlatformName)\bin\*.exe
$(CopyDir)\bin

diff --git a/build/win32/vs9/gtkprebuild.vsprops b/build/win32/vs9/gtkprebuild.vsprops
index 1b23eff..bd8fce0 100644
--- a/build/win32/vs9/gtkprebuild.vsprops
+++ b/build/win32/vs9/gtkprebuild.vsprops
@@ -16,6 +16,8 @@ if exist ..\..\..\gdk\gdkconfig.h del ..\..\..\gdk\gdkconfig.h

if exist ..\..\..\GDK_BROADWAY_BUILD del ..\..\..\GDK_BROADWAY_BUILD

if exist ..\..\..\MSVC_Release_Broadway del ..\..\..\MSVC_Release_Broadway

if exist ..\..\..\MSVC_Debug_Broadway del ..\..\..\MSVC_Debug_Broadway

+if exist $(ConfigurationName)\$(PlatformName)\bin\$(GtkDllPrefix)gdk$(GtkDllSuffix).dll del
$(ConfigurationName)\$(PlatformName)\bin\$(GtkDllPrefix)gdk$(GtkDllSuffix).dll

+if exist $(ConfigurationName)\$(PlatformName)\bin\gdk-$(ApiVersion).lib del
$(ConfigurationName)\$(PlatformName)\bin\gdk-$(ApiVersion).lib

if "$(ConfigurationName)" == "Release" del ..\..\..\MSVC_Debug

if "$(ConfigurationName)" == "Debug" del ..\..\..\MSVC_Release

copy ..\..\..\gdk\gdkconfig.h.win32 ..\..\..\gdk\gdkconfig.h

[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
