From 7d552f2b56ec4b4c76e81dcf6f5f1758c8de75f2 Mon Sep 17 00:00:00 2001
From: gregorypierce <gregorypierce@dev.java.net>
Date: Sat, 28 Feb 2004 06:53:32 +0000
Subject: Update for custom pixel formats in OSX Issue number: Obtained from:
 Submitted by: Gregory Pierce Reviewed by:

git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@85 232f8b59-042b-4e1e-8c03-345bb8c30851
---
 make/build.xml           | 14 +++++++-------
 make/cgl-macosx.cfg      |  2 +-
 make/glu-impl-macosx.cfg |  1 +
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/make/build.xml b/make/build.xml
index 3d2fc663f..dcba318f7 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -418,14 +418,14 @@
 
         <!-- Set up gcc -->
         <property name="c.compiler" value="gcc" />
-        <property name="c.compiler.optflags" value="-Os -arch ppc -Dmacosx" />
-	<!-- Note: specifying -ObjC for all files is sloppy (only needed for      -->
-	<!-- JAWT-related .c files) but this doesn't break anything and is easier -->
-	<!-- than rewriting the whole Makefile                                    -->
+        <property name="c.compiler.optflags" value="-fast -mcpu=7450 -arch ppc -Dmacosx -fPIC" />
+		<!-- Note: specifying -ObjC for all files is sloppy (only needed for      -->
+		<!-- JAWT-related .c files) but this doesn't break anything and is easier -->
+		<!-- than rewriting the whole Makefile                                    -->
         <property name="c.compiler.flags" value="${c.compiler.optflags} -fno-common -fpascal-strings  -Wmost -ObjC -c -o" />
         <property name="c.compiler.obj.suffix" value="o" />
-	<property name="c.compiler.jogl.outputfile.expr" value="${rootrel.obj.jogl}/*.${c.compiler.obj.suffix}" />
-	<property name="c.compiler.includes" value="-I&quot;make/stub_includes/opengl&quot; -I&quot;${java.includes.dir}&quot; -I&quot;${java.includes.dir.platform}&quot; -I&quot;make/stub_includes/cg&quot;" />
+		<property name="c.compiler.jogl.outputfile.expr" value="${rootrel.obj.jogl}/*.${c.compiler.obj.suffix}" />
+		<property name="c.compiler.includes" value="-I&quot;make/stub_includes/opengl&quot; -I&quot;${java.includes.dir}&quot; -I&quot;${java.includes.dir.platform}&quot; -I&quot;make/stub_includes/cg&quot;" />
         <property name="c.linker" value="gcc" />
         <property name="c.linker.flags" value="-arch ppc -prebind -Wl,-single_module -dynamiclib -compatibility_version 1 -current_version 1 -prebind_all_twolevel_modules" />
         <property name="c.linker.jogl.libs" value="-L&quot;${java.lib.dir.platform}&quot; -framework Cocoa -framework OpenGL -ljawt" />
@@ -433,7 +433,7 @@
         <property name="c.linker.jogl.dso" value="${project.root}/${rootrel.c.linker.jogl.dso}" />
         <property name="c.linker.jogl.flags" value="-o ${c.linker.jogl.dso}" />
         <!-- Cg declarations -->
-	<property name="c.compiler.cg.outputfile.expr" value="${rootrel.obj.cg}/*.${c.compiler.obj.suffix}" />
+		<property name="c.compiler.cg.outputfile.expr" value="${rootrel.obj.cg}/*.${c.compiler.obj.suffix}" />
         <property name="c.linker.cg.libs" value="-framework OpenGL -lCg -lCgGL" />
         <property name="rootrel.c.linker.cg.dso" value="${rootrel.obj}/libjogl_cg.jnilib" />
         <property name="c.linker.cg.dso" value="${project.root}/${rootrel.c.linker.cg.dso}" />
diff --git a/make/cgl-macosx.cfg b/make/cgl-macosx.cfg
index 5f32db492..6592f98dd 100644
--- a/make/cgl-macosx.cfg
+++ b/make/cgl-macosx.cfg
@@ -13,7 +13,7 @@ Opaque long void *
 # this was the easiest way of sharing the prototypes between these files
 CustomCCode typedef int Bool;
 
-CustomCCode extern void* createContext(void* shareContext, void* nsView);
+CustomCCode extern void* createContext(JNIEnv * env, jobject glCapabilities, void* shareContext, void* nsView);
 CustomCCode extern Bool makeCurrentContext(void* nsContext, void* nsView);
 CustomCCode extern Bool clearCurrentContext(void* nsContext, void* nsView);
 CustomCCode extern Bool deleteContext(void* nsContext, void* nsView);
diff --git a/make/glu-impl-macosx.cfg b/make/glu-impl-macosx.cfg
index 5e856c7ec..6dac11f54 100644
--- a/make/glu-impl-macosx.cfg
+++ b/make/glu-impl-macosx.cfg
@@ -4,3 +4,4 @@
 Include glu-impl-common.cfg
 
 CustomCCode #include <inttypes.h>
+CustomCCode #include <jni.h>
-- 
cgit v1.2.3