From: Brian M. <ma...@us...> - 2002-11-28 20:25:13
|
Update of /cvsroot/java-game-lib/LWJGL/src/native/common In directory sc8-pr-cvs1:/tmp/cvs-serv25366 Modified Files: org_lwjgl_openal_ALC.cpp org_lwjgl_openal_ALUT.cpp org_lwjgl_openal_CoreAL.cpp org_lwjgl_openal_eax_CoreEAX.cpp Log Message: fix: make OpenAL compile, by not including extal.h in files, but CoreEAX - somekind of circular dependency ? Index: org_lwjgl_openal_ALC.cpp CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_openal_ALC.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_openal_ALC.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- org_lwjgl_openal_ALC.cpp 26 Nov 2002 23:28:48 -0000 1.2 +++ org_lwjgl_openal_ALC.cpp 28 Nov 2002 20:25:10 -0000 1.3 @@ -39,8 +39,10 @@ * @version $Revision$ */ #include "org_lwjgl_openal_ALC.h" -#include "extal.h" + +/* OpenAL includes */ #include "checkALerror.h" +#include <AL/alc.h> /* * Class: org_lwjgl_openal_ALC Index: org_lwjgl_openal_ALUT.cpp CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_openal_ALUT.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_openal_ALUT.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- org_lwjgl_openal_ALUT.cpp 26 Nov 2002 23:29:59 -0000 1.2 +++ org_lwjgl_openal_ALUT.cpp 28 Nov 2002 20:25:10 -0000 1.3 @@ -40,13 +40,12 @@ * @version $Revision$ */ #include "org_lwjgl_openal_ALUT.h" -/* OpenAL includes */ -#include "extal.h" - -#include "checkALerror.h" - #include <stdlib.h> + +/* OpenAL includes */ +#include "checkALerror.h" +#include <AL/alut.h> /* * Class: org_lwjgl_openal_ALUT Index: org_lwjgl_openal_CoreAL.cpp CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_openal_CoreAL.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_openal_CoreAL.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- org_lwjgl_openal_CoreAL.cpp 26 Nov 2002 23:30:39 -0000 1.2 +++ org_lwjgl_openal_CoreAL.cpp 28 Nov 2002 20:25:10 -0000 1.3 @@ -40,10 +40,10 @@ * @version $Revision$ */ #include "org_lwjgl_openal_CoreAL.h" + /* OpenAL includes */ -#include "extal.h" #include "checkALerror.h" - +#include <AL/al.h> /** * This function enables a feature of the OpenAL driver. Index: org_lwjgl_openal_eax_CoreEAX.cpp CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_openal_eax_CoreEAX.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_openal_eax_CoreEAX.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- org_lwjgl_openal_eax_CoreEAX.cpp 26 Nov 2002 23:31:14 -0000 1.2 +++ org_lwjgl_openal_eax_CoreEAX.cpp 28 Nov 2002 20:25:10 -0000 1.3 @@ -39,8 +39,11 @@ * @version $Revision$ */ #include "org_lwjgl_openal_eax_CoreEAX.h" + +/* OpenAL includes */ #include "extal.h" #include "checkALerror.h" +#include <AL/alc.h> /** * Throws an OAL exception with the specified message |