OpenAL: Fixed native headers, now that altypes.h and alctypes are gone
This commit is contained in:
parent
94f39655a5
commit
9af9ed4320
|
@ -37,28 +37,15 @@
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef _X11
|
|
||||||
#include <AL/altypes.h>
|
|
||||||
#include <AL/alctypes.h>
|
|
||||||
#endif
|
|
||||||
#ifdef _WIN32
|
|
||||||
#include <altypes.h>
|
|
||||||
#include <alctypes.h>
|
|
||||||
#endif
|
|
||||||
#ifdef _MACOSX
|
|
||||||
#include <AL/alctypes.h>
|
|
||||||
#include <AL/altypes.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include <jni.h>
|
#include <jni.h>
|
||||||
#include "common_tools.h"
|
#include "common_tools.h"
|
||||||
|
|
||||||
void extal_InitializeClass(JNIEnv *env, jclass clazz, int num_functions, JavaMethodAndExtFunction *functions);
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
extern "C" {
|
extern "C" {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
void extal_InitializeClass(JNIEnv *env, jclass clazz, int num_functions, JavaMethodAndExtFunction *functions);
|
||||||
|
|
||||||
#if defined(_WIN32)
|
#if defined(_WIN32)
|
||||||
#ifdef _OPENAL32LIB
|
#ifdef _OPENAL32LIB
|
||||||
#define ALCAPI __declspec(dllexport)
|
#define ALCAPI __declspec(dllexport)
|
||||||
|
@ -66,9 +53,6 @@ extern "C" {
|
||||||
#define ALCAPI __declspec(dllimport)
|
#define ALCAPI __declspec(dllimport)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
typedef struct ALCdevice_struct ALCdevice;
|
|
||||||
typedef struct ALCcontext_struct ALCcontext;
|
|
||||||
|
|
||||||
#define ALCAPIENTRY __cdecl
|
#define ALCAPIENTRY __cdecl
|
||||||
#else
|
#else
|
||||||
#define ALCAPI
|
#define ALCAPI
|
||||||
|
@ -93,6 +77,89 @@ extern "C" {
|
||||||
#define INITGUID
|
#define INITGUID
|
||||||
#define OPENAL
|
#define OPENAL
|
||||||
|
|
||||||
|
// ALC typedefs
|
||||||
|
typedef struct ALCdevice_struct ALCdevice;
|
||||||
|
typedef struct ALCcontext_struct ALCcontext;
|
||||||
|
/** 8-bit boolean */
|
||||||
|
typedef char ALCboolean;
|
||||||
|
|
||||||
|
/** character */
|
||||||
|
typedef char ALCchar;
|
||||||
|
|
||||||
|
/** signed 8-bit 2's complement integer */
|
||||||
|
typedef char ALCbyte;
|
||||||
|
|
||||||
|
/** unsigned 8-bit integer */
|
||||||
|
typedef unsigned char ALCubyte;
|
||||||
|
|
||||||
|
/** signed 16-bit 2's complement integer */
|
||||||
|
typedef short ALCshort;
|
||||||
|
|
||||||
|
/** unsigned 16-bit integer */
|
||||||
|
typedef unsigned short ALCushort;
|
||||||
|
|
||||||
|
/** signed 32-bit 2's complement integer */
|
||||||
|
typedef int ALCint;
|
||||||
|
|
||||||
|
/** unsigned 32-bit integer */
|
||||||
|
typedef unsigned int ALCuint;
|
||||||
|
|
||||||
|
/** non-negative 32-bit binary integer size */
|
||||||
|
typedef int ALCsizei;
|
||||||
|
|
||||||
|
/** enumerated 32-bit value */
|
||||||
|
typedef int ALCenum;
|
||||||
|
|
||||||
|
/** 32-bit IEEE754 floating-point */
|
||||||
|
typedef float ALCfloat;
|
||||||
|
|
||||||
|
/** 64-bit IEEE754 floating-point */
|
||||||
|
typedef double ALCdouble;
|
||||||
|
|
||||||
|
/** void type (for opaque pointers only) */
|
||||||
|
typedef void ALCvoid;
|
||||||
|
|
||||||
|
// AL typedefs
|
||||||
|
/** 8-bit boolean */
|
||||||
|
typedef char ALboolean;
|
||||||
|
|
||||||
|
/** character */
|
||||||
|
typedef char ALchar;
|
||||||
|
|
||||||
|
/** signed 8-bit 2's complement integer */
|
||||||
|
typedef char ALbyte;
|
||||||
|
|
||||||
|
/** unsigned 8-bit integer */
|
||||||
|
typedef unsigned char ALubyte;
|
||||||
|
|
||||||
|
/** signed 16-bit 2's complement integer */
|
||||||
|
typedef short ALshort;
|
||||||
|
|
||||||
|
/** unsigned 16-bit integer */
|
||||||
|
typedef unsigned short ALushort;
|
||||||
|
|
||||||
|
/** signed 32-bit 2's complement integer */
|
||||||
|
typedef int ALint;
|
||||||
|
|
||||||
|
/** unsigned 32-bit integer */
|
||||||
|
typedef unsigned int ALuint;
|
||||||
|
|
||||||
|
/** non-negative 32-bit binary integer size */
|
||||||
|
typedef int ALsizei;
|
||||||
|
|
||||||
|
/** enumerated 32-bit value */
|
||||||
|
typedef int ALenum;
|
||||||
|
|
||||||
|
/** 32-bit IEEE754 floating-point */
|
||||||
|
typedef float ALfloat;
|
||||||
|
|
||||||
|
/** 64-bit IEEE754 floating-point */
|
||||||
|
typedef double ALdouble;
|
||||||
|
|
||||||
|
/** void type (for opaque pointers only) */
|
||||||
|
typedef void ALvoid;
|
||||||
|
|
||||||
|
|
||||||
void InitializeOpenAL(JNIEnv *env, jobjectArray oalPaths);
|
void InitializeOpenAL(JNIEnv *env, jobjectArray oalPaths);
|
||||||
void DeInitializeOpenAL();
|
void DeInitializeOpenAL();
|
||||||
|
|
||||||
|
|
|
@ -5,7 +5,7 @@ LINKER=gcc
|
||||||
STRIP=strip
|
STRIP=strip
|
||||||
CFLAGS_LINK=-shared -Wall
|
CFLAGS_LINK=-shared -Wall
|
||||||
LIBS=-L/usr/X11R6/lib -L/usr/X11/lib -lX11 -lXext -lpthread -L$(JAVA_HOME)/jre/lib/i386 -ljawt -Wl,-static,-lXxf86vm,-lXcursor,-lXrender,-lXrandr,-call_shared
|
LIBS=-L/usr/X11R6/lib -L/usr/X11/lib -lX11 -lXext -lpthread -L$(JAVA_HOME)/jre/lib/i386 -ljawt -Wl,-static,-lXxf86vm,-lXcursor,-lXrender,-lXrandr,-call_shared
|
||||||
CFLAGS_O=-fPIC -O2 -D_X11 -Wall -pthread -c -I../common -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux
|
CFLAGS_O=-fPIC -O2 -D_X11 -Wall -pthread -c -I../common -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I$(AL_HOME)/include
|
||||||
SRC=$(wildcard *.c) $(wildcard ../common/*.c) $(wildcard ../generated/*c)
|
SRC=$(wildcard *.c) $(wildcard ../common/*.c) $(wildcard ../generated/*c)
|
||||||
OBJECTS=$(subst .c,.o,$(SRC))
|
OBJECTS=$(subst .c,.o,$(SRC))
|
||||||
LIBRARY=liblwjgl.so
|
LIBRARY=liblwjgl.so
|
||||||
|
|
Loading…
Reference in New Issue