projects / packages / Mesa.git / blame
| Commit | Line | Data |
|---|---|---|
| d889144a JB |
1 | --- Mesa-6.2/configs/linux.orig 2004-09-13 23:00:35.000000000 +0200 |
| 2 | +++ Mesa-6.2/configs/linux 2004-10-17 22:39:21.499035400 +0200 | |
| 3 | @@ -8,13 +8,14 @@ | |
| 25a6cbb2 JB |
4 | CC = gcc |
| 5 | CXX = g++ | |
| 6 | ||
| 7 | -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 | |
| 8 | -CXXFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE | |
| 9 | +CFLAGS = $(OPT) -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 | |
| 10 | +CXXFLAGS = $(OPT) -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE | |
| 11 | GLUT_CFLAGS = -fexceptions | |
| 12 | ||
| 13 | +XLIB_DIR=/usr/X11R6/lib | |
| 14 | ||
| 15 | # Library/program dependencies | |
| d889144a | 16 | # Need to have -L/usr/X11R6/lib in these: |
| 25a6cbb2 | 17 | -GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread |
| d889144a JB |
18 | -GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm |
| 19 | -GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11 | |
| 25a6cbb2 | 20 | +GL_LIB_DEPS = -L$(XLIB_DIR) -lX11 -lXext -lm -lpthread |
| d889144a JB |
21 | +GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L$(XLIB_DIR) -lX11 -lXmu -lXt -lXi -lm |
| 22 | +GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L$(XLIB_DIR) -lXt -lX11 | |
| 23 | --- Mesa-6.2/configs/linux-static.orig 2004-09-13 23:00:36.000000000 +0200 | |
| 24 | +++ Mesa-6.2/configs/linux-static 2004-10-17 22:40:04.359519616 +0200 | |
| 25a6cbb2 JB |
25 | @@ -8,8 +8,8 @@ |
| 26 | CC = gcc | |
| 27 | CXX = g++ | |
| 28 | ||
| 29 | -CFLAGS = -O3 -ansi -pedantic -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include | |
| 30 | -CXXFLAGS = -O3 -ansi -pedantic -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE | |
| 31 | +CFLAGS = $(OPT) -ansi -pedantic -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include | |
| 32 | +CXXFLAGS = $(OPT) -ansi -pedantic -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE | |
| 33 | GLUT_CFLAGS = -fexceptions | |
| 34 | ||
| 35 | MKLIB_OPTIONS = -static | |
| 36 | @@ -21,10 +21,12 @@ | |
| 37 | GLW_LIB_NAME = libGLw.a | |
| 38 | OSMESA_LIB_NAME = libOSMesa.a | |
| 39 | ||
| 40 | +XLIB_DIR=/usr/X11R6/lib | |
| 41 | + | |
| 42 | # Library/program dependencies (static libs don't have dependencies) | |
| 43 | GL_LIB_DEPS = | |
| 44 | OSMESA_LIB_DEPS = | |
| 45 | GLU_LIB_DEPS = | |
| 46 | GLUT_LIB_DEPS = | |
| 47 | GLW_LIB_DEPS = | |
| d889144a JB |
48 | -APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lpthread -lm -lstdc++ |
| 49 | +APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L$(XLIB_DIR) -lX11 -lXext -lXmu -lXt -lXi -lpthread -lm -lstdc++ | |
| 25a6cbb2 JB |
50 | --- Mesa-6.1/configs/linux-x86.orig 2004-08-18 01:03:10.000000000 +0200 |
| 51 | +++ Mesa-6.1/configs/linux-x86 2004-08-28 02:20:42.196214096 +0200 | |
| 52 | @@ -8,9 +8,9 @@ | |
| 53 | CC = gcc | |
| 54 | CXX = g++ | |
| 55 | ||
| 56 | -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 | |
| 57 | +CFLAGS = -Wall $(OPT) -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 | |
| 58 | ||
| 59 | -CXXFLAGS = -Wall -O3 -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE | |
| 60 | +CXXFLAGS = -Wall $(OPT) -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE | |
| 61 | ||
| 62 | GLUT_CFLAGS = -fexceptions | |
| 63 | ||
| 64 | --- Mesa-6.1/configs/linux-x86-static.orig 2004-06-30 01:47:27.000000000 +0200 | |
| 65 | +++ Mesa-6.1/configs/linux-x86-static 2004-08-28 02:20:56.339064056 +0200 | |
| 66 | @@ -8,9 +8,9 @@ | |
| 67 | CC = gcc | |
| 68 | CXX = g++ | |
| 69 | ||
| 70 | -CFLAGS = -Wall -O3 -ansi -pedantic -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 | |
| 71 | +CFLAGS = -Wall $(OPT) -ansi -pedantic -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 | |
| 72 | ||
| 73 | -CXXFLAGS = -Wall -O3 -ansi -pedantic -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE | |
| 74 | +CXXFLAGS = -Wall $(OPT) -ansi -pedantic -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE | |
| 75 | ||
| 76 | GLUT_CFLAGS = -fexceptions | |
| 77 |