java-game-lib-cvs Mailing List for Lightweight Java Game Library

Update of /cvsroot/java-game-lib/LWJGL/src/native/macosx
In directory sc8-pr-cvs1:/tmp/cvs-serv935

Modified Files:
	org_lwjgl_Display.cpp 
Added Files:
	Makefile.am 
Log Message:


CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/macosx/Makefile.am

Index: org_lwjgl_Display.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/macosx/org_lwjgl_Display.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/macosx/org_lwjgl_Display.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- org_lwjgl_Display.cpp	23 May 2003 03:07:46 -0000	1.15
+++ org_lwjgl_Display.cpp	7 Sep 2003 16:21:04 -0000	1.16
@@ -1,5 +1,5 @@
 /* 
- * Copyright (c) 2002 Light Weight Java Game Library Project
+ * Copyright (c) 2002 Lightweight Java Game Library Project
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

Update of /cvsroot/java-game-lib/LWJGL/src/native/macosx
In directory sc8-pr-cvs1:/tmp/cvs-serv31051/macosx

Added Files:
      Tag: macosx-gcc
	Makefile.am 
Log Message:


--- NEW FILE: Makefile.am ---
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/macosx/Makefile.am
noinst_LTLIBRARIES = libnative.la

libnative_la_SOURCES = $(NATIVE)
INCLUDES = -I../common

NATIVE = \
#  org_lwjgl_Display.cpp \
#  org_lwjgl_Sys.cpp \
#  org_lwjgl_input_Controller.cpp \
#  org_lwjgl_input_Keyboard.cpp \
#  org_lwjgl_input_Mouse.cpp \
#  org_lwjgl_input_Cursor.cpp \
#  org_lwjgl_opengl_Window.cpp \
#  org_lwjgl_opengl_GLCaps.cpp \
#  org_lwjgl_opengl_Pbuffer.cpp
  

Update of /cvsroot/java-game-lib/LWJGL/src/native/linux
In directory sc8-pr-cvs1:/tmp/cvs-serv31051/linux

Modified Files:
	Makefile.am 
Log Message:


Index: Makefile.am
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/linux/Makefile.am
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/Makefile.am,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- Makefile.am	3 Sep 2003 15:42:37 -0000	1.10
+++ Makefile.am	7 Sep 2003 16:11:15 -0000	1.11
@@ -1,6 +1,6 @@
-noinst_LTLIBRARIES = liblinux.la
+noinst_LTLIBRARIES = libnative.la
 
-liblinux_la_SOURCES = $(NATIVE)
+libnative_la_SOURCES = $(NATIVE)
 INCLUDES = -I../common
 
 NATIVE = \

Update of /cvsroot/java-game-lib/LWJGL/src/native/common
In directory sc8-pr-cvs1:/tmp/cvs-serv31051/common

Modified Files:
	extal.cpp extal.h extgl.c extgl.h 
Log Message:


Index: extal.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/extal.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/extal.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- extal.cpp	4 Jul 2003 14:29:02 -0000	1.7
+++ extal.cpp	7 Sep 2003 16:11:15 -0000	1.8
@@ -127,7 +127,7 @@
 #ifdef _X11
 void* handleOAL;
 #endif
-#ifdef TARGET_OS_MAC
+#ifdef _AGL
 #include <Carbon/Carbon.h>
 OSStatus oalInitEntryPoints (void);
 void oalDellocEntryPoints (void);
@@ -165,7 +165,7 @@
 #ifdef _X11
   return dlsym(handleOAL, function);
 #endif
-#ifdef TARGET_OS_MAC
+#ifdef _AGL
     return CFBundleGetFunctionPointerForName (handleOAL,CFStringCreateWithCStringNoCopy (NULL, function, CFStringGetSystemEncoding (), NULL));
 #endif 
 }
@@ -191,7 +191,7 @@
 #ifdef _X11
     handleOAL = dlopen(path_str, RTLD_LAZY);
 #endif
-#ifdef TARGET_OS_MAC
+#ifdef _AGL
     // NOTE: This totally ignores the input array! - SWP
     oalInitEntryPoints();
 #endif
@@ -215,7 +215,7 @@
 #ifdef _X11
   dlclose(handleOAL);
 #endif
-#ifdef TARGET_OS_MAC
+#ifdef _AGL
     oalDellocEntryPoints();
 #endif
 }
@@ -431,7 +431,7 @@
   return JNI_TRUE;
 }
 
-#ifdef TARGET_OS_MAC
+#ifdef _AGL
 // -------------------------
 OSStatus oalInitEntryPoints (void)
 {

Index: extal.h
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/extal.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/extal.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- extal.h	7 Sep 2003 13:28:19 -0000	1.19
+++ extal.h	7 Sep 2003 16:11:15 -0000	1.20
@@ -61,12 +61,11 @@
 
  #define ALCAPIENTRY __cdecl
 #else
- #ifdef TARGET_OS_MAC
-  #if TARGET_OS_MAC
+ #ifdef _AGL
+  #if _AGL
  typedef struct ALCdevice_struct ALCdevice;
  typedef struct ALCcontext_struct ALCcontext;
  
-   #pragma export on
   #endif
  #endif
  #define ALCAPI
@@ -116,11 +115,6 @@
  #define ALAPIENTRY __cdecl
  #define AL_CALLBACK
 #else
- #ifdef TARGET_OS_MAC
-  #if TARGET_OS_MAC
-   #pragma export on
-  #endif
- #endif
  #define ALAPI
  #define ALAPIENTRY
  #define AL_CALLBACK

Index: extgl.c
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/extgl.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/extgl.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- extgl.c	4 Sep 2003 07:23:47 -0000	1.19
+++ extgl.c	7 Sep 2003 16:11:15 -0000	1.20
@@ -774,9 +774,9 @@
 glXFreeMemoryNVPROC glXFreeMemoryNV = NULL;
 #endif /* X11 */
 
-#ifdef TARGET_OS_MAC
+#ifdef _AGL
 // TODO: find the OSX equivalent of these functions
-#endif /* TARGET_OS_MAC */
+#endif /* _AGL */
 
 #endif /* GL_NV_vertex_array_range */
 
@@ -1359,10 +1359,93 @@
 void * lib_glu_handle = NULL;
 #endif
 
-#ifdef TARGET_OS_MAC
-// Note: Not used, there is a CFBundleRef in the header file that handles the
-// dynamic load from the GL Framework bundle and this framework include gl
-// and glu in the same library
+#ifdef _AGL
+CFBundleRef gBundleRefOpenGL = NULL;
+#endif
+
+#ifdef _AGL
+// -------------------------
+OSStatus aglInitEntryPoints (void)
+{
+    OSStatus err = noErr;
+    const Str255 frameworkName = "\pOpenGL.framework";
+    FSRefParam fileRefParam;
+    FSRef fileRef;
+    CFURLRef bundleURLOpenGL;
+    memset(&fileRefParam, 0, sizeof(fileRefParam));
+    memset(&fileRef, 0, sizeof(fileRef));
+    fileRefParam.ioNamePtr  = frameworkName;
+    fileRefParam.newRef = &fileRef;
+
+    // Frameworks directory/folder
+    //
+    err = FindFolder (kSystemDomain, kFrameworksFolderType, false, &fileRefParam.ioVRefNum, &fileRefParam.ioDirID);
+    if (noErr != err)
+    {
+        DebugStr ("\pCould not find frameworks folder");
+        return err;
+    }
+
+    // make FSRef for folder
+    //
+    err = PBMakeFSRefSync (&fileRefParam);
+
+
+    if (noErr != err)
+    {
+        DebugStr ("\pCould make FSref to frameworks folder");
+        return err;
+    }
+
+    // create URL to folder
+    //
+    bundleURLOpenGL = CFURLCreateFromFSRef (kCFAllocatorDefault, &fileRef);
+    if (!bundleURLOpenGL)
+    {
+        DebugStr ("\pCould create OpenGL Framework bundle URL");
+        return paramErr;
+    }
+
+    // create ref to GL's bundle
+    //
+    gBundleRefOpenGL = CFBundleCreate (kCFAllocatorDefault,bundleURLOpenGL);
+    if (!gBundleRefOpenGL)
+    {
+        DebugStr ("\pCould not create OpenGL Framework bundle");
+        return paramErr;
+    }
+
+    // release created bundle
+    //
+    CFRelease (bundleURLOpenGL);
+
+    // if the code was successfully loaded, look for our function.
+    if (!CFBundleLoadExecutable (gBundleRefOpenGL))
+    {
+        DebugStr ("\pCould not load MachO executable");
+        return paramErr;
+    }
+
+    return err;
+}
+
+
+static void aglDellocEntryPoints (void)
+{
+    if (gBundleRefOpenGL != NULL)
+    {
+        // unload the bundle's code.
+        CFBundleUnloadExecutable (gBundleRefOpenGL);
+        CFRelease (gBundleRefOpenGL);
+        gBundleRefOpenGL = NULL;
+    }
+}
+
+
+static void * aglGetProcAddress (char * pszProc)
+{
+    return CFBundleGetFunctionPointerForName (gBundleRefOpenGL,CFStringCreateWithCStringNoCopy (NULL, pszProc, CFStringGetSystemEncoding (), NULL));
+}
 #endif
 
 /* getProcAddress */
@@ -1400,7 +1483,7 @@
     return t;
 #endif
 
-#ifdef TARGET_OS_MAC
+#ifdef _AGL
     void *t =(void *)aglGetProcAddress(name);
 
     return t;
@@ -1560,7 +1643,7 @@
 /*-----------------------------------------------------*/
 /* AGL stuff BEGIN*/
 /*-----------------------------------------------------*/
-#ifdef TARGET_OS_MAC
+#ifdef _AGL
 
 static int extgl_InitializeAGL()
 {
@@ -3286,7 +3369,7 @@
     extgl_InitializeWGL();
 #endif
 
-#ifdef TARGET_OS_MAC
+#ifdef _AGL
     /* load AGL extensions */
     extgl_InitializeAGL();
 #endif
@@ -3331,7 +3414,7 @@
 }
 #endif /* WIN32 */
 
-#ifdef TARGET_OS_MAC
+#ifdef _AGL
 int extgl_Open(void)
 {
     OSStatus err = aglInitEntryPoints();
@@ -3347,7 +3430,7 @@
     //
     return 0;
 }
-#endif /* TARGET_OS_MAC */
+#endif /* _AGL */
 
 void extgl_Close(void)
 {
@@ -3359,96 +3442,10 @@
 	FreeLibrary(lib_gl_handle);
 	FreeLibrary(lib_glu_handle);
 #endif
-#ifdef TARGET_OS_MAC
+#ifdef _AGL
         aglDellocEntryPoints();
 #endif 
 }
-
-#ifdef TARGET_OS_MAC
-CFBundleRef gBundleRefOpenGL = NULL;
-// -------------------------
-OSStatus aglInitEntryPoints (void)
-{
-    OSStatus err = noErr;
-    const Str255 frameworkName = "\pOpenGL.framework";
-    FSRefParam fileRefParam;
-    FSRef fileRef;
-    CFURLRef bundleURLOpenGL;
-    memset(&fileRefParam, 0, sizeof(fileRefParam));
-    memset(&fileRef, 0, sizeof(fileRef));
-    fileRefParam.ioNamePtr  = frameworkName;
-    fileRefParam.newRef = &fileRef;
-
-    // Frameworks directory/folder
-    //
-    err = FindFolder (kSystemDomain, kFrameworksFolderType, false, &fileRefParam.ioVRefNum, &fileRefParam.ioDirID);
-    if (noErr != err)
-    {
-        DebugStr ("\pCould not find frameworks folder");
-        return err;
-    }
-
-    // make FSRef for folder
-    //
-    err = PBMakeFSRefSync (&fileRefParam);
-
-
-    if (noErr != err)
-    {
-        DebugStr ("\pCould make FSref to frameworks folder");
-        return err;
-    }
-
-    // create URL to folder
-    //
-    bundleURLOpenGL = CFURLCreateFromFSRef (kCFAllocatorDefault, &fileRef);
-    if (!bundleURLOpenGL)
-    {
-        DebugStr ("\pCould create OpenGL Framework bundle URL");
-        return paramErr;
-    }
-
-    // create ref to GL's bundle
-    //
-    gBundleRefOpenGL = CFBundleCreate (kCFAllocatorDefault,bundleURLOpenGL);
-    if (!gBundleRefOpenGL)
-    {
-        DebugStr ("\pCould not create OpenGL Framework bundle");
-        return paramErr;
-    }
-
-    // release created bundle
-    //
-    CFRelease (bundleURLOpenGL);
-
-    // if the code was successfully loaded, look for our function.
-    if (!CFBundleLoadExecutable (gBundleRefOpenGL))
-    {
-        DebugStr ("\pCould not load MachO executable");
-        return paramErr;
-    }
-
-    return err;
-}
-
-
-static void aglDellocEntryPoints (void)
-{
-    if (gBundleRefOpenGL != NULL)
-    {
-        // unload the bundle's code.
-        CFBundleUnloadExecutable (gBundleRefOpenGL);
-        CFRelease (gBundleRefOpenGL);
-        gBundleRefOpenGL = NULL;
-    }
-}
-
-
-static void * aglGetProcAddress (char * pszProc)
-{
-    return CFBundleGetFunctionPointerForName (gBundleRefOpenGL,CFStringCreateWithCStringNoCopy (NULL, pszProc, CFStringGetSystemEncoding (), NULL));
-}
-#endif
 
 /* turn on the warning for the borland compiler*/
 #ifdef __BORLANDC__

Index: extgl.h
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/extgl.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/extgl.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- extgl.h	23 Aug 2003 11:34:14 -0000	1.13
+++ extgl.h	7 Sep 2003 16:11:15 -0000	1.14
@@ -324,7 +324,7 @@
 
 #endif /* X11 */
 
-#ifdef TARGET_OS_MAC
+#ifdef _AGL
 #include <Carbon/Carbon.h>
 #include <OpenGL/gliContext.h>
 #include <OpenGL/gliDispatch.h>
@@ -337,10 +337,10 @@
 typedef GDHandle AGLDevice;
 typedef CGrafPtr AGLDrawable;
 
-OSStatus aglInitEntryPoints(void);
+/*OSStatus aglInitEntryPoints(void);
 void aglDellocEntryPoints (void);
 void * aglGetProcAddress (char * pszProc);
-
+*/
 typedef AGLPixelFormat (APIENTRY * aglChoosePixelFormatEXTPROC)(const AGLDevice *gdevs, GLint ndev, const GLint *attribs);
 typedef void (APIENTRY * aglDestroyPixelFormatEXTPROC)(AGLPixelFormat pix);
 typedef AGLPixelFormat (APIENTRY * aglNextPixelFormatEXTPROC)(AGLPixelFormat pix);
@@ -593,7 +593,7 @@
 
 /************************************************************************/
 
-#endif /* TARGET_OS_MAC */
+#endif /* _AGL */
 
 /*************************************************************/
 /* GLU functions */
@@ -5829,11 +5829,11 @@
 };
 #endif /* X11 */
 
-#ifdef TARGET_OS_MAC
+#ifdef _AGL
 struct AGLExtensionTypes
 {
 };
-#endif /* TARGET_OS_MAC */
+#endif /* _AGL */
 
 struct GLUExtensionTypes
 {
@@ -5851,9 +5851,9 @@
 #ifdef _X11
     struct GLXExtensionTypes glx;
 #endif /* X11 */
-#ifdef TARGET_OS_MAC
+#ifdef _AGL
     struct AGLExtensionTypes agl;
-#endif /* TARGET_OS_MAC */
+#endif /* _AGL */
     
     struct GLUExtensionTypes glu;
     int ARB_imaging;
@@ -5951,17 +5951,9 @@
 
 /* initializes everything, call this right after the rc is created. the function returns 0 if successful */
 int extgl_Initialize();
-#ifdef _X11
 int extgl_Open(void);
+#ifdef _X11
 int extgl_InitGLX(Display *disp, int screen);
-#endif
-
-#ifdef _WIN32
-int extgl_Open(void);
-#endif
-
-#ifdef TARGET_OS_MAC
-int extgl_Open(void);
 #endif
 
 void extgl_Close(void);

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

Update of /cvsroot/java-game-lib/LWJGL/src/native
In directory sc8-pr-cvs1:/tmp/cvs-serv31381

Modified Files:
	configure.in 
Log Message:


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.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- configure.in	7 Sep 2003 13:28:19 -0000	1.37
+++ configure.in	7 Sep 2003 13:46:02 -0000	1.38
@@ -32,14 +32,14 @@
 
 case "$host_os" in
         darwin*)        _BUILD_FLAGS="-D_AGL"
-                        AC_CHECK_HEADER([altypes.h alctypes.h],, AC_MSG_ERROR([OpenAL headers required1]))
+                        AC_CHECK_HEADERS([altypes.h alctypes.h],, AC_MSG_ERROR([OpenAL headers required1]))
                         AC_SUBST(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_HEADER([AL/altypes.h AL/alctypes.h],, AC_MSG_ERROR([OpenAL headers required]))
+                                   AC_CHECK_HEADERS([AL/altypes.h AL/alctypes.h],, AC_MSG_ERROR([OpenAL headers required]))
                                    AC_SUBST(native_build_dir, [linux])
                                    CXXFLAGS="$CXXFLAGS $DEBUG_FLAGS -Wall $_BUILD_FLAGS"
                                    CFLAGS="$CFLAGS $DEBUG_FLAGS -Wall $_BUILD_FLAGS"

Update of /cvsroot/java-game-lib/LWJGL/src/native
In directory sc8-pr-cvs1:/tmp/cvs-serv28704

Modified Files:
	configure.in 
Log Message:


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.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- configure.in	5 Sep 2003 09:39:43 -0000	1.36
+++ configure.in	7 Sep 2003 13:28:19 -0000	1.37
@@ -16,9 +16,6 @@
 AC_PROG_MAKE_SET
 
 AC_PROG_CXX
-CC="$CXX"
-AC_PROG_LIBTOOL 
-
 AC_ARG_ENABLE(debug,
 AC_HELP_STRING([--disable-buidl], [Disable debug build]),
 [build_debug=$enableval], [build_debug=no])
@@ -29,15 +26,20 @@
   DEBUG_FLAGS=
 fi
 
+CC="$CXX"
+AC_LIBTOOL_DLOPEN
+AC_PROG_LIBTOOL 
+
 case "$host_os" in
         darwin*)        _BUILD_FLAGS="-D_AGL"
+                        AC_CHECK_HEADER([altypes.h alctypes.h],, AC_MSG_ERROR([OpenAL headers required1]))
                         AC_SUBST(native_build_dir, [macosx])
                         CXXFLAGS="$CXXFLAGS $DEBUG_FLAGS -Wall $_BUILD_FLAGS"
                         CFLAGS="$CFLAGS $DEBUG_FLAGS -Wall $_BUILD_FLAGS"
                         ;;
 	bsdi* | linux* | solaris*) AC_PATH_XTRA
-                                   AC_LIBTOOL_DLOPEN
                                    _BUILD_FLAGS="-pthread -D_X11 $X_CFLAGS"
+                                   AC_CHECK_HEADER([AL/altypes.h AL/alctypes.h],, AC_MSG_ERROR([OpenAL headers required]))
                                    AC_SUBST(native_build_dir, [linux])
                                    CXXFLAGS="$CXXFLAGS $DEBUG_FLAGS -Wall $_BUILD_FLAGS"
                                    CFLAGS="$CFLAGS $DEBUG_FLAGS -Wall $_BUILD_FLAGS"

Update of /cvsroot/java-game-lib/LWJGL/src/native/common
In directory sc8-pr-cvs1:/tmp/cvs-serv28704/common

Modified Files:
	extal.h 
Log Message:


Index: extal.h
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/extal.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/extal.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- extal.h	17 May 2003 02:50:51 -0000	1.18
+++ extal.h	7 Sep 2003 13:28:19 -0000	1.19
@@ -36,8 +36,14 @@
 #ifdef _WIN32
 #include <windows.h>
 #endif
+
+#ifdef _X11
 #include <AL/altypes.h>
 #include <AL/alctypes.h>
+#else
+#include <altypes.h>
+#include <alctypes.h>
+#endif
 
 #ifdef __cplusplus
 extern "C" {