summaryrefslogtreecommitdiffstats
path: root/make/gluegen-properties.xml
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2010-04-08 02:22:12 +0200
committerSven Gothel <[email protected]>2010-04-08 02:22:12 +0200
commit7cc4bb2a8bcc4c16b6a12826abbd874bf38f9dc1 (patch)
treeeb932553d0f9b36dbe6d703356502bf352cc6eca /make/gluegen-properties.xml
parent82ac66ba1e7494b0a76a2063f0d56d3b785c6c31 (diff)
http://jogamp.org/bugzilla/show_bug.cgi?id=393
Fixed junit test: test1 - Create seperate native libraries to reflect a real world example: test1 - the library to bind to (no more declaring __stdcall @nn functions) BindingTest1p1 - the dynamic fixed linkage binding test1p1, references dynamic library test1 at linktime. BindingTest1p2 - the dynamic runtime linkage binding test1p2, loads dynamic library test1 at runtime. Generic: - gluegen-cpptasks-base.xml - target 'gluegen.cpptasks.detect.os' Set new property 'system.env.library.path' DYLD_LIBRARY_PATH (macosx) LD_LIBRARY_PATH (unix) PATH (windows) - target 'gluegen.cpptasks.striplibs' Strips the symbols out of the native libraries in case c.compiler.debug is false. Maybe configured with the properties: c.strip.tool, c.strip.args - Using system.env.library.path in junit call to find the test1 library in case of runtime linkage and lookup (test1p2). - Use gluegen.cpptasks.striplibs for all native libs .. - Added macosx32 in analogy to macosx64, both defaults to true now - com.jogamp.common.os.WindowsDynamicLinkerImpl:lookupSymbol() - Added lookup for __stdcall @nn (stepping alignment 4, max-args: 12) in case no undecorated __cdecl symbol is found. Fixed Windows platform: - Use proper path.seperator on Windows. - test1.dll needs proper soname inside for fixed linkage (test1p1) hence the output name must be test1.dll, not libtest1.so +++ http://jogamp.org/bugzilla/show_bug.cgi?id=394 Fix MacOsX platform: The commit of cpptasks.jar, git hash 129e783741d91e9ee5cd7da5d5c962c32ec96b0b, broke the universal binary build on MacOSX. The above change used cpptasks-1.05b with a few patches in regards to crosscompilation, but missed one, which accepts the '-arch' argument for GccLinker undecorated. The new cpptasks.jar is vanilla 1.05b + cpptasks-1.0b5-darwin-patch.diff, the latter a more refined one. This version accepts the '-arch' argument undecorated on the darwin platform. +++
Diffstat (limited to 'make/gluegen-properties.xml')
-rwxr-xr-xmake/gluegen-properties.xml20
1 files changed, 14 insertions, 6 deletions
diff --git a/make/gluegen-properties.xml b/make/gluegen-properties.xml
index 19483bb..2afc533 100755
--- a/make/gluegen-properties.xml
+++ b/make/gluegen-properties.xml
@@ -11,14 +11,22 @@
- c.compiler.debug:
- set to "true" if debug version of the compiled
- C code is desired.
+ -
+ - MacOsX libraries can be universal / fat binaries.
+ - The following switches enables/disables a target platform.
+ - If non of them is enabled, the default
+ - compiler target platform is used for a thin binary.
+ -
- macosppc:
- - set to "true" if ppc universal / fat binaries are desired
- - on Mac OS X. Requires support for cross-compilation from the
- - underlying C compiler. Note: Unsupported on Snow Leopard!
+ - set to "true" for ppc support,
+ - default is 'false'
+ - Note: Unsupported on Snow Leopard!
+ - macosx32:
+ - set to "false" to disable x86 32-bit support,
+ - default is 'true'
- macosx64:
- - set to "true" if 64-bit universal / fat binaries are desired
- - on Mac OS X. Requires support for cross-compilation from the
- - underlying C compiler.
+ - set to "false" to disable x86 64-bit support,
+ - default is 'true'
-
-->
<project name="GlueGen-properties" basedir=".">