diff options
| author | Sven Gothel <[email protected]> | 2013-06-16 19:16:31 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2013-06-16 19:16:31 +0200 |
| commit | 5d211c6fa6a0452cc4569712e436184e34504a88 (patch) | |
| tree | bdd90a5b7ccad4a3b62350c0b6699d3e0c66a92a /make/build.xml | |
| parent | d01cb422c4621fbc1b5ea2bcd7d19f3ff8602715 (diff) | |
Fix DynamicLinker Impl: Add Bionic specialization using Bionic's non POSIX values; Using same pattern for Mac OS X.
Add Bionic specialization using Bionic's non POSIX values
- derive from UnixDynamicLinkerImpl
- specify own flag and mode values
- use UnixDynamicLinkerImpl native code
Using same pattern for Mac OS X
- derive from UnixDynamicLinkerImpl
- specify own flag and mode values
- use UnixDynamicLinkerImpl native code
- drop MacOSXDynamicLinkerImpl native code
Diffstat (limited to 'make/build.xml')
| -rw-r--r-- | make/build.xml | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/make/build.xml b/make/build.xml index 90151c6..5f9e570 100644 --- a/make/build.xml +++ b/make/build.xml @@ -100,7 +100,6 @@ <mkdir dir="${src.generated.java}" /> <mkdir dir="${src.generated.c}" /> <mkdir dir="${src.generated.c}/Unix" /> - <mkdir dir="${src.generated.c}/MacOSX" /> <mkdir dir="${src.generated.c}/Windows" /> <mkdir dir="${classes}" /> @@ -440,7 +439,7 @@ <echo message="MacOSX" /> <property name="compiler.cfg.id" value="compiler.cfg.macosx" /> <property name="linker.cfg.id" value="linker.cfg.macosx" /> - <property name="c.src.dir.os" value="macosx" /> + <property name="c.src.dir.os" value="unix" /> </target> <target name="declare.freebsd.amd64" if="isFreeBSDAMD64"> @@ -514,7 +513,6 @@ <javah destdir="${src.generated.c}" classpath="${classes}" class="jogamp.common.jvm.JVMUtil" /> <javah destdir="${src.generated.c}" classpath="${classes}" class="com.jogamp.common.nio.PointerBuffer" /> <javah destdir="${src.generated.c}/Unix" classpath="${classes}" class="jogamp.common.os.UnixDynamicLinkerImpl" /> - <javah destdir="${src.generated.c}/MacOSX" classpath="${classes}" class="jogamp.common.os.MacOSXDynamicLinkerImpl" /> <javah destdir="${src.generated.c}/Windows" classpath="${classes}" class="jogamp.common.os.WindowsDynamicLinkerImpl"/> <echo message="Output lib name = ${output.lib.name} -> ${output.lib.name.os}" /> @@ -555,7 +553,7 @@ <includepath path="${src.generated.c}" /> <includepath path="${src.generated.c}/Unix" if="isUnix"/> - <includepath path="${src.generated.c}/MacOSX" if="isOSX"/> + <includepath path="${src.generated.c}/Unix" if="isOSX"/> <includepath path="${src.generated.c}/Windows" if="isWindows"/> </compiler> |