amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-10 04:57:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed some major build system flaws

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1434 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
coppro
2009-12-11 03:44:20 +00:00
parent 47aa7ce923
commit c0ce05a341
2 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure
Vendored
+13 -14
View File
@@ -3440,16 +3440,17 @@ fi
# Check whether --enable-debug was given.
if test "${enable_debug+set}" = set; then :
enableval=$enable_debug; DEBUG=1
enableval=$enable_debug;
fi
if test "x${DEBUG}" = x1; then
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
@@ -4746,15 +4747,15 @@ fi
WX_VERSION=""
min_wx_version=2.8.0
if test -z "${WX_CONFIG_FLAGS}" ; then
if test -z "${WXCONFIG_FLAGS}" ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for wxWidgets version >= $min_wx_version" >&5
$as_echo_n "checking for wxWidgets version >= $min_wx_version... " >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for wxWidgets version >= $min_wx_version (${WX_CONFIG_FLAGS})" >&5
$as_echo_n "checking for wxWidgets version >= $min_wx_version (${WX_CONFIG_FLAGS})... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for wxWidgets version >= $min_wx_version (${WXCONFIG_FLAGS})" >&5
$as_echo_n "checking for wxWidgets version >= $min_wx_version (${WXCONFIG_FLAGS})... " >&6; }
fi
WX_CONFIG_WITH_ARGS="$WX_CONFIG_PATH $wx_config_args ${WX_CONFIG_FLAGS} "
WX_CONFIG_WITH_ARGS="$WX_CONFIG_PATH $wx_config_args ${WXCONFIG_FLAGS} "
WX_VERSION=`$WX_CONFIG_WITH_ARGS --version 2>/dev/null`
wx_config_major_version=`echo $WX_VERSION | \
@@ -4876,7 +4877,7 @@ $as_echo "no (version $WX_VERSION is not new enough)" >&6; }
WX_LIBS=""
WX_LIBS_STATIC=""
WX_RESCOMP=""
:
HAVE_WX=0
fi
else
@@ -4888,7 +4889,7 @@ $as_echo "no (version $WX_VERSION is not new enough)" >&6; }
WX_LIBS_STATIC=""
WX_RESCOMP=""
:
HAVE_WX=0
fi
@@ -4918,15 +4919,13 @@ fi
# Check whether --enable-pch was given.
if test "${enable_pch+set}" = set; then :
enableval=$enable_pch; PCH=1
else
PCH=0
enableval=$enable_pch;
fi
# Check for precompiled headers
# TODO: Deal with braindead GCC and actually check
if test "x$PCH" = "x1" -a "x$CXX" = "xg++"; then
if test "x$enable_pch" = "xyes" -a "x$CXX" = "xg++"; then
GLIBCPP_BUILD_PCH_TRUE=
GLIBCPP_BUILD_PCH_FALSE='#'
else
configure.ac
+8 -7
View File
@@ -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.