diff options
| author | Kenneth Russel <[email protected]> | 2005-01-28 03:25:58 +0000 |
|---|---|---|
| committer | Kenneth Russel <[email protected]> | 2005-01-28 03:25:58 +0000 |
| commit | b4396b83e120bf2defc5598ba95fe02992805b3f (patch) | |
| tree | 8e55031b92897ff87b7206b522c6a903f9ad633d /src | |
| parent | 0e0957380a24ea02bdcb3ae652b9367d505345f2 (diff) | |
Fixed Issue 126: Patch to allow building native driver on BSD
Incorporated patch, slightly modified to not perturb the Linux build
in any way.
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@194 232f8b59-042b-4e1e-8c03-345bb8c30851
Diffstat (limited to 'src')
| -rw-r--r-- | src/native/jogl/JAWT_DrawingSurfaceInfo.c | 2 | ||||
| -rw-r--r-- | src/net/java/games/gluegen/StructLayout.java | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/native/jogl/JAWT_DrawingSurfaceInfo.c b/src/native/jogl/JAWT_DrawingSurfaceInfo.c index 523bfba3e..59c575f0c 100644 --- a/src/native/jogl/JAWT_DrawingSurfaceInfo.c +++ b/src/native/jogl/JAWT_DrawingSurfaceInfo.c @@ -42,7 +42,7 @@ #ifdef WIN32 #define PLATFORM_DSI_SIZE sizeof(JAWT_Win32DrawingSurfaceInfo) static const char* platformDSIClassName = "net/java/games/jogl/impl/windows/JAWT_Win32DrawingSurfaceInfo"; -#elif defined(linux) || defined(__sun) +#elif defined(linux) || defined(__sun) || defined(__FreeBSD__) #define PLATFORM_DSI_SIZE sizeof(JAWT_X11DrawingSurfaceInfo) static const char* platformDSIClassName = "net/java/games/jogl/impl/x11/JAWT_X11DrawingSurfaceInfo"; #elif defined(macosx) diff --git a/src/net/java/games/gluegen/StructLayout.java b/src/net/java/games/gluegen/StructLayout.java index 7e32df683..ebbace6b5 100644 --- a/src/net/java/games/gluegen/StructLayout.java +++ b/src/net/java/games/gluegen/StructLayout.java @@ -125,8 +125,9 @@ public class StructLayout { (os.startsWith("linux") && cpu.equals("i386")) || (os.startsWith("linux") && cpu.equals("amd64")) || (os.startsWith("sunos") && cpu.equals("sparc")) || - (os.startsWith("sunos") && cpu.equals("x86"))|| - (os.startsWith("mac os") && cpu.equals("ppc")) + (os.startsWith("sunos") && cpu.equals("x86")) || + (os.startsWith("mac os") && cpu.equals("ppc")) || + (os.startsWith("freebsd") && cpu.equals("i386")) ) { // FIXME: make struct alignment configurable? May need to change // packing rules on a per-type basis? |