Search
lxdream.org :: lxdream :: r985:52e64faac752
lxdream 0.9.1
released Jun 29
Download Now
changeset985:52e64faac752
parent984:a01567058a47
child986:5090104b0963
authornkeynes
dateTue Feb 24 11:47:41 2009 +0000 (10 years ago)
Set the source-type flags to -D__EXTENSIONS__ -U__STRICT_ANSI__ - this seems
to work correctly on all the platforms we care about at the moment.
Tweak the gcc-detection slightly (it was getting it wrong on some gcc builds)
Makefile.in
acinclude.m4
configure
configure.in
src/Makefile.am
src/Makefile.in
1.1 --- a/Makefile.in Sun Feb 15 21:47:39 2009 +0000
1.2 +++ b/Makefile.in Tue Feb 24 11:47:41 2009 +0000
1.3 @@ -176,7 +176,6 @@
1.4 OBJC = @OBJC@
1.5 OBJCDEPMODE = @OBJCDEPMODE@
1.6 OBJCFLAGS = @OBJCFLAGS@
1.7 -OBJCPP = @OBJCPP@
1.8 OBJEXT = @OBJEXT@
1.9 PACKAGE = @PACKAGE@
1.10 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
2.1 --- a/acinclude.m4 Sun Feb 15 21:47:39 2009 +0000
2.2 +++ b/acinclude.m4 Tue Feb 24 11:47:41 2009 +0000
2.3 @@ -56,15 +56,15 @@
2.4 # different optimization flags. Currently recognizes gcc and icc
2.5 # ---------------
2.6 AC_DEFUN([AC_CC_VERSION], [
2.7 -_GCC_VERSION=`$CC --version | $SED -ne '/(GCC)/p'`
2.8 +_GCC_VERSION=`$CC --version | $SED -ne '/gcc/p'`
2.9 _ICC_VERSION=`$CC --version | $SED -ne '/(ICC)/p'`
2.10 AC_MSG_CHECKING([CC version])
2.11 -if test -n "$_GCC_VERSION"; then
2.12 +if test -n "$_ICC_VERSION"; then
2.13 + AC_MSG_RESULT([ICC])
2.14 + [ $2 ]
2.15 +elif test -n "$_GCC_VERSION"; then
2.16 AC_MSG_RESULT([GCC])
2.17 - [ $1 ]
2.18 -elif test -n "$_ICC_VERSION"; then
2.19 - AC_MSG_RESULT([ICC])
2.20 - [ $2 ]
2.21 + [ $1 ]
2.22 else
2.23 AC_MSG_RESULT([Unknown])
2.24 [ $3 ]
3.1 --- a/configure Sun Feb 15 21:47:39 2009 +0000
3.2 +++ b/configure Tue Feb 24 11:47:41 2009 +0000
3.3 @@ -7765,20 +7765,20 @@
3.4
3.5
3.6
3.7 -_GCC_VERSION=`$CC --version | $SED -ne '/(GCC)/p'`
3.8 +_GCC_VERSION=`$CC --version | $SED -ne '/gcc/p'`
3.9 _ICC_VERSION=`$CC --version | $SED -ne '/(ICC)/p'`
3.10 { $as_echo "$as_me:$LINENO: checking CC version" >&5
3.11 $as_echo_n "checking CC version... " >&6; }
3.12 -if test -n "$_GCC_VERSION"; then
3.13 +if test -n "$_ICC_VERSION"; then
3.14 + { $as_echo "$as_me:$LINENO: result: ICC" >&5
3.15 +$as_echo "ICC" >&6; }
3.16 + CCOPT="$CFLAGS -fast"
3.17 + CFLAGS="$CFLAGS -fno-strict-aliasing -std=c99"
3.18 +elif test -n "$_GCC_VERSION"; then
3.19 { $as_echo "$as_me:$LINENO: result: GCC" >&5
3.20 $as_echo "GCC" >&6; }
3.21 CCOPT="-O2 -msse2 -mfpmath=sse"
3.22 - CFLAGS="$CFLAGS -fno-strict-aliasing -std=c99 -D_GNU_SOURCE"
3.23 -elif test -n "$_ICC_VERSION"; then
3.24 - { $as_echo "$as_me:$LINENO: result: ICC" >&5
3.25 -$as_echo "ICC" >&6; }
3.26 - CCOPT="$CFLAGS -fast"
3.27 - CFLAGS="$CFLAGS -fno-strict-aliasing -std=c99 -D_GNU_SOURCE"
3.28 + CFLAGS="$CFLAGS -fno-strict-aliasing -std=c99"
3.29 else
3.30 { $as_echo "$as_me:$LINENO: result: Unknown" >&5
3.31 $as_echo "Unknown" >&6; }
4.1 --- a/configure.in Sun Feb 15 21:47:39 2009 +0000
4.2 +++ b/configure.in Tue Feb 24 11:47:41 2009 +0000
4.3 @@ -98,9 +98,9 @@
4.4 AC_DEFINE(HAVE_EXCEPTIONS, [1], [Have exception stack-frame information])
4.5
4.6 AC_CC_VERSION([ CCOPT="-O2 -msse2 -mfpmath=sse"
4.7 - CFLAGS="$CFLAGS -fno-strict-aliasing -std=c99 -D_GNU_SOURCE" ],
4.8 + CFLAGS="$CFLAGS -fno-strict-aliasing -std=c99" ],
4.9 [ CCOPT="$CFLAGS -fast"
4.10 - CFLAGS="$CFLAGS -fno-strict-aliasing -std=c99 -D_GNU_SOURCE" ],
4.11 + CFLAGS="$CFLAGS -fno-strict-aliasing -std=c99" ],
4.12 [ CCOPT="$CFLAGS -O2" ])
4.13
4.14 if test "x$enable_optimized" = "xyes"; then
5.1 --- a/src/Makefile.am Sun Feb 15 21:47:39 2009 +0000
5.2 +++ b/src/Makefile.am Tue Feb 24 11:47:41 2009 +0000
5.3 @@ -13,7 +13,7 @@
5.4
5.5
5.6 EXTRA_DIST=drivers/genkeymap.pl checkver.pl
5.7 -AM_CFLAGS = -D_ISOC99_SOURCE -D_BSD_SOURCE
5.8 +AM_CFLAGS = -D__EXTENSIONS__ -U__STRICT_ANSI__
5.9
5.10 .PHONY: checkversion
5.11 checkversion:
6.1 --- a/src/Makefile.in Sun Feb 15 21:47:39 2009 +0000
6.2 +++ b/src/Makefile.in Tue Feb 24 11:47:41 2009 +0000
6.3 @@ -317,7 +317,6 @@
6.4 OBJC = @OBJC@
6.5 OBJCDEPMODE = @OBJCDEPMODE@
6.6 OBJCFLAGS = @OBJCFLAGS@
6.7 -OBJCPP = @OBJCPP@
6.8 OBJEXT = @OBJEXT@
6.9 PACKAGE = @PACKAGE@
6.10 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
6.11 @@ -406,7 +405,7 @@
6.12 @GLIB_CFLAGS@ @GTK_CFLAGS@ @LIBPNG_CFLAGS@ @PULSE_CFLAGS@ @ESOUND_CFLAGS@ @ALSA_CFLAGS@
6.13
6.14 EXTRA_DIST = drivers/genkeymap.pl checkver.pl
6.15 -AM_CFLAGS = -D_ISOC99_SOURCE -D_BSD_SOURCE
6.16 +AM_CFLAGS = -D__EXTENSIONS__ -U__STRICT_ANSI__
6.17 TESTS = test/testxlt
6.18 BUILT_SOURCES = sh4/sh4core.c sh4/sh4dasm.c sh4/sh4x86.c sh4/sh4stat.c \
6.19 pvr2/gl_slsrc.c drivers/mac_keymap.h version.c
.