From 7409ab0f5ef15096661702da5c052ceb621af4e3 Mon Sep 17 00:00:00 2001 From: kbr Date: Fri, 28 Jul 2006 16:13:15 +0000 Subject: Fixed build issues on non-Windows platforms due to inclusion of EFX entry points git-svn-id: file:///home/mbien/NetBeansProjects/JOGAMP/joal-sync/git-svn/../svn-server-sync/joal/trunk@234 03bf7f67-59de-4072-a415-9a990d468a3f --- make/joal.cfg | 3 +++ make/joal.properties | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/make/joal.cfg b/make/joal.cfg index 7d35307..7e2d594 100755 --- a/make/joal.cfg +++ b/make/joal.cfg @@ -55,6 +55,9 @@ ArgumentIsString alGetProcAddress 0 # Provide #includes to native code CustomCCode #include "al.h" +CustomCCode #ifndef _MSC_VER /* Non-Windows platforms */ +CustomCCode #define __cdecl /* Trim non-standard keyword */ +CustomCCode #endif CustomCCode #include "efx.h" CustomJavaCode ALImpl /** Provides dlsym() capabilities because alGetProcAddress is diff --git a/make/joal.properties b/make/joal.properties index 635d975..b7a5f69 100755 --- a/make/joal.properties +++ b/make/joal.properties @@ -25,7 +25,7 @@ # Linux # joal.lib.dir=/usr/lib # Mac OS X -# joal.lib.dir=/Library/Frameworks/OpenAL.framework +# joal.lib.dir=/System/Library/Frameworks/OpenAL.framework # Solaris (not yet supported) # joal.lib.dir=/usr/lib -- cgit v1.2.3