Mercurial > vba-linux

changeset 47:3907aac7df1c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
no longer set CXXFLAGS
author Robert McIntyre <rlm@mit.edu>
date Thu, 21 Mar 2013 19:06:58 +0000
parents 858cb0e04ae5
children 67e88056ad4f
files configure.ac src/sdl/Makefile.am
diffstat 2 files changed, 17 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
     1.1 --- a/configure.ac	Thu Mar 21 17:48:45 2013 +0000
     1.2 +++ b/configure.ac	Thu Mar 21 19:06:58 2013 +0000
     1.3 @@ -1,6 +1,7 @@
     1.4 -AC_PREREQ([2.68])
     1.5 +AC_PREREQ([2.69])
     1.6  
     1.7 -AC_INIT([VisualBoyAdvance], [1.7.2])
     1.8 +AC_INIT([VBA-ReRecording], [1.7.2], [], [vba-rerecording], 
     1.9 +        [http://code.google.com/p/vba-rerecording/])
    1.10  
    1.11  AC_CONFIG_AUX_DIR([build-aux])
    1.12  
    1.13 @@ -10,6 +11,13 @@
    1.14  
    1.15  AC_CONFIG_HEADERS([config.h])
    1.16  
    1.17 +
    1.18 +#AC_CANONICAL_TARGET
    1.19 +
    1.20 +dnl AS_CASE([$target], 
    1.21 +dnl         [i?86-*-*], [VBA_USE_C_CORE=no; VBA_USE_MMX=yes]
    1.22 +dnl 	[*]       , [VBA_USE_C_CORE=yes; VBA_USE_MMX=no])
    1.23 +
    1.24  # Checks for programs.
    1.25  AC_PROG_CXX
    1.26  AC_PROG_CC
    1.27 @@ -81,6 +89,11 @@
    1.28  		 src/sdl/Makefile])
    1.29  
    1.30  ### RLM: investigate this further
    1.31 -CXXFLAGS="$CXXFLAGS -DC_CORE"	
    1.32 +AC_SUBST([AM_CXXFLAGS], [-DC_CORE])
    1.33 +#AC_SUBST([AM_CXXFLAGS], [-fno-exceptions])
    1.34 +#CXXFLAGS="$CXXFLAGS -DC_CORE"	
    1.35 +
    1.36 +echo "**************************"
    1.37 +echo $CXXFLAGS
    1.38  
    1.39  AC_OUTPUT

     2.1 --- a/src/sdl/Makefile.am	Thu Mar 21 17:48:45 2013 +0000
     2.2 +++ b/src/sdl/Makefile.am	Thu Mar 21 19:06:58 2013 +0000
     2.3 @@ -57,4 +57,4 @@
     2.4  	-DSDL				\
     2.5  	-DSYSCONFDIR=\"$(sysconfdir)\"
     2.6  
     2.7 -AM_CXXFLAGS = -fno-exceptions @SDL_CFLAGS@
     2.8 +AM_CXXFLAGS = @AM_CXXFLAGS@ -fno-exceptions @SDL_CFLAGS@