From 7c7fece97734284858a4605b8e2ca3e4eb0851ee Mon Sep 17 00:00:00 2001 From: Jeremy Huddleston Date: Mon, 10 Mar 2008 15:13:28 -0700 Subject: 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) --- Makefile | 3 ++- configs/darwin | 10 +++++----- configs/darwin-fat-32bit | 7 +++++++ configs/darwin-fat-all | 7 +++++++ configs/darwin-x86ppc | 37 ------------------------------------- progs/xdemos/glthreads.c | 2 +- 6 files changed, 22 insertions(+), 44 deletions(-) create mode 100644 configs/darwin-fat-32bit create mode 100644 configs/darwin-fat-all delete mode 100644 configs/darwin-x86ppc diff --git a/Makefile b/Makefile index 692cfab2b6..df8e6a8ab8 100644 --- 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 438abd94c1..c7f94d2bad 100644 --- 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 index 0000000000..c68c467717 --- /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 index 0000000000..e20d1d3d06 --- /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 index c87b206f92..0000000000 --- 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 989697fbca..6c7029b6ec 100644 --- 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) -- cgit v1.2.3