diff options
| -rwxr-xr-x | make/gluegen-cpptasks-base.xml | 1 | ||||
| -rwxr-xr-x | make/jogamp-env.xml | 7 | ||||
| -rw-r--r-- | make/lib/cpptasks.jar | bin | 375610 -> 377915 bytes | |||
| -rwxr-xr-x | make/lib/gluegen-clang.properties | 2 |
4 files changed, 9 insertions, 1 deletions
diff --git a/make/gluegen-cpptasks-base.xml b/make/gluegen-cpptasks-base.xml index 123af4b..b726737 100755 --- a/make/gluegen-cpptasks-base.xml +++ b/make/gluegen-cpptasks-base.xml @@ -1050,6 +1050,7 @@ <compilerarg value="-Wmost" /> <compilerarg value="-ObjC" /> <compilerarg value="-mmacosx-version-min=10.5"/> + <!-- sysincludepath path="${macosx.sdkroot}" if="macosx.sdkroot"/ --> <defineset> <define name="_DEBUG" if="c.compiler.use-debug"/> <define name="DEBUG" if="c.compiler.use-debug"/> diff --git a/make/jogamp-env.xml b/make/jogamp-env.xml index 0dd9adc..6b37ead 100755 --- a/make/jogamp-env.xml +++ b/make/jogamp-env.xml @@ -260,6 +260,13 @@ <echo message="junit.run.arg0 ${junit.run.arg0}"/> <echo message="junit.run.arg1 ${junit.run.arg1}"/> + <condition property="macosx.sdkroot" value="${env.SDKROOT}"> + <not> + <equals arg1="${env.SDKROOT}" arg2="$${env.SDKROOT}" casesensitive="true" /> + </not> + </condition> + <echo message="macosx.sdkroot ${macosx.sdkroot}"/> + </target> </project> diff --git a/make/lib/cpptasks.jar b/make/lib/cpptasks.jar Binary files differindex 046a01c..afe7f0f 100644 --- a/make/lib/cpptasks.jar +++ b/make/lib/cpptasks.jar diff --git a/make/lib/gluegen-clang.properties b/make/lib/gluegen-clang.properties index bbb77ae..7526552 100755 --- a/make/lib/gluegen-clang.properties +++ b/make/lib/gluegen-clang.properties @@ -1 +1 @@ -gcc.compat.compiler=clang +gcc.compat.compiler=xcode.clang |