|
From: Elias N. <eli...@us...> - 2003-09-07 16:11:22
|
Update of /cvsroot/java-game-lib/LWJGL/src/native In directory sc8-pr-cvs1:/tmp/cvs-serv31051 Modified Files: Makefile.am autogen.sh configure.in Log Message: Index: Makefile.am CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/Makefile.am =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/Makefile.am,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- Makefile.am 4 Sep 2003 08:38:10 -0000 1.10 +++ Makefile.am 7 Sep 2003 16:11:15 -0000 1.11 @@ -2,5 +2,5 @@ lib_LTLIBRARIES = liblwjgl.la liblwjgl_la_SOURCES = -liblwjgl_la_LIBADD = common/libcommon.la linux/liblinux.la -liblwjgl_la_DEPENDENCIES = common/libcommon.la linux/liblinux.la +liblwjgl_la_LIBADD = common/libcommon.la @native_build_dir@/libnative.la +liblwjgl_la_DEPENDENCIES = common/libcommon.la @native_build_dir@/libnative.la Index: autogen.sh CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/autogen.sh =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/autogen.sh,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- autogen.sh 4 Sep 2003 10:17:55 -0000 1.7 +++ autogen.sh 7 Sep 2003 16:11:15 -0000 1.8 @@ -1,5 +1,4 @@ aclocal autoheader -#libtoolize --automake automake --foreign --include-deps --add-missing --copy autoconf Index: configure.in CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/configure.in =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/configure.in,v retrieving revision 1.38 retrieving revision 1.39 diff -u -d -r1.38 -r1.39 --- configure.in 7 Sep 2003 13:46:02 -0000 1.38 +++ configure.in 7 Sep 2003 16:11:15 -0000 1.39 @@ -31,16 +31,17 @@ AC_PROG_LIBTOOL case "$host_os" in - darwin*) _BUILD_FLAGS="-D_AGL" - AC_CHECK_HEADERS([altypes.h alctypes.h],, AC_MSG_ERROR([OpenAL headers required1])) - AC_SUBST(native_build_dir, [macosx]) + darwin*) _BUILD_FLAGS="-D_AGL -fpascal-strings -I/Library/Frameworks/OpenAL.framework/Headers" + AC_CHECK_HEADER([/Library/Frameworks/OpenAL.framework/Headers/altypes.h],, AC_MSG_ERROR([OpenAL headers required])) + AC_CHECK_HEADER([/Library/Frameworks/OpenAL.framework/Headers/alctypes.h],, AC_MSG_ERROR([OpenAL headers required])) + NATIVE_BUILD_DIR=macosx CXXFLAGS="$CXXFLAGS $DEBUG_FLAGS -Wall $_BUILD_FLAGS" CFLAGS="$CFLAGS $DEBUG_FLAGS -Wall $_BUILD_FLAGS" ;; bsdi* | linux* | solaris*) AC_PATH_XTRA _BUILD_FLAGS="-pthread -D_X11 $X_CFLAGS" AC_CHECK_HEADERS([AL/altypes.h AL/alctypes.h],, AC_MSG_ERROR([OpenAL headers required])) - AC_SUBST(native_build_dir, [linux]) + NATIVE_BUILD_DIR=linux CXXFLAGS="$CXXFLAGS $DEBUG_FLAGS -Wall $_BUILD_FLAGS" CFLAGS="$CFLAGS $DEBUG_FLAGS -Wall $_BUILD_FLAGS" LIBS="$LIBS $X_LIBS" @@ -50,9 +51,11 @@ AC_CHECK_LIB(pthread, pthread_create,, AC_MSG_ERROR(pthread is required)) ;; - *) AC_MSG_ERROR([Unknown system $host_os]);; + *) AC_MSG_ERROR([Unsupported system $host_os]);; esac +AC_SUBST(native_build_dir, [$NATIVE_BUILD_DIR]) + # Checks for libraries. # Checks for header files. @@ -79,5 +82,6 @@ AC_CONFIG_FILES([Makefile common/Makefile - linux/Makefile]) + linux/Makefile + macosx/Makefile]) AC_OUTPUT |