diff options
| author | Jeremy Huddleston <jeremyhu@freedesktop.org> | 2008-08-12 11:04:19 -0700 |
|---|---|---|
| committer | Jeremy Huddleston <jeremyhu@freedesktop.org> | 2008-08-12 11:04:19 -0700 |
| commit | f911ca0834934fe678383b9edcffc79639dd77eb (patch) | |
| tree | 8cbe4dea9da27dac9534baec955d7cb59139100f /configs | |
| parent | 98e7c1cf3852fbc2924b55b5a684f13a710eec04 (diff) | |
| download | external_mesa3d-f911ca0834934fe678383b9edcffc79639dd77eb.zip external_mesa3d-f911ca0834934fe678383b9edcffc79639dd77eb.tar.gz external_mesa3d-f911ca0834934fe678383b9edcffc79639dd77eb.tar.bz2 | |
Removed broken/unsupported darwin-static configs
Fixed typo in darwin config
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/darwin | 2 | ||||
| -rw-r--r-- | configs/darwin-static | 28 | ||||
| -rw-r--r-- | configs/darwin-static-x86ppc | 30 |
3 files changed, 1 insertions, 59 deletions
diff --git a/configs/darwin b/configs/darwin index b41c6cb..aa9efb6 100644 --- a/configs/darwin +++ b/configs/darwin @@ -18,7 +18,7 @@ DEFINES = -D_DARWIN_C_SOURCE -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L \ # -DGLX_DIRECT_RENDERING - pulls in libdrm stuff in glx/x11 # -DIN_DRI_DRIVER -ARCH_FLAGS += $(RC_FLAGS) +ARCH_FLAGS += $(RC_CFLAGS) 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) diff --git a/configs/darwin-static b/configs/darwin-static deleted file mode 100644 index 9893d15..0000000 --- a/configs/darwin-static +++ /dev/null @@ -1,28 +0,0 @@ -# Configuration for Darwin / MacOS X, making static libs - -include $(TOP)/configs/darwin - -CONFIG_NAME = darwin-static - -# Compiler and flags -CFLAGS = -I/usr/X11R6/include -O3 -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin -CXXFLAGS = -I/usr/X11R6/include -O3 -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin -MKLIB_OPTIONS = -static - -# 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.a -GLU_LIB_NAME = libGLU.a -GLUT_LIB_NAME = libglut.a -GLW_LIB_NAME = libGLw.a -OSMESA_LIB_NAME = libOSMesa.a - -GL_LIB_DEPS = -OSMESA_LIB_DEPS = -GLU_LIB_DEPS = -GLUT_LIB_DEPS = -GLW_LIB_DEPS = -APP_LIB_DEPS = -Wl,-search_paths_first -L$(TOP)/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lstdc++ -lgcc_s.1 -lm diff --git a/configs/darwin-static-x86ppc b/configs/darwin-static-x86ppc deleted file mode 100644 index 7e97474..0000000 --- a/configs/darwin-static-x86ppc +++ /dev/null @@ -1,30 +0,0 @@ -# Configuration for Darwin / MacOS X, making static libs - -include $(TOP)/configs/darwin - -CONFIG_NAME = darwin-static - -# Compiler and flags -CFLAGS = -arch ppc -arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk \ - -I/usr/X11R6/include -O3 -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 -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin -MKLIB_OPTIONS = -static -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.a -GLU_LIB_NAME = libGLU.a -GLUT_LIB_NAME = libglut.a -GLW_LIB_NAME = libGLw.a -OSMESA_LIB_NAME = libOSMesa.a - -GL_LIB_DEPS = -OSMESA_LIB_DEPS = -GLU_LIB_DEPS = -GLUT_LIB_DEPS = -GLW_LIB_DEPS = -APP_LIB_DEPS = -Wl,-search_paths_first -L$(TOP)/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lstdc++ -lgcc_s.1 -lm |