Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Give the configure and crossbuild scripts the possibility to specify the compression method on the command line (--with-nsis-compression) 

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4663 4a71c877-e1ca-e34f-864e-861f7616d084
master
Giel van Schijndel 2008-04-17 14:32:48 +00:00
parent 5b0612e881
commit 40cc8f09ac
3 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
configure.ac
View File

@ -126,6 +126,16 @@ fi
AC_ARG_WITH(makensis,
AS_HELP_STRING([--with-makensis],[Path to makensis]))
AC_ARG_WITH(nsis_compression,
AS_HELP_STRING([--with-nsis-compression],[Compression method to use when building NSIS [lzma]]))
if test "x$with_nsis_compression" = "x" ; then
# The default compression method is LZMA
NSIS_COMPRESSION="lzma"
else
NSIS_COMPRESSION="${with_nsis_compression}"
fi
AC_SUBST(NSIS_COMPRESSION)
AC_ARG_WITH(installer_libdir,
AS_HELP_STRING([--with-installer-extdir],[Path to external data for NSIS script]))

4
pkg/nsis/Makefile.am
View File

@ -11,7 +11,7 @@ data:
$(MAKE) $(AM_MAKEFLAGS) -C ../../data/ data
$(INSTALLERFILE): warzone2100.nsi ../../src/warzone2100.exe data
$(MAKENSIS) -DPACKAGE="$(PACKAGE)" -DPACKAGE_NAME="$(PACKAGE_NAME)" -DPACKAGE_VERSION="$(PACKAGE_VERSION)" -DPACKAGE_BUGREPORT="$(PACKAGE_BUGREPORT)" -DVERSIONNUM="$(INSTALLER_VERSION)" -DEXTDIR="$(INSTALLER_EXTDIR)" $<
$(MAKENSIS) -DPACKAGE="$(PACKAGE)" -DPACKAGE_NAME="$(PACKAGE_NAME)" -DPACKAGE_VERSION="$(PACKAGE_VERSION)" -DPACKAGE_BUGREPORT="$(PACKAGE_BUGREPORT)" -DVERSIONNUM="$(INSTALLER_VERSION)" -DEXTDIR="$(INSTALLER_EXTDIR)" -X"SetCompressor /FINAL /SOLID ${NSIS_COMPRESSION}" $<
$(UPDATERFILE): warzone2100.update.nsi
$(MAKENSIS) -DVERSION="$(VERSION)" -DVERSIONNUM="$(INSTALLER_VERSION)" -DEXTDIR="$(INSTALLER_EXTDIR)" $<
$(MAKENSIS) -DVERSION="$(VERSION)" -DVERSIONNUM="$(INSTALLER_VERSION)" -DEXTDIR="$(INSTALLER_EXTDIR)" -X"SetCompressor /FINAL /SOLID ${NSIS_COMPRESSION}" $<

7
win32/__BUILD_SCRIPT
View File

@ -9,6 +9,13 @@ if [[ "x$1" = "xdebug" ]] ; then
elif [[ "x$1" = "xinstaller" ]] ; then
CONF_EXTRA_FLAGS="--disable-debug --enable-data --enable-installer
--with-installer-extdir=\"${PREFIX}\" --with-installer-version=${INSTALLER_VERSION}"
if [[ "x$2" = "xzlib" ]] ; then
CONF_EXTRA_FLAGS="${CONF_EXTRA_FLAGS}
--with-nsis-compression=zlib"
elif [[ "x$2" = "xbzip2" ]] ; then
CONF_EXTRA_FLAGS="${CONF_EXTRA_FLAGS}
--with-nsis-compression=bzip2"
fi
fi
# Move to the root directory