diff options
| author | Sven Gothel <[email protected]> | 2013-10-24 23:43:43 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2013-10-24 23:43:43 +0200 |
| commit | 970c9823007d1618e67480440ff40e7802dbb90f (patch) | |
| tree | e29237cb0baa8121193ece29aa9d84a5e03f08f6 | |
| parent | 38025a602750161c72a50ad7a25e97fb7a6cb6df (diff) | |
Bug 871 - Add optional xcode.clang support for all modules (Extends Bug 837 w/ xcode's xcrun) - Remove abs. include path.
#include </usr/include/machine/types.h> -> #include <machine/types.h>
| -rw-r--r-- | make/config/jogl/cgl-macosx.cfg | 2 | ||||
| -rw-r--r-- | make/config/jogl/gl-headers.cfg | 2 | ||||
| -rw-r--r-- | make/config/jogl/gl3-headers.cfg | 2 | ||||
| -rw-r--r-- | make/config/jogl/glu-gl2.cfg | 2 | ||||
| -rw-r--r-- | make/config/nativewindow/jawt-macosx.cfg | 2 | ||||
| -rw-r--r-- | src/jogl/native/macosx/MacOSXCustomCGLCode.c | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/make/config/jogl/cgl-macosx.cfg b/make/config/jogl/cgl-macosx.cfg index edb5bfbbf..a67ee8087 100644 --- a/make/config/jogl/cgl-macosx.cfg +++ b/make/config/jogl/cgl-macosx.cfg @@ -31,7 +31,7 @@ Opaque long NSOpenGLView * Opaque long NSOpenGLPixelBuffer * Opaque long NSOpenGLLayer * -CustomCCode #include </usr/include/machine/types.h> +CustomCCode #include <machine/types.h> CustomCCode #include "macosx-window-system.h" AccessControl createNSOpenGLLayerImpl PRIVATE diff --git a/make/config/jogl/gl-headers.cfg b/make/config/jogl/gl-headers.cfg index 073f9d9a0..0916fa348 100644 --- a/make/config/jogl/gl-headers.cfg +++ b/make/config/jogl/gl-headers.cfg @@ -20,7 +20,7 @@ CustomCCode #include <inttypes.h> CustomCCode #include <stdlib.h> CustomCCode /* Include the OpenGL headers */ CustomCCode #include <GL/gl.h> -CustomCCode #include </usr/include/machine/types.h> +CustomCCode #include <machine/types.h> CustomCCode /* Provide Windows typedefs */ CustomCCode typedef void* LPVOID; CustomCCode typedef unsigned int* PUINT; diff --git a/make/config/jogl/gl3-headers.cfg b/make/config/jogl/gl3-headers.cfg index a4c5cf62a..d76d3ae4c 100644 --- a/make/config/jogl/gl3-headers.cfg +++ b/make/config/jogl/gl3-headers.cfg @@ -15,7 +15,7 @@ CustomCCode #include <inttypes.h> CustomCCode #include <stdlib.h> CustomCCode #include <GL/glcorearb.h> CustomCCode #include <GL/glcorearbext.h> -CustomCCode #include </usr/include/machine/types.h> +CustomCCode #include <machine/types.h> CustomCCode /* Provide Windows typedefs */ CustomCCode typedef void* LPVOID; CustomCCode typedef unsigned int* PUINT; diff --git a/make/config/jogl/glu-gl2.cfg b/make/config/jogl/glu-gl2.cfg index 491d9224f..a634e3113 100644 --- a/make/config/jogl/glu-gl2.cfg +++ b/make/config/jogl/glu-gl2.cfg @@ -18,7 +18,7 @@ CustomCCode #include <stddef.h> CustomCCode #elif defined(__APPLE__) CustomCCode #include <inttypes.h> CustomCCode #include <jni.h> -CustomCCode #include </usr/include/machine/types.h> +CustomCCode #include <machine/types.h> CustomCCode #elif defined(__unix__) CustomCCode #include <inttypes.h> CustomCCode #endif diff --git a/make/config/nativewindow/jawt-macosx.cfg b/make/config/nativewindow/jawt-macosx.cfg index 20260f693..5f6bbfd21 100644 --- a/make/config/nativewindow/jawt-macosx.cfg +++ b/make/config/nativewindow/jawt-macosx.cfg @@ -8,7 +8,7 @@ Opaque long NSView * Opaque long CALayer * CustomCCode #include <inttypes.h> -CustomCCode #include </usr/include/machine/types.h> +CustomCCode #include <machine/types.h> StructPackage JAWT_MacOSXDrawingSurfaceInfo jogamp.nativewindow.jawt.macosx EmitStruct JAWT_MacOSXDrawingSurfaceInfo diff --git a/src/jogl/native/macosx/MacOSXCustomCGLCode.c b/src/jogl/native/macosx/MacOSXCustomCGLCode.c index f8b7a800f..75896c3a2 100644 --- a/src/jogl/native/macosx/MacOSXCustomCGLCode.c +++ b/src/jogl/native/macosx/MacOSXCustomCGLCode.c @@ -2,7 +2,7 @@ #include <assert.h> -#include </usr/include/machine/types.h> +#include <machine/types.h> #include "macosx-window-system.h" void CGLQueryPixelFormat(CGLPixelFormatObj fmt, int* iattrs, int niattrs, int* ivalues) { |