[Opentnl-cvs] tnl/openal al.h,1.1,1.2 alInclude.h,1.1,1.2 alc.h,1.1,1.2 alu.h,1.1,1.2 alut.h,1.1,1.2

[John Q. <jm...@us...>]

Update of /cvsroot/opentnl/tnl/openal
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14536

Modified Files:
	al.h alInclude.h alc.h alu.h alut.h 
Log Message:
Hacks to make creative openal headers compile on linux


Index: alut.h
===================================================================
RCS file: /cvsroot/opentnl/tnl/openal/alut.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** alut.h	20 Apr 2004 04:27:16 -0000	1.1
--- alut.h	20 Apr 2004 09:23:40 -0000	1.2
***************
*** 5,8 ****
--- 5,15 ----
  #define ALUTAPIENTRY __cdecl
  
+ #if defined(__linux)
+ #undef ALUTAPIENTRY
+ #define ALUTAPIENTRY
+ typedef ALCvoid ALCdevice;
+ typedef ALCvoid ALCcontext;
+ #endif
+ 
  #include "al.h"
  #include "alu.h"

Index: alc.h
===================================================================
RCS file: /cvsroot/opentnl/tnl/openal/alc.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** alc.h	20 Apr 2004 04:27:16 -0000	1.1
--- alc.h	20 Apr 2004 09:23:40 -0000	1.2
***************
*** 30,34 ****
  #endif
  
! 
  
  #ifndef ALC_NO_PROTOTYPES
--- 30,41 ----
  #endif
  
! // JMQ: hack for linux.  we really shouldn't be using the creative
! // headers with the linux lib.
! #if defined(__linux)
! #undef ALCAPIENTRY
! #define ALCAPIENTRY
! typedef ALCvoid ALCdevice;
! typedef ALCvoid ALCcontext;
! #endif
  
  #ifndef ALC_NO_PROTOTYPES

Index: al.h
===================================================================
RCS file: /cvsroot/opentnl/tnl/openal/al.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** al.h	20 Apr 2004 04:27:16 -0000	1.1
--- al.h	20 Apr 2004 09:23:40 -0000	1.2
***************
*** 46,49 ****
--- 46,58 ----
  #endif
  
+ // JMQ: hack for linux.  we really shouldn't be using the creative
+ // headers with the linux lib.
+ #if defined(__linux)
+ #undef ALAPIENTRY
+ #define ALAPIENTRY
+ typedef ALCvoid ALCdevice;
+ typedef ALCvoid ALCcontext;
+ #endif
+ 
  #define OPENAL
  

Index: alInclude.h
===================================================================
RCS file: /cvsroot/opentnl/tnl/openal/alInclude.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** alInclude.h	20 Apr 2004 04:27:16 -0000	1.1
--- alInclude.h	20 Apr 2004 09:23:40 -0000	1.2
***************
*** 32,34 ****
  
  
! #endif
\ No newline at end of file
--- 32,34 ----
  
  
! #endif

Index: alu.h
===================================================================
RCS file: /cvsroot/opentnl/tnl/openal/alu.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** alu.h	20 Apr 2004 04:27:16 -0000	1.1
--- alu.h	20 Apr 2004 09:23:40 -0000	1.2
***************
*** 5,8 ****
--- 5,15 ----
  #define ALUAPIENTRY __cdecl
  
+ #if defined(__linux)
+ #undef ALUAPIENTRY
+ #define ALUAPIENTRY
+ typedef ALCvoid ALCdevice;
+ typedef ALCvoid ALCcontext;
+ #endif
+ 
  #define BUFFERSIZE 48000
  #define FRACTIONBITS 14