|
|
@ -1032,8 +1032,6 @@ make_cflags_and_ldflags() {
|
|
|
|
CFLAGS_BUILD=""
|
|
|
|
CFLAGS_BUILD=""
|
|
|
|
# General CFlags for HOST
|
|
|
|
# General CFlags for HOST
|
|
|
|
CFLAGS="$CFLAGS -D$os"
|
|
|
|
CFLAGS="$CFLAGS -D$os"
|
|
|
|
# CFlags for HOST and C-Compiler
|
|
|
|
|
|
|
|
CC_FLAGS=""
|
|
|
|
|
|
|
|
# Libs to compile. In fact this is just LDFLAGS
|
|
|
|
# Libs to compile. In fact this is just LDFLAGS
|
|
|
|
LIBS="-lstdc++"
|
|
|
|
LIBS="-lstdc++"
|
|
|
|
# LDFLAGS used for HOST
|
|
|
|
# LDFLAGS used for HOST
|
|
|
@ -1112,17 +1110,11 @@ make_cflags_and_ldflags() {
|
|
|
|
CFLAGS="$CFLAGS -W -Wno-unused-parameter -Wformat=2"
|
|
|
|
CFLAGS="$CFLAGS -W -Wno-unused-parameter -Wformat=2"
|
|
|
|
CFLAGS="$CFLAGS -Wredundant-decls"
|
|
|
|
CFLAGS="$CFLAGS -Wredundant-decls"
|
|
|
|
|
|
|
|
|
|
|
|
CC_CFLAGS="$CC_CFLAGS -Wstrict-prototypes"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if [ $enable_assert -eq 0 ]; then
|
|
|
|
if [ $enable_assert -eq 0 ]; then
|
|
|
|
# Do not warn about unused variables when building without asserts
|
|
|
|
# Do not warn about unused variables when building without asserts
|
|
|
|
CFLAGS="$CFLAGS -Wno-unused-variable"
|
|
|
|
CFLAGS="$CFLAGS -Wno-unused-variable"
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
|
|
if [ $cc_version -ge 34 ]; then
|
|
|
|
|
|
|
|
CC_CFLAGS="$CC_CFLAGS -Wdeclaration-after-statement -Wold-style-definition"
|
|
|
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if [ "$os" = "CYGWIN" ]; then
|
|
|
|
if [ "$os" = "CYGWIN" ]; then
|
|
|
|
CFLAGS="$CFLAGS -mwin32"
|
|
|
|
CFLAGS="$CFLAGS -mwin32"
|
|
|
|
LDFLAGS="$LDFLAGS -mwin32"
|
|
|
|
LDFLAGS="$LDFLAGS -mwin32"
|
|
|
@ -1414,7 +1406,7 @@ make_cflags_and_ldflags() {
|
|
|
|
|
|
|
|
|
|
|
|
CFLAGS="$CFLAGS -DGLOBAL_DATA_DIR=\\\\\"$prefix_dir/$data_dir\\\\\""
|
|
|
|
CFLAGS="$CFLAGS -DGLOBAL_DATA_DIR=\\\\\"$prefix_dir/$data_dir\\\\\""
|
|
|
|
|
|
|
|
|
|
|
|
log 1 "using CFLAGS... $CFLAGS $CC_CFLAGS"
|
|
|
|
log 1 "using CFLAGS... $CFLAGS"
|
|
|
|
log 1 "using LDFLAGS... $LIBS $LDFLAGS"
|
|
|
|
log 1 "using LDFLAGS... $LIBS $LDFLAGS"
|
|
|
|
|
|
|
|
|
|
|
|
# Makedepend doesn't like something like: -isysroot /OSX/blabla
|
|
|
|
# Makedepend doesn't like something like: -isysroot /OSX/blabla
|
|
|
@ -2603,7 +2595,6 @@ make_sed() {
|
|
|
|
s@!!WINDRES!!@$windres@g;
|
|
|
|
s@!!WINDRES!!@$windres@g;
|
|
|
|
s@!!STRIP!!@$strip $strip_arg@g;
|
|
|
|
s@!!STRIP!!@$strip $strip_arg@g;
|
|
|
|
s@!!LIPO!!@$lipo@g;
|
|
|
|
s@!!LIPO!!@$lipo@g;
|
|
|
|
s@!!CC_CFLAGS!!@$CC_CFLAGS@g;
|
|
|
|
|
|
|
|
s@!!CFLAGS!!@$T_CFLAGS@g;
|
|
|
|
s@!!CFLAGS!!@$T_CFLAGS@g;
|
|
|
|
s@!!CFLAGS_BUILD!!@$CFLAGS_BUILD@g;
|
|
|
|
s@!!CFLAGS_BUILD!!@$CFLAGS_BUILD@g;
|
|
|
|
s@!!STRGEN_FLAGS!!@$strgen_flags@g;
|
|
|
|
s@!!STRGEN_FLAGS!!@$strgen_flags@g;
|
|
|
|