| 1 |
--- Mesa-6.2.1/configs/linux-x86-glide.config 2004-09-13 23:04:20.000000000 +0200
|
| 2 |
+++ Mesa-6.2.1/configs/linux-x86-glide 2006-01-15 09:26:18.000000000 +0100
|
| 3 |
@@ -8,9 +8,9 @@
|
| 4 |
CC = gcc
|
| 5 |
CXX = g++
|
| 6 |
|
| 7 |
-CFLAGS = -Wall -O3 -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -DPTHREADS -I/usr/X11R6/include -DFX -I/usr/include/glide -I/usr/local/glide/include
|
| 8 |
+CFLAGS = $(RPM_OPT_FLAGS) -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -DPTHREADS -DFX -I/usr/include/glide3
|
| 9 |
|
| 10 |
-CXXFLAGS = -Wall -O3 -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
|
| 11 |
+CXXFLAGS = $(RPM_OPT_FLAGS) -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
|
| 12 |
|
| 13 |
GLUT_CFLAGS = -fexceptions
|
| 14 |
|
| 15 |
@@ -18,7 +18,7 @@
|
| 16 |
ASM_SOURCES = $(X86_SOURCES) $(X86_API)
|
| 17 |
|
| 18 |
# Library/program dependencies
|
| 19 |
-GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -L/usr/local/glide/lib -lglide3x -lm -lpthread
|
| 20 |
-GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
|
| 21 |
-GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11
|
| 22 |
-APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/local/glide/lib -lglide3x -lm
|
| 23 |
+GL_LIB_DEPS = -lX11 -lXext -lglide3 -lm -lpthread
|
| 24 |
+GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXmu -lXt -lXi -lm
|
| 25 |
+GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lXt -lX11
|
| 26 |
+APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lglide3 -lm
|
| 27 |
--- Mesa-6.2.1/configs/default.config 2006-01-15 09:32:20.000000000 +0100
|
| 28 |
+++ Mesa-6.2.1/configs/default 2006-01-15 09:32:53.000000000 +0100
|
| 29 |
@@ -22,8 +22,8 @@
|
| 30 |
|
| 31 |
# Misc tools and flags
|
| 32 |
MKLIB_OPTIONS =
|
| 33 |
-MKDEP = makedepend
|
| 34 |
-MKDEP_OPTIONS = -Y -fdepend
|
| 35 |
+MKDEP = gcc -M
|
| 36 |
+MKDEP_OPTIONS = -MF depend
|
| 37 |
MAKE = make
|
| 38 |
|
| 39 |
# Library names (base name)
|
| 40 |
--- Mesa-6.2.1/configs/linux-glide.config 2004-09-13 23:06:22.000000000 +0200
|
| 41 |
+++ Mesa-6.2.1/configs/linux-glide 2006-01-15 09:26:18.000000000 +0100
|
| 42 |
@@ -8,13 +8,13 @@
|
| 43 |
CC = gcc
|
| 44 |
CXX = g++
|
| 45 |
|
| 46 |
-CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include -DFX -I/usr/include/glide -I/usr/local/glide/include
|
| 47 |
-CXXFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
|
| 48 |
+CFLAGS = $(RPM_OPT_FLAGS) -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -DFX -I/usr/include/glide3
|
| 49 |
+CXXFLAGS = $(RPM_OPT_FLAGS) -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
|
| 50 |
GLUT_CFLAGS = -fexceptions
|
| 51 |
|
| 52 |
|
| 53 |
# Library/program dependencies
|
| 54 |
-GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -L/usr/local/glide/lib -lglide3x -lm -lpthread
|
| 55 |
-GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
|
| 56 |
-GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11
|
| 57 |
-APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/local/glide/lib -lglide3x -lm
|
| 58 |
+GL_LIB_DEPS = -lX11 -lXext -lglide3 -lm -lpthread
|
| 59 |
+GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXmu -lXt -lXi -lm
|
| 60 |
+GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lXt -lX11
|
| 61 |
+APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lglide3 -lm
|