diff options
| author | Jeremy Huddleston <[email protected]> | 2009-03-06 11:20:21 -0500 |
|---|---|---|
| committer | Jeremy Huddleston <[email protected]> | 2009-03-06 11:21:45 -0500 |
| commit | 7817fea0b675686dd6b4c29c9a55b1304a3571d7 (patch) | |
| tree | d24680f658673bee9c7c392e5a44cd9ea062db14 /configs | |
| parent | 8bbb6b352ad7fabb2cc5ec4b82244d39495e80ac (diff) | |
Updated darwin config for when X11 is not in the same location as we're installing to
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/darwin | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/configs/darwin b/configs/darwin index c50ea9c44d5..29fa0f13ff4 100644 --- a/configs/darwin +++ b/configs/darwin @@ -6,6 +6,8 @@ CONFIG_NAME = darwin INSTALL_DIR = /usr/X11 +X11_DIR = $(INSTALL_DIR) + # Compiler and flags CC = gcc CXX = gcc @@ -21,9 +23,9 @@ DEFINES = -D_DARWIN_C_SOURCE -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L \ ARCH_FLAGS += $(RC_CFLAGS) CFLAGS = -ggdb3 -Os -Wall -Wmissing-prototypes -std=c99 -ffast-math -fno-strict-aliasing \ - -I$(INSTALL_DIR)/include $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(ASM_FLAGS) $(DEFINES) + -I$(INSTALL_DIR)/include -I$(X11_DIR)/include $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(ASM_FLAGS) $(DEFINES) CXXFLAGS = -ggdb3 -Os -Wall -fno-strict-aliasing \ - -I$(INSTALL_DIR)/include $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(ASM_FLAGS) $(DEFINES) + -I$(INSTALL_DIR)/include -I$(X11_DIR)/include $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(ASM_FLAGS) $(DEFINES) # Library names (actual file names) GL_LIB_NAME = libGL.dylib @@ -39,12 +41,12 @@ GLUT_LIB_GLOB = libglut.*dylib GLW_LIB_GLOB = libGLw.*dylib OSMESA_LIB_GLOB = libOSMesa.*dylib -GL_LIB_DEPS = -L$(INSTALL_DIR)/$(LIB_DIR) -lX11 -lXext -lm -lpthread +GL_LIB_DEPS = -L$(INSTALL_DIR)/$(LIB_DIR) -L$(X11_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 +GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L$(INSTALL_DIR)/$(LIB_DIR) -L$(X11_DIR)/$(LIB_DIR) -lX11 -lXmu -lXi -lXext +GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L$(INSTALL_DIR)/$(LIB_DIR) -L$(X11_DIR)/$(LIB_DIR) -lX11 -lXt +APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L$(INSTALL_DIR)/$(LIB_DIR) -L$(X11_DIR)/$(LIB_DIR) -lX11 -lXmu -lXt -lXi -lm # omit glw lib for now: SRC_DIRS = glx/x11 mesa glu glut/glx glew |