diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2008-02-17 10:37:21 +0000 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2008-02-17 10:37:21 +0000 |
| commit | bd24ad1cbe3051886645a2d488bb39e2d26e2ae5 (patch) | |
| tree | 60e17ba6c1c42883757e89926693e8231ef0cfe6 /packaging | |
| parent | 43272f9435e91f59c66b40de544a772305d761c8 (diff) | |
Added $(GTK2_LIB_DIR)\loaders to some makefiles in an attempt to fix the
u3 and portableapp build.
svn path=/trunk/; revision=24369
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/portableapps/win32/makefile.nmake | 1 | ||||
| -rw-r--r-- | packaging/u3/win32/makefile.nmake | 1 | ||||
| -rw-r--r-- | packaging/ws-manifest.pl | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/packaging/portableapps/win32/makefile.nmake b/packaging/portableapps/win32/makefile.nmake index d7078f7fea..de83cb4f82 100644 --- a/packaging/portableapps/win32/makefile.nmake +++ b/packaging/portableapps/win32/makefile.nmake @@ -65,6 +65,7 @@ pack: distribution -$(UPX) $(UPX_FLAGS) $(FILES)\$(APP)\$(WIRESHARK)\[a-z]*.exe -$(UPX) $(UPX_FLAGS) $(FILES)\$(APP)\$(WIRESHARK)\*.dll -$(UPX) $(UPX_FLAGS) $(FILES)\$(APP)\$(WIRESHARK)\plugins\$(VERSION)\*.dll + -$(UPX) $(UPX_FLAGS) $(FILES)\$(APP)\$(WIRESHARK)\lib\gtk-2.0\$(GTK2_LIB_DIR)\loaders\*.dll -$(UPX) $(UPX_FLAGS) $(FILES)\$(APP)\$(WIRESHARK)\lib\gtk-2.0\$(GTK2_LIB_DIR)\immodules\*.dll -$(UPX) $(UPX_FLAGS) $(FILES)\$(APP)\$(WIRESHARK)\$(GTK_WIMP_DLLDST_DIR)\*.dll !ENDIF diff --git a/packaging/u3/win32/makefile.nmake b/packaging/u3/win32/makefile.nmake index 85ba5e14b6..ad8b11d6a0 100644 --- a/packaging/u3/win32/makefile.nmake +++ b/packaging/u3/win32/makefile.nmake @@ -86,6 +86,7 @@ pack: distribution !IFDEF UPX -$(UPX) $(UPX_FLAGS) $(DEVICE)\plugins\$(VERSION)\*.dll -$(UPX) $(UPX_FLAGS) $(HOST)\*.dll + -$(UPX) $(UPX_FLAGS) $(HOST)\lib\gtk-2.0\$(GTK2_LIB_DIR)\loaders\*.dll -$(UPX) $(UPX_FLAGS) $(HOST)\lib\gtk-2.0\$(GTK2_LIB_DIR)\immodules\*.dll -$(UPX) $(UPX_FLAGS) $(HOST)\$(GTK_WIMP_DLLDST_DIR)\*.dll -$(UPX) $(UPX_FLAGS) $(HOST)\[a-z]*.exe diff --git a/packaging/ws-manifest.pl b/packaging/ws-manifest.pl index 984feb994f..2ddceb099f 100644 --- a/packaging/ws-manifest.pl +++ b/packaging/ws-manifest.pl @@ -16,6 +16,7 @@ my %u3locs = qw($INSTDIR device $INSTDIR\${GTK_WIMP_RCDST_DIR} host $INSTDIR\etc\gtk-2.0 host $INSTDIR\etc\pango host + $INSTDIR\lib\gtk-2.0\${GTK2_LIB_DIR}\loaders host $INSTDIR\lib\gtk-2.0\${GTK2_LIB_DIR}\immodules host $INSTDIR\${GTK_WIMP_DLLDST_DIR} host); |