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.

+++

1 files changed, 27 insertions, 19 deletions

diff --git a/make/gluegen.properties b/make/gluegen.properties
index 8d667b4..2f319bc 100755
--- a/make/gluegen.properties
+++ b/make/gluegen.properties
@@ -13,13 +13,13 @@
 # including the name of the jar
 #
 # Windows
-antlr.jar=C:/Users/kbr/ANTLR/antlr-2.7.2/antlr.jar
-# Linux
-# antlr.jar=/home/kbr/antlr-2.7.2/antlr.jar
+antlr.jar=C:/JOGL/lib/antlr-2.7.2.jar
+# Linux / Solaris / ..
+# antlr.jar=/home/sven/projects/JOGL/lib/antlr-2.7.7.jar
 # Mac OS X
-# antlr.jar=/Users/kbr/antlr-2.7.2/antlr.jar
-# Solaris
-# antlr.jar=/export/kbr/ANTLR/antlr-2.7.2/antlr.jar
+# antlr.jar=/JOGL/lib/antlr-2.7.2.jar
+
+junit.jar=/home/sven/projects/JOGL/lib/junit-4.5.jar
 
 # If you are building the native code for the GlueGen run-time library
 # on Windows and have the Microsoft Visual C++ compilers installed,
@@ -28,19 +28,27 @@ antlr.jar=C:/Users/kbr/ANTLR/antlr-2.7.2/antlr.jar
 # "mingw".
 # win32.c.compiler=vc6
 
-# If you are building on a Mac OS X system supporting
-# cross-compilation and want to generate fat binaries containing
-# x86_64 code, uncomment the property below
-# macosx64=true
-
-# If you are building on a Mac OS X system supporting
-# cross-compilation and want to generate fat binaries containing
-# ppc code, uncomment the property below.
-# Note: Unsupported on Snow Leopard!
+#   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" for ppc support,
+#       default is 'false'
+#       Note: Unsupported on Snow Leopard!
 # macosppc=true
+#
+#   macosx32:
+#       set to "false" to disable x86 32-bit support,
+#       default is 'true'
+# macosx32=false
+#
+#   macosx64:
+#       set to "false" to disable x86 64-bit support,
+#       default is 'true'
+# macosx64=false
+# 
 
-# isX11 is selected for a platform where: !isWindows && !isOSX.
-# To avoid X11 related builds you need to set 'noX11' to true.
-# noX11=true
 
-#user.compiler.import="${user.home}/gluegen.compiler.xml"
+#gluegen-cpptasks.file="${user.home}/gluegen-cpptasks-linux-32bit.xml"