diff options
| author | Jeremy Huddleston <jeremyhu@freedesktop.org> | 2008-08-12 09:45:04 -0700 |
|---|---|---|
| committer | Jeremy Huddleston <jeremyhu@freedesktop.org> | 2008-08-12 09:45:04 -0700 |
| commit | c61f4e2ccec5d8dcb50b5f58a2ea08218b669129 (patch) | |
| tree | b4351ca1621c98edfb48ac09334bfbf38c811753 /configs | |
| parent | 8c51e0002a3b1fd047b34d31629a15b560618cd9 (diff) | |
Apple: More cleanup of the darwin config in 7.1
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/darwin | 44 |
1 files changed, 25 insertions, 19 deletions
diff --git a/configs/darwin b/configs/darwin index b8a32cbd01..f2728c8909 100644 --- a/configs/darwin +++ b/configs/darwin @@ -4,22 +4,26 @@ include $(TOP)/configs/default CONFIG_NAME = darwin -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 +INSTALL_DIR = /usr/X11 # Compiler and flags CC = gcc CXX = gcc -CFLAGS = -I/usr/X11/include -O2 -no-cpp-precomp -dynamic $(DEFINES) -CXXFLAGS = -I/usr/X11/include -O2 -no-cpp-precomp -dynamic $(DEFINES) +PIC_FLAGS = -fPIC +DEFINES = -D_DARWIN_C_SOURCE -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L \ + -D_BSD_SOURCE -D_SVID_SOURCE -D_GNU_SOURCE -DPTHREADS \ + -DGLX_INDIRECT_RENDERING \ + -DGLX_ALIAS_UNSUPPORTED + +# -DGLX_DIRECT_RENDERING - pulls in libdrm stuff in glx/x11 +# -DIN_DRI_DRIVER -CFLAGS += $(RC_CFLAGS) -CXXFLAGS += $(RC_CFLAGS) +ARCH_FLAGS += $(RC_FLAGS) -# Work around aliasing bugs - developers should comment this out -CFLAGS += -fno-strict-aliasing -CXXFLAGS += -fno-strict-aliasing +CFLAGS = -g -O2 -Wall -Wmissing-prototypes -std=c99 -ffast-math -fno-strict-aliasing \ + -I$(INSTALL_DIR)/include $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(ASM_FLAGS) $(DEFINES) +CXXFLAGS = -g -O2 -Wall -fno-strict-aliasing \ + -I$(INSTALL_DIR)/include $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(ASM_FLAGS) $(DEFINES) # Library names (actual file names) GL_LIB_NAME = libGL.dylib @@ -28,15 +32,17 @@ GLUT_LIB_NAME = libglut.dylib GLW_LIB_NAME = libGLw.dylib OSMESA_LIB_NAME = libOSMesa.dylib -GL_LIB_DEPS = -L/usr/X11/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/X11/lib -lX11 -lXmu -lXt -lXi -lm - -INSTALL_DIR = /usr/X11 +GL_LIB_DEPS = -L$(INSTALL_DIR)/$(LIB_DIR) -lX11 -lXext -lm -lpthread +OSMESA_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) +GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) +GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L$(INSTALL_DIR)/$(LIB_DIR) -lX11 -lXmu -lXi -lXext +GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L$(INSTALL_DIR)/$(LIB_DIR) -lX11 -lXt +APP_LIB_DEPS = -L$(TOP)/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L$(INSTALL_DIR)/$(LIB_DIR) -lX11 -lXmu -lXt -lXi -lm # omit glw lib for now: -SRC_DIRS = glx/x11 mesa glu glut/glx +SRC_DIRS = glx/x11 mesa glu glw glut/glx +GLU_DIRS = sgi DRIVER_DIRS = osmesa +#DRIVER_DIRS = dri +DRI_DIRS = swrast +PROGRAM_DIRS = xdemos |