osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Make it easier to try GTK 3.6 

svn path=/trunk/; revision=54986
This commit is contained in:
Anders Broman 2014-01-27 19:22:10 +00:00
parent 257e301696
commit a40f824e0e
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.nmake
View File

@ -1237,7 +1237,7 @@ install-generated-files: doc
install-all: install-generated-files
set copycmd=/y
if not exist $(INSTALL_DIR) mkdir $(INSTALL_DIR)
!IF "$(GTK_INST_VERSION)" == "3.4"
!IF "$(GTK_INST_VERSION)" == "3.4" || "$(GTK_INST_VERSION)" == "3.6"
xcopy $(GTK_DIR)\bin\libgdk-3-0.dll $(INSTALL_DIR) /d
xcopy $(GTK_DIR)\bin\libgtk-3-0.dll $(INSTALL_DIR) /d
!ELSE
@ -1254,7 +1254,7 @@ install-all: install-generated-files
xcopy $(GTK_DIR)\$(GTK_ETC_DIR)\*.* $(INSTALL_DIR)\$(GTK_ETC_DIR) /d
# if not exist $(INSTALL_DIR)\etc\pango mkdir $(INSTALL_DIR)\etc\pango
# xcopy $(GTK_DIR)\etc\pango\pango.* $(INSTALL_DIR)\etc\pango /d
!IF "$(GTK_INST_VERSION)" == "3.4"
!IF "$(GTK_INST_VERSION)" == "3.4" || "$(GTK_INST_VERSION)" == "3.6"
if not exist $(INSTALL_DIR)\lib\gtk-3.0 mkdir $(INSTALL_DIR)\lib\gtk-3.0
if not exist $(INSTALL_DIR)\lib\gtk-3.0\$(GTK_LIB_DIR) mkdir $(INSTALL_DIR)\lib\gtk-3.0\$(GTK_LIB_DIR)
xcopy ".\ui\win32\settings.ini" $(INSTALL_DIR)\$(GTK_ETC_DIR) /d
@ -1376,7 +1376,7 @@ install-all: install-generated-files
!ENDIF
cd $(INSTALL_DIR)
peflags --dynamicbase=true --nxcompat=true *.dll
!IF "$(GTK_INST_VERSION)" == "3.4"
!IF "$(GTK_INST_VERSION)" == "3.4" || "$(GTK_INST_VERSION)" == "3.6"
!ELSE
peflags --dynamicbase=true --nxcompat=true lib/gtk-2.0/*/engines/*.dll
peflags --dynamicbase=true --nxcompat=true lib/gtk-2.0/modules/*.dll

8
config.nmake
View File

@ -285,6 +285,7 @@ GDK_DLL=libgdk-3-0.dll
GTK_DLL=libgtk-3-0.dll
PKG_SUFIX=ws
GTK_PKG=3.4.4-2.1
#GTK_PKG=3.6.1-1.1
!ENDIF
#
@ -297,6 +298,7 @@ GTK_PKG=3.4.4-2.1
GTK_INST_VERSION=2.24
!ELSE
GTK_INST_VERSION=3.4
#GTK_INST_VERSION=3.6
!ENDIF
#
@ -529,6 +531,7 @@ GDK_DLL=libgdk-3-0.dll
GTK_DLL=libgtk-3-0.dll
PKG_SUFIX=ws
GTK_PKG=3.4.4-2.1
#GTK_PKG=3.6.1-1.1
!ENDIF
#
@ -541,7 +544,8 @@ GTK_PKG=3.4.4-2.1
#GTK_INST_VERSION=2.16
GTK_INST_VERSION=2.24
!ELSE
GTK_INST_VERSION=3.4
#GTK_INST_VERSION=3.4
GTK_INST_VERSION=3.6
!ENDIF
#
@ -1348,7 +1352,7 @@ NEED_JPEG_DLL=USE
NEED_TIFF_DLL=USE
NEED_LZMA_DLL=USE
!ELSEIF "$(GTK_INST_VERSION)" == "3.4"
!ELSEIF "$(GTK_INST_VERSION)" == "3.4" || "$(GTK_INST_VERSION)" == "3.6"
# GTK+
## Note: If Wireshark is ever to be built with Gtk >= 3.10