Darwin: Config/source fixes to now build glxdemo apps and OSMesa

Also added darwin-fat-32bit darwin-fat-all configs and deleted old darwin-x86ppc config
(cherry picked from commit 7120c0089d663a2b7e7b0c97da38f9bc233fbdd7)

diff --git a/Makefile b/Makefile
index 692cfab2b64db8b22306002ddc0a4ce12111759e..df8e6a8ab88e3244d47d5f75909d530e5a86f49e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -74,9 +74,10 @@ bluegene-xlc-osmesa \
 beos \
 catamount-osmesa-pgi \
 darwin \
+darwin-fat-32bit \
+darwin-fat-all \
 darwin-static \
 darwin-static-x86ppc \
-darwin-x86ppc \
 freebsd \
 freebsd-dri \
 freebsd-dri-amd64 \

diff --git a/configs/darwin b/configs/darwin
index 438abd94c1ce697ede068029604b7232bf16e42b..c7f94d2badae4da5b86ae883e1bc71362cd3948c 100644 (file)
--- a/configs/darwin
+++ b/configs/darwin
@@ -4,10 +4,9 @@ include $(TOP)/configs/default
 
 CONFIG_NAME = darwin
 
-DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \
-         -D_BSD_SOURCE -D_GNU_SOURCE \
-         -DGLX_INDIRECT_RENDERING \
-         -DPTHREADS -DGLX_ALIAS_UNSUPPORTED -DHAVE_POSIX_MEMALIGN
+DEFINES = -D_DARWIN_C_SOURCE -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L \
+         -D_SVID_SOURCE -D_BSD_SOURCE -D_GNU_SOURCE \
+         -DPTHREADS -DGLX_ALIAS_UNSUPPORTED -DGLX_INDIRECT_RENDERING
 
 # Compiler and flags
 CC = gcc
@@ -37,4 +36,5 @@ GLW_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXt $(TOP)/lib/GL.dylib
 APP_LIB_DEPS = -L$(TOP)/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11/lib -lX11 -lXmu -lXt -lXi -lm
 
 # omit glw lib for now:
-SRC_DIRS = glx/x11 glu glut/glx
+SRC_DIRS = glx/x11 glu glut/glx mesa
+DRIVER_DIRS = osmesa

diff --git a/configs/darwin-fat-32bit b/configs/darwin-fat-32bit
new file mode 100644 (file)
index 0000000..c68c467
--- /dev/null
+++ b/configs/darwin-fat-32bit
@@ -0,0 +1,7 @@
+# Configuration for Darwin / MacOS X, making 32bit fat dynamic libs
+
+RC_CFLAGS="-arch ppc -arch i386"
+
+include $(TOP)/configs/darwin
+
+CONFIG_NAME = darwin-fat-32bit

diff --git a/configs/darwin-fat-all b/configs/darwin-fat-all
new file mode 100644 (file)
index 0000000..e20d1d3
--- /dev/null
+++ b/configs/darwin-fat-all
@@ -0,0 +1,7 @@
+# Configuration for Darwin / MacOS X, making 32bit and 64bit fat dynamic libs
+
+RC_CFLAGS="-arch ppc -arch i386 -arch ppc64 -arch ppc_64"
+
+include $(TOP)/configs/darwin
+
+CONFIG_NAME = darwin-fat-all

diff --git a/configs/darwin-x86ppc b/configs/darwin-x86ppc
deleted file mode 100644 (file)
index c87b206..0000000
--- a/configs/darwin-x86ppc
+++ /dev/null
@@ -1,37 +0,0 @@
-# Configuration for Darwin / MacOS X, making dynamic libs
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = darwin
-
-# Compiler and flags
-CC = cc
-CXX = cc
-CFLAGS = -arch ppc -arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk \
-         -I/usr/X11R6/include -O3 -fPIC -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin
-CXXFLAGS = -arch ppc -arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk \
-         -I/usr/X11R6/include -O3 -fPIC -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin
-
-MKLIB_OPTIONS = -archopt "-isysroot /Developer/SDKs/MacOSX10.4u.sdk"
-
-# Work around aliasing bugs - developers should comment this out
-CFLAGS += -fno-strict-aliasing
-CXXFLAGS += -fno-strict-aliasing
-
-# Library names (actual file names)
-GL_LIB_NAME = libGL.dylib
-GLU_LIB_NAME = libGLU.dylib
-GLUT_LIB_NAME = libglut.dylib
-GLW_LIB_NAME = libGLw.dylib
-OSMESA_LIB_NAME = libOSMesa.dylib
-
-GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
-OSMESA_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -lGL
-GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -lGL
-GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -lGL -lGLU -L/usr/X11R6/lib -lX11 -lXmu -lXi -lXext
-GLW_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXt $(TOP)/lib/GL.dylib
-APP_LIB_DEPS = -L$(TOP)/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
-
-# omit glw lib for now:
-SRC_DIRS = mesa glu glut/glx
-

diff --git a/progs/xdemos/glthreads.c b/progs/xdemos/glthreads.c
index 989697fbcaab8d6cb2601f430c046f81167c8714..6c7029b6ecfc8060d965b824ef519b25bef95ac6 100644 (file)
--- a/progs/xdemos/glthreads.c
+++ b/progs/xdemos/glthreads.c
@@ -505,7 +505,7 @@ main(int argc, char *argv[])
    for (i = 0; i < numThreads; i++) {
       pthread_create(&WinThreads[i].Thread, NULL, thread_function,
                      (void*) &WinThreads[i]);
-      printf("glthreads: Created thread %u\n", (unsigned int) WinThreads[i].Thread);
+      printf("glthreads: Created thread %p\n", WinThreads[i].Thread);
    }
 
    if (MultiDisplays)