changeset 18:ac56489c2ca6

need to fix NLS.h problem
author Robert McIntyre <rlm@mit.edu>
date Sat, 03 Mar 2012 12:06:10 -0600
parents 75e5bb1e0aa1
children 5e8e5083da94
files configure.ac src/Makefile.am src/gb/Makefile.am
diffstat 3 files changed, 26 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
     1.1 --- a/configure.ac	Sat Mar 03 11:44:47 2012 -0600
     1.2 +++ b/configure.ac	Sat Mar 03 12:06:10 2012 -0600
     1.3 @@ -5,25 +5,37 @@
     1.4  dnl TODO: change this to gba.cpp or something
     1.5  AC_CONFIG_SRCDIR([src/lua/lopcodes.c])
     1.6  AC_CONFIG_HEADERS([config.h])
     1.7 +
     1.8 +
     1.9 +# Checks for programs.
    1.10 +AC_PROG_CXX
    1.11 +AC_PROG_CC
    1.12  AC_PROG_RANLIB
    1.13  
    1.14  # Checks for header files.
    1.15  AC_CHECK_HEADERS([limits.h locale.h stddef.h stdlib.h string.h unistd.h])
    1.16  
    1.17  # Checks for typedefs, structures, and compiler characteristics.
    1.18 +AC_HEADER_STDBOOL
    1.19 +AC_C_INLINE
    1.20  AC_TYPE_SIZE_T
    1.21  AC_CHECK_TYPES([ptrdiff_t])
    1.22  
    1.23  # Checks for library functions.
    1.24  AC_FUNC_ERROR_AT_LINE
    1.25  AC_FUNC_MKTIME
    1.26 +AC_FUNC_MALLOC
    1.27  AC_FUNC_REALLOC
    1.28  AC_FUNC_STRCOLL
    1.29 -AC_CHECK_FUNCS([floor localeconv memchr modf pow setlocale sqrt strchr strcspn strerror strpbrk strrchr strstr strtoul])
    1.30 +AC_CHECK_FUNCS([floor localeconv memchr memset  dnl
    1.31 +                modf pow setlocale sqrt         dnl
    1.32 +                strchr strcspn strerror         dnl
    1.33 +                strpbrk strrchr strstr strtoul])
    1.34  
    1.35  AC_CONFIG_FILES([Makefile 
    1.36  	         src/Makefile
    1.37 -                 src/lua/Makefile])
    1.38 +                 src/lua/Makefile
    1.39 +		 src/gb/Makefile])
    1.40  
    1.41  AM_INIT_AUTOMAKE([dist-bzip2])
    1.42  
     2.1 --- a/src/Makefile.am	Sat Mar 03 11:44:47 2012 -0600
     2.2 +++ b/src/Makefile.am	Sat Mar 03 12:06:10 2012 -0600
     2.3 @@ -1,1 +1,1 @@
     2.4 -SUBDIRS = lua
     2.5 +SUBDIRS = lua gb
     3.1 --- a/src/gb/Makefile.am	Sat Mar 03 11:44:47 2012 -0600
     3.2 +++ b/src/gb/Makefile.am	Sat Mar 03 12:06:10 2012 -0600
     3.3 @@ -1,21 +1,24 @@
     3.4  noinst_LIBRARIES = libgb.a
     3.5  
     3.6  libgb_a_SOURCES = \
     3.7 -	gbCheats.cpp	\
     3.8  	gbCheats.h	\
     3.9  	gbCodesCB.h	\
    3.10  	gbCodes.h	\
    3.11 +	gbGlobals.h	\
    3.12 +	GB.h		\
    3.13 +	gbMemory.h	\
    3.14 +	gbPrinter.h	\
    3.15 +	gbSGB.h		\
    3.16 +	gbSound.h	\
    3.17 +			\
    3.18 +	gbCheats.cpp	\
    3.19  	GB.cpp		\
    3.20 -	GB.h		\
    3.21  	gbDis.cpp	\
    3.22  	gbGfx.cpp	\
    3.23  	gbGlobals.cpp	\
    3.24 -	gbGlobals.h	\
    3.25  	gbMemory.cpp	\
    3.26 -	gbMemory.h	\
    3.27  	gbPrinter.cpp	\
    3.28 -	gbPrinter.h	\
    3.29  	gbSGB.cpp	\
    3.30 -	gbSGB.h		\
    3.31 -	gbSound.cpp	\
    3.32 -	gbSound.h
    3.33 +	gbSound.cpp	
    3.34 +
    3.35 +