Skip to content

Commit

Permalink
* Use *mingw32* in the configure script to match the MinGW cross com…
Browse files Browse the repository at this point in the history
…piler

 * Compile with debugging symbols
 * Use double quotes (") instead of single quotes (') so that variables will be expanded


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/branches/2.0@2947 4a71c877-e1ca-e34f-864e-861f7616d084
  • Loading branch information
Giel van Schijndel committed Dec 1, 2007
1 parent d752d9d commit d0c6b8c
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion __BUILD_CONFIG
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ PREFIX="${HOME}/Documents/Projects/Warzone/devpkg/devpkg"
PKG_CONFIG_PATH="${PREFIX}/lib/pkgconfig"
PATH="${PREFIX}/bin:${PATH}"

CFLAGS="-pipe -m32 -march=i686 -O2"
CFLAGS="-pipe -m32 -march=i686 -O2 -g"
CXXFLAGS="${CFLAGS}"
CPPFLAGS="-I${PREFIX}/include"
LDFLAGS="-L${PREFIX}/lib"
Expand Down
6 changes: 3 additions & 3 deletions __BUILD_SCRIPT
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
source __BUILD_CONFIG

if [[ "x$1" = "xdebug" ]] ; then
CONF_EXTRA_FLAGS='--enable-debug'
CONF_EXTRA_FLAGS="--enable-debug"
elif [[ "x$1" = "xinstaller" ]] ; then
CONF_EXTRA_FLAGS='--enable-data --enable-installer
--with-installer-extdir="${HOME}/Warzone/devpkg/devpkg/bin" --with-installer-version=${INSTALLER_VERSION}'
CONF_EXTRA_FLAGS="--enable-data --enable-installer
--with-installer-extdir=\"${PREFIX}/bin\" --with-installer-version=${INSTALLER_VERSION}"
fi

./autogen.sh
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ fi
# Check for Windows.
AC_CANONICAL_HOST
case $host_os in
mingw32)
*mingw32*)
host_os_mingw32=yes
AC_CHECK_TOOL([WINDRES], [windres], AC_MSG_ERROR([windres not found]))
WIN32_LIBS="-lshfolder -lwinmm -lwsock32 -L\$(srcdir) -ldbghelp"
Expand Down

0 comments on commit d0c6b8c

Please sign in to comment.