mirror of https://github.com/snes9xgit/snes9x.git
unix: Don't remove compiler flags for no reason, and put user flags at the end so as to overwrite Snes9x's.
This commit is contained in:
parent
4345c20af2
commit
39601dd174
|
@ -3424,18 +3424,6 @@ S9XLIBS=""
|
|||
# *** Execution begins here ***
|
||||
# *****************************
|
||||
|
||||
# Remove -g and -O2 flags manually.
|
||||
|
||||
if test "x$CFLAGS" != "x"; then
|
||||
CFLAGS="`echo \"$CFLAGS\" | sed -e 's/-g//'`"
|
||||
CFLAGS="`echo \"$CFLAGS\" | sed -e 's/-O2//'`"
|
||||
fi
|
||||
|
||||
if test "x$CXXFLAGS" != "x"; then
|
||||
CXXFLAGS="`echo \"$CXXFLAGS\" | sed -e 's/-g//'`"
|
||||
CXXFLAGS="`echo \"$CXXFLAGS\" | sed -e 's/-O2//'`"
|
||||
fi
|
||||
|
||||
# Test what compiler flags we should use.
|
||||
|
||||
# Check whether --enable-debug was given.
|
||||
|
@ -6310,7 +6298,7 @@ S9XDEFS="$S9XDEFS -DGFX_MULTI_FORMAT"
|
|||
|
||||
# Output.
|
||||
|
||||
S9XFLGS="$CXXFLAGS $CPPFLAGS $LDFLAGS $S9XFLGS"
|
||||
S9XFLGS="$S9XFLGS $CXXFLAGS $CPPFLAGS $LDFLAGS"
|
||||
S9XLIBS="$LIBS $S9XLIBS"
|
||||
|
||||
S9XFLGS="`echo \"$S9XFLGS\" | sed -e 's/ */ /g'`"
|
||||
|
|
|
@ -56,18 +56,6 @@ AC_DEFUN([AC_S9X_COMPILER_FLAG],
|
|||
# *** Execution begins here ***
|
||||
# *****************************
|
||||
|
||||
# Remove -g and -O2 flags manually.
|
||||
|
||||
if test "x$CFLAGS" != "x"; then
|
||||
CFLAGS="`echo \"$CFLAGS\" | sed -e 's/-g//'`"
|
||||
CFLAGS="`echo \"$CFLAGS\" | sed -e 's/-O2//'`"
|
||||
fi
|
||||
|
||||
if test "x$CXXFLAGS" != "x"; then
|
||||
CXXFLAGS="`echo \"$CXXFLAGS\" | sed -e 's/-g//'`"
|
||||
CXXFLAGS="`echo \"$CXXFLAGS\" | sed -e 's/-O2//'`"
|
||||
fi
|
||||
|
||||
# Test what compiler flags we should use.
|
||||
|
||||
AC_ARG_ENABLE([debug],
|
||||
|
@ -450,7 +438,7 @@ S9XDEFS="$S9XDEFS -DGFX_MULTI_FORMAT"
|
|||
|
||||
# Output.
|
||||
|
||||
S9XFLGS="$CXXFLAGS $CPPFLAGS $LDFLAGS $S9XFLGS"
|
||||
S9XFLGS="$S9XFLGS $CXXFLAGS $CPPFLAGS $LDFLAGS"
|
||||
S9XLIBS="$LIBS $S9XLIBS"
|
||||
|
||||
S9XFLGS="`echo \"$S9XFLGS\" | sed -e 's/ */ /g'`"
|
||||
|
|
Loading…
Reference in New Issue