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 /packaging/nsis/Makefile.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 'packaging/nsis/Makefile.nmake')
| -rw-r--r-- | packaging/nsis/Makefile.nmake | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake index 487da70357..4cb6870b36 100644 --- a/packaging/nsis/Makefile.nmake +++ b/packaging/nsis/Makefile.nmake @@ -114,6 +114,19 @@ NSIS_FLAGS=\ /DGDK_DLL=$(GDK_DLL) \ /DGTK_DLL=$(GTK_DLL) \ /DGTK_NAME=$(GTK_NAME) \ + /DGTK_ETC_DIR=$(GTK_ETC_DIR) \ +!IFDEF GTK_ENGINES_DIR + /DGTK_ENGINES_DIR=$(GTK_ENGINES_DIR) \ +!ENDIF +!IFDEF GTK_MODULES_DIR + /DGTK_MODULES_DIR=$(GTK_MODULES_DIR) \ +!ENDIF +!IFDEF GTK_SCHEMAS_DIR + /DGTK_SCHEMAS_DIR=$(GTK_SCHEMAS_DIR) \ +!ENDIF +!IFDEF NEED_CAIRO_GOBJECT_DLL + /DNEED_CAIRO_GOBJECT_DLL=$(NEED_CAIRO_GOBJECT_DLL) \ +!ENDIF !IFDEF NEED_CAIRO_DLL /DNEED_CAIRO_DLL=$(NEED_CAIRO_DLL) \ !ENDIF @@ -162,10 +175,6 @@ NSIS_FLAGS=\ /DXML_DLL=$(XML_DLL) \ !ENDIF !ENDIF - /DGTK_WIMP_DLLDST_DIR=$(GTK_WIMP_DLLDST_DIR) \ - /DGTK_WIMP_DLLSRC_DIR=$(GTK_WIMP_DLLSRC_DIR) \ - /DGTK_WIMP_RCDST_DIR=$(GTK_WIMP_RCDST_DIR) \ - /DGTK_WIMP_RCSRC_DIR=$(GTK_WIMP_RCSRC_DIR) \ /DINTL_DLL=$(INTL_DLL) \ /DVERSION=$(VERSION) \ /DVERSION_MAJOR=$(VERSION_MAJOR) \ |