627b13b9fb
Remove separate mtree file for X_WINDOW_SYSTEM=XOrg case. Both X11 distributions now use the one from /etc/mtree again.
47 lines
1.7 KiB
Text
47 lines
1.7 KiB
Text
--- configs/freebsd-dri.orig Tue Oct 25 01:11:57 2005
|
|
+++ configs/freebsd-dri Fri Dec 30 00:58:57 2005
|
|
@@ -6,32 +6,32 @@
|
|
CONFIG_NAME = freebsd-dri
|
|
|
|
# Compiler and flags
|
|
-CC = gcc
|
|
-CXX = g++
|
|
+CC = $(FBSDCC)
|
|
+CXX = $(FBSDCXX)
|
|
WARN_FLAGS = -Wall
|
|
-OPT_FLAGS = -O
|
|
+OPT_FLAGS = $(FBSDCFLAGS)
|
|
|
|
-EXPAT_INCLUDES = -I/usr/local/include
|
|
-X11_INCLUDES = -I/usr/X11R6/include
|
|
+EXPAT_INCLUDES = -I${LOCALBASE}/include
|
|
+X11_INCLUDES = -I${X11BASE}/include -I${X11BASE}/include/X11/extensions
|
|
DEFINES = -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER \
|
|
-DGLX_DIRECT_RENDERING -DHAVE_ALIAS
|
|
-CFLAGS = $(DEFINES) -Wmissing-prototypes -g -std=c99 -Wundef -fPIC \
|
|
- -ffast-math $(X11_INCLUDES)
|
|
+CFLAGS = $(FBSDCFLAGS) $(DEFINES) -Wmissing-prototypes -g -std=c99 -Wundef \
|
|
+ -fPIC -ffast-math $(X11_INCLUDES)
|
|
CXXFLAGS = $(DEFINES) -Wall -g -ansi -pedantic -fPIC
|
|
|
|
ASM_SOURCES =
|
|
|
|
# Library/program dependencies
|
|
LIBDRM_LIB = `pkg-config --libs libdrm` -ldrm
|
|
-DRI_LIB_DEPS = -L/usr/local/lib -lm -lpthread -lexpat $(LIBDRM_LIB)
|
|
-GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread $(LIBDRM_LIB)
|
|
+DRI_LIB_DEPS = -L${LOCALBASE}/lib -lm ${PTHREAD_LIBS} -lexpat $(LIBDRM_LIB)
|
|
+GL_LIB_DEPS = -L${X11BASE}/lib -lX11 -lXext -lm ${PTHREAD_LIBS} $(LIBDRM_LIB)
|
|
|
|
-GLUT_LIB_DEPS = -L$(LIB_DIR) -L/usr/X11R6/lib -lGLU -lGL -lX11 -lXmu -lXt -lXi -lm
|
|
-GLW_LIB_DEPS = -L$(LIB_DIR) -L/usr/X11R6/lib -lGL -lXt -lXm -lX11
|
|
+GLUT_LIB_DEPS = -L$(LIB_DIR) -L${X11BASE}/lib -lGLU -lGL -lX11 -lXmu -lXt -lXi -lm
|
|
+GLW_LIB_DEPS = -L$(LIB_DIR) -L${X11BASE}/lib -lGL -lXt -lXm -lX11
|
|
|
|
|
|
# Directories
|
|
-SRC_DIRS = glx/x11 mesa glu glut/glx glw
|
|
+SRC_DIRS = mesa
|
|
DRIVER_DIRS = dri
|
|
PROGRAM_DIRS =
|
|
WINDOW_SYSTEM=dri
|