Re: Building git master on OS X 10.8
Posted by
jrh on
URL: https://forum.jogamp.org/Building-git-master-on-OS-X-10-8-tp4025646p4026238.html
Sven Gothel wrote
Thank you. Maybe you can add your findings to bugzilla, so they don't get lost ?
Is there an existing bug that I should add it to, or should I create a new one?
Sven Gothel wrote
Then .. we would need to put all this permanent w/o hurting other OSX
versions, then it would be ready for a git pull.
The source file #include changes I made should be usable as-is, i.e.
jogamp/jogl $ git diff
diff --git a/src/nativewindow/native/JAWT_DrawingSurfaceInfo.c b/src/nativewindow/native/JAWT_DrawingSurfaceInfo.c
index 2a66510..829dd19 100644
--- a/src/nativewindow/native/JAWT_DrawingSurfaceInfo.c
+++ b/src/nativewindow/native/JAWT_DrawingSurfaceInfo.c
@@ -37,7 +37,11 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
+#ifdef __APPLE__
+#include <JavaVM/jawt_md.h>
+#else
#include <jawt_md.h>
+#endif
#ifdef WIN32
#define PLATFORM_DSI_SIZE sizeof(JAWT_Win32DrawingSurfaceInfo)
diff --git a/src/nativewindow/native/macosx/OSXmisc.m b/src/nativewindow/native/macosx/OSXmisc.m
index 1cf41fc..5b4c8e5 100644
--- a/src/nativewindow/native/macosx/OSXmisc.m
+++ b/src/nativewindow/native/macosx/OSXmisc.m
@@ -37,7 +37,7 @@
#include "jogamp_nativewindow_macosx_OSXUtil.h"
#include "jogamp_nativewindow_jawt_macosx_MacOSXJAWTWindow.h"
-#include <jawt_md.h>
+#include <JavaVM/jawt_md.h>
#import <JavaNativeFoundation.h>
// #define VERBOSE 1
but my ANT skills aren't up to the task right now to provide patches that maintain sufficient backwards compatibility. I can tell you what the values should be for 10.8 with Oracle Java 7 (or OpenJDK 7, I would think), and if somebody else makes the changes to gluegen-cpptasks-base.xml I'll certainly volunteer to test them.