Ticket #18132: mesa-7.2-x11dir.patch

File mesa-7.2-x11dir.patch, 2.1 KB (added by blb@…, 16 years ago)

updated mesa-7.2-x11dir.patch

  • configs/darwin 

    diff --git a/configs/darwin b/configs/darwin
index 77edf1a..f061500 100644
    a b CONFIG_NAME = darwin 
    66
    77INSTALL_DIR = /usr/X11
    88
     9X11_DIR = $(INSTALL_DIR)
     10
    911# Compiler and flags
    1012CC = gcc
    1113CXX = gcc
    … … DEFINES = -D_DARWIN_C_SOURCE -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L \ 
    2123ARCH_FLAGS += $(RC_CFLAGS)
    2224
    2325CFLAGS =  -ggdb3 -Os -Wall -Wmissing-prototypes -std=c99 -ffast-math -fno-strict-aliasing -fno-common \
    24         -I$(INSTALL_DIR)/include $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(ASM_FLAGS) $(DEFINES)
     26        -I$(INSTALL_DIR)/include -I$(X11_DIR)/include $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(ASM_FLAGS) $(DEFINES)
    2527CXXFLAGS =  -ggdb3 -Os -Wall -fno-strict-aliasing -fno-common \
    26         -I$(INSTALL_DIR)/include $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(ASM_FLAGS) $(DEFINES)
     28        -I$(INSTALL_DIR)/include -I$(X11_DIR)/include $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(ASM_FLAGS) $(DEFINES)
    2729
    2830# Library names (actual file names)
    2931GL_LIB_NAME = libGL.dylib
    … … GLUT_LIB_GLOB = libglut.*dylib 
    3941GLW_LIB_GLOB = libGLw.*dylib
    4042OSMESA_LIB_GLOB = libOSMesa.*dylib
    4143
    42 GL_LIB_DEPS = -L$(INSTALL_DIR)/$(LIB_DIR) -lX11 -lXext -lm -lpthread
     44GL_LIB_DEPS = -L$(INSTALL_DIR)/$(LIB_DIR) -L$(X11_DIR)/$(LIB_DIR) -lX11 -lXext -lm -lpthread
    4345OSMESA_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB)
    4446GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB)
    45 GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB)  -L$(INSTALL_DIR)/$(LIB_DIR) -lX11 -lXmu -lXi -lXext
    46 GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L$(INSTALL_DIR)/$(LIB_DIR) -lX11 -lXt
    47 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
     47GLUT_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
     48GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L$(INSTALL_DIR)/$(LIB_DIR) -L$(X11_DIR)/$(LIB_DIR) -lX11 -lXt
     49APP_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
    4850
    4951# omit glw lib for now:
    5052SRC_DIRS = glx/x11 mesa glu glut/glx