mirror of
https://github.com/amyinspace/MagicSetEditor2.git
synced 2026-06-12 13:37:00 -04:00
Fixed some major build system flaws
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1434 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
+8
-7
@@ -19,14 +19,15 @@ if test -n "${CXXFLAGS}"; then
|
||||
fi
|
||||
AC_PROG_CXX
|
||||
AC_ARG_ENABLE(debug, [--enable-debug Enable debug build (requires debug
|
||||
versions of wxWidgets and libstdc++.], [DEBUG=1])
|
||||
if test "x${DEBUG}" = x1; then
|
||||
versions of wxWidgets and libstdc++.])
|
||||
if test "x${enable_debug}" = "xyes"; then
|
||||
DEFAULT_CXXFLAGS="-ggdb -O0 -D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC"
|
||||
WXCONFIG_FLAGS="--debug --unicode=no"
|
||||
WXCONFIG_FLAGS="--debug"
|
||||
else
|
||||
DEFAULT_CXXFLAGS="-O2"
|
||||
WXCONFIG_FLAGS="--unicode=no"
|
||||
WXCONFIG_FLAGS=""
|
||||
fi
|
||||
|
||||
if test X$user_set_cxxflags != Xyes; then
|
||||
CXXFLAGS=${DEFAULT_CXXFLAGS}
|
||||
fi
|
||||
@@ -41,7 +42,7 @@ BOOST_REGEX_LIB="-Wl,-Bstatic $BOOST_REGEX_LIB -Wl,-Bdynamic"
|
||||
|
||||
# Check for wxWidgets
|
||||
AM_OPTIONS_WXCONFIG
|
||||
AM_PATH_WXCONFIG([2.8.0],[HAVE_WX=1],,,${WX_CONFIG_FLAGS})
|
||||
AM_PATH_WXCONFIG([2.8.0],[HAVE_WX=1],[HAVE_WX=0],,${WXCONFIG_FLAGS})
|
||||
if test "${HAVE_WX}" != 1; then
|
||||
AC_MSG_ERROR([
|
||||
wxWindows must be installed on your system
|
||||
@@ -58,11 +59,11 @@ fi
|
||||
|
||||
AC_ARG_ENABLE(pch, [--enable-pch Enable precompiled headers (Requires
|
||||
GCC of sufficiently high version). Speeds up compile times
|
||||
significantly... if it works.], [PCH=1], [PCH=0])
|
||||
significantly... if it works.])
|
||||
|
||||
# Check for precompiled headers
|
||||
# TODO: Deal with braindead GCC and actually check
|
||||
AM_CONDITIONAL(GLIBCPP_BUILD_PCH, test "x$PCH" = "x1" -a "x$CXX" = "xg++")
|
||||
AM_CONDITIONAL(GLIBCPP_BUILD_PCH, test "x$enable_pch" = "xyes" -a "x$CXX" = "xg++")
|
||||
|
||||
# Checks for header files.
|
||||
|
||||
|
||||
Reference in New Issue
Block a user