diff options
| author | Gerald Combs <gerald@wireshark.org> | 2012-10-19 17:47:34 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2012-10-19 17:47:34 +0000 |
| commit | b924cfed2ba992a10920da50842c2cf16ad3675d (patch) | |
| tree | 0e057e6a5ef86a638a374113627048402a4cb698 /config.nmake | |
| parent | 17f959dc74941e6f54782f701354e482bc7240a1 (diff) | |
The U3 and PortableApps packaging processes depend on simple
defined/undefined checks. Create a bunch of them corresponding to the
various components that GTK2 and GTK3 need and plumb the packaging files
accordingly. Tested only with GTK2 but GTK3 *should* work.
svn path=/trunk/; revision=45659
Diffstat (limited to 'config.nmake')
| -rw-r--r-- | config.nmake | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/config.nmake b/config.nmake index 1032fa9a6c..7e5005bfca 100644 --- a/config.nmake +++ b/config.nmake @@ -246,6 +246,7 @@ GLIB_VERSION=2.0 GTK_NAME=gtk2 GTK_DIR=$(WIRESHARK_LIB_DIR)\$(GTK_NAME) + # These macros are used by the nsis installer script and by the install target. #EXPAT_DLL=libexpat-1.dll FFI_DLL=libffi-5.dll @@ -653,6 +654,18 @@ SMI_PKG=svn-40773 GEOIP_PKG=1.4.8-2 !endif +# win32 / win64 + +!IF "$(GTK_NAME)" == "gtk2" +GTK_ETC_DIR=etc\gtk-2.0 +GTK_ENGINES_DIR=lib\gtk-2.0\$(GTK_LIB_DIR)\engines +GTK_MODULES_DIR=lib\gtk-2.0\modules +GTK_THEMES_DIR=share\themes\MS-Windows\gtk-2.0 +!ELSE +GTK_ETC_DIR=etc\gtk-3.0 +GTK_SCHEMAS_DIR=\share\glib-2.0\schemas +!ENDIF + ##### Tools ##### @@ -1171,15 +1184,10 @@ NEED_JPEG_DLL=USE NEED_TIFF_DLL=USE NEED_LZMA_DLL=USE -GTK_WIMP_DLLSRC_DIR=$(GTK_DIR)\lib\gtk-2.0\$(GTK_LIB_DIR)\engines -GTK_WIMP_DLLDST_DIR=lib\gtk-2.0\$(GTK_LIB_DIR)\engines -GTK_WIMP_RCSRC_DIR=$(GTK_DIR)\share\themes\MS-Windows\gtk-2.0 -GTK_WIMP_RCDST_DIR=etc\gtk-2.0 # # Use of GTK3+ is experimental/not working # !ELSEIF "$(GTK_INST_VERSION)" == "3.4" -GTK_SCHEMAS_INST_DIR=\share\glib-2.0\schemas # GTK+ GTK_CFLAGS=$(GLIB_CFLAGS) /I$(GTK_DIR)\include\gtk-3.0 \ @@ -1203,6 +1211,7 @@ GTK_LIB_DIR=3.4 !IFDEF _DLL !ENDIF +NEED_CAIRO_GOBJECT_DLL=USE NEED_CAIRO_DLL=USE !IFDEF EXPAT_DLL |