Browse Source
LIB_DIR is now just 'lib' or 'lib64'
Replaced $(LIB_DIR) with $(TOP)/$(LIB_DIR), use LIB_DIR in install targets. Patch by Hanno Böck.tags/texmem_0_3_20060923
Brian Paul
20 years ago
95 changed files with 261 additions and 257 deletions
+ 4
- 4
configs/aix-64
View File
| @@ -10,7 +10,7 @@ CXX = xlC | |||
| CFLAGS = -q64 -qmaxmem=16384 -O -DAIXV3 -DPTHREADS | |||
| CXXFLAGS = -q64 -qmaxmem=16384 -O -DAIXV3 -DPTHREADS | |||
| LIB_DIR=$(TOP)/lib64 | |||
| LIB_DIR = lib64 | |||
| # Library names (actual file names) | |||
| GL_LIB_NAME = libGL.a | |||
| @@ -20,8 +20,8 @@ GLW_LIB_NAME = libGLw.a | |||
| OSMESA_LIB_NAME = libOSMesa.a | |||
| GL_LIB_DEPS = -lX11 -lXext -lm -lpthread | |||
| GLU_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lm -lC | |||
| GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lXi -lXmu -lX11 -lm | |||
| GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lXm -lXt -lX11 | |||
| GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm -lC | |||
| GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lXi -lXmu -lX11 -lm | |||
| GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lXm -lXt -lX11 | |||
| APP_LIB_DEPS = -L$(TOP)/lib64 -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lXmu -lXi -lm -lpthread -lC | |||
+ 2
- 2
configs/aix-64-static
View File
| @@ -11,7 +11,7 @@ CXX = xlC | |||
| CFLAGS = -q64 -O -DAIXV3 -DPTHREADS | |||
| CXXFLAGS = -q64 -O -DAIXV3 -DPTHREADS | |||
| MKLIB_OPTIONS = -static | |||
| LIB_DIR=$(TOP)/lib64 | |||
| LIB_DIR = lib64 | |||
| # Library names (actual file names) | |||
| GL_LIB_NAME = libGL.a | |||
| @@ -20,6 +20,6 @@ GLUT_LIB_NAME = libglut.a | |||
| GLW_LIB_NAME = libGLw.a | |||
| OSMESA_LIB_NAME = libOSMesa.a | |||
| APP_LIB_DEPS = -q64 -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) \ | |||
| APP_LIB_DEPS = -q64 -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) \ | |||
| -lX11 -lXext -lXmu -lXi -lm -lpthread -lC | |||
+ 3
- 3
configs/aix-gcc
View File
| @@ -13,7 +13,7 @@ CXXFLAGS = -O2 -DAIXV3 | |||
| MKLIB_OPTIONS = -arch aix-gcc | |||
| GL_LIB_DEPS = -lX11 -lXext -lm | |||
| GLU_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lm | |||
| GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lXi -lXmu | |||
| APP_LIB_DEPS = -L$(LIB_DIR) -Wl,-brtl -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm -lX11 -lXext -lXmu -lXi | |||
| GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm | |||
| GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lXi -lXmu | |||
| APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -Wl,-brtl -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm -lX11 -lXext -lXmu -lXi | |||
+ 1
- 1
configs/aix-static
View File
| @@ -19,7 +19,7 @@ GLUT_LIB_NAME = libglut.a | |||
| GLW_LIB_NAME = libGLw.a | |||
| OSMESA_LIB_NAME = libOSMesa.a | |||
| APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) \ | |||
| APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) \ | |||
| -lX11 -lXext -lXmu -lXi -lm -lpthread -lC | |||
+ 3
- 3
configs/beos
View File
| @@ -93,8 +93,8 @@ PROGRAM_DIRS = beos samples redbook demos tests | |||
| # Library/program dependencies | |||
| GL_LIB_DEPS = | |||
| OSMESA_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) | |||
| OSMESA_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) | |||
| GLU_LIB_DEPS = | |||
| GLUT_LIB_DEPS = -lgame -L$(LIB_DIR) -l$(GL_LIB) | |||
| APP_LIB_DEPS = -lbe -L$(LIB_DIR) -l$(GL_LIB) -l$(GLUT_LIB) | |||
| GLUT_LIB_DEPS = -lgame -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) | |||
| APP_LIB_DEPS = -lbe -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -l$(GLUT_LIB) | |||
+ 3
- 3
configs/darwin
View File
| @@ -18,9 +18,9 @@ GLW_LIB_NAME = libGLw.dylib | |||
| OSMESA_LIB_NAME = libOSMesa.dylib | |||
| GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread | |||
| OSMESA_LIB_DEPS = -L$(LIB_DIR) -lGL | |||
| GLU_LIB_DEPS = -L$(LIB_DIR) -lGL | |||
| GLUT_LIB_DEPS = -L$(LIB_DIR) -lGL -lGLU -L/usr/X11R6/lib -lX11 -lXmu -lXi -lXext | |||
| OSMESA_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -lGL | |||
| GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -lGL | |||
| GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -lGL -lGLU -L/usr/X11R6/lib -lX11 -lXmu -lXi -lXext | |||
| GLW_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXt $(TOP)/lib/GL.dylib | |||
| APP_LIB_DEPS = -L$(TOP)/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm | |||
+ 3
- 3
configs/darwin-x86ppc
View File
| @@ -22,9 +22,9 @@ GLW_LIB_NAME = libGLw.dylib | |||
| OSMESA_LIB_NAME = libOSMesa.dylib | |||
| GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread | |||
| OSMESA_LIB_DEPS = -L$(LIB_DIR) -lGL | |||
| GLU_LIB_DEPS = -L$(LIB_DIR) -lGL | |||
| GLUT_LIB_DEPS = -L$(LIB_DIR) -lGL -lGLU -L/usr/X11R6/lib -lX11 -lXmu -lXi -lXext | |||
| OSMESA_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -lGL | |||
| GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -lGL | |||
| GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -lGL -lGLU -L/usr/X11R6/lib -lX11 -lXmu -lXi -lXext | |||
| GLW_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXt $(TOP)/lib/GL.dylib | |||
| APP_LIB_DEPS = -L$(TOP)/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm | |||
+ 10
- 6
configs/default
View File
| @@ -59,7 +59,7 @@ GLW_SOURCES = GLwDrawA.c | |||
| # Directories to build | |||
| LIB_DIR = $(TOP)/lib | |||
| LIB_DIR = lib | |||
| SRC_DIRS = mesa glu glut/glx glw | |||
| GLU_DIRS = sgi | |||
| DRIVER_DIRS = x11 osmesa | |||
| @@ -70,14 +70,18 @@ PROGRAM_DIRS = demos redbook samples xdemos | |||
| # Library/program dependencies | |||
| EXTRA_LIB_PATH ?= | |||
| GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread | |||
| OSMESA_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) | |||
| GLU_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lm | |||
| GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lX11 -lXmu -lXt -lXi -lm | |||
| GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lXt -lX11 | |||
| APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm | |||
| OSMESA_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) | |||
| GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm | |||
| GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lX11 -lXmu -lXt -lXi -lm | |||
| GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lXt -lX11 | |||
| APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm | |||
| # Installation directories (for make install) | |||
| INSTALL_DIR = /usr/local | |||
| DRI_DRIVER_INSTALL_DIR = /usr/X11R6/lib/modules/dri | |||
| # Where libGL will look for DRI hardware drivers | |||
| DRI_DRIVER_SEARCH_DIR = $(DRI_DRIVER_INSTALL_DIR) | |||
+ 1
- 1
configs/freebsd
View File
| @@ -26,4 +26,4 @@ CXXFLAGS += $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(DEFINES) $(X11_INCLUDES) | |||
| GLUT_CFLAGS = -fexceptions | |||
| EXTRA_LIB_PATH = -L/usr/X11R6/lib | |||
| APP_LIB_DEPS = -L$(LIB_DIR) $(EXTRA_LIB_PATH) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lXext -lXmu -lXi -lX11 -lm | |||
| APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) $(EXTRA_LIB_PATH) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lXext -lXmu -lXi -lX11 -lm | |||
+ 2
- 2
configs/freebsd-dri
View File
| @@ -28,8 +28,8 @@ LIBDRM_LIB = `pkg-config --libs libdrm` | |||
| DRI_LIB_DEPS = -L/usr/local/lib -lm -lpthread -lexpat $(LIBDRM_LIB) | |||
| GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lXxf86vm -lm -lpthread $(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$(TOP)/$(LIB_DIR) -L/usr/X11R6/lib -lGLU -lGL -lX11 -lXmu -lXt -lXi -lm | |||
| GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/X11R6/lib -lGL -lXt -lXm -lX11 | |||
| # Directories | |||
+ 1
- 1
configs/hpux10
View File
| @@ -11,4 +11,4 @@ CXX = aCC | |||
| CFLAGS = +O3 +DAportable +z -Aa -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM | |||
| CXXFLAGS = +O3 +DAportable +Z -Aa -D_HPUX_SOURCE | |||
| APP_LIB_DEPS = -$(LIB_DIR) -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm | |||
| APP_LIB_DEPS = -$(TOP)/$(LIB_DIR) -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm | |||
+ 1
- 1
configs/hpux10-gcc
View File
| @@ -12,5 +12,5 @@ CFLAGS = -ansi -O3 -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/incl | |||
| CXXFLAGS = -ansi -O3 -D_HPUX_SOURCE | |||
| GLUT_CFLAGS = -fexceptions | |||
| APP_LIB_DEPS = -L$(LIB_DIR) -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm | |||
| APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm | |||
+ 2
- 2
configs/hpux10-static
View File
| @@ -26,5 +26,5 @@ OSMESA_LIB_DEPS = | |||
| GLU_LIB_DEPS = | |||
| GLUT_LIB_DEPS = | |||
| GLW_LIB_DEPS = | |||
| 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++ | |||
| APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm -lstdc++ | |||
| APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lpthread -lm -lstdc++ | |||
| APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm -lstdc++ | |||
+ 4
- 4
configs/hpux11-32
View File
| @@ -23,8 +23,8 @@ GLW_LIB_NAME = libGLw.a | |||
| OSMESA_LIB_NAME = libOSMesa.a | |||
| # Library/program dependencies | |||
| APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) | |||
| APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) | |||
| GL_LIB_DEPS = -L/usr/lib/X11R6/ -L/usr/contrib/X11R6/lib/ -lXext -lXt -lXi -lX11 -lm -lpthread | |||
| GLU_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lm -lCsup -lcl | |||
| GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(GL_LIB_DEPS) | |||
| GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) $(GL_LIB_DEPS) | |||
| GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm -lCsup -lcl | |||
| GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(GL_LIB_DEPS) | |||
| GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(GL_LIB_DEPS) | |||
+ 1
- 1
configs/hpux11-32-static
View File
| @@ -23,5 +23,5 @@ GLW_LIB_NAME = libGLw.a | |||
| OSMESA_LIB_NAME = libOSMesa.a | |||
| # Library/program dependencies | |||
| APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/lib/X11R6/ -L/usr/contrib/X11R6/lib/ -lXext -lXmu -lXt -lXi -lX11 -lm -lpthread -lCsup -lcl | |||
| APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/lib/X11R6/ -L/usr/contrib/X11R6/lib/ -lXext -lXmu -lXt -lXi -lX11 -lm -lpthread -lCsup -lcl | |||
+ 5
- 5
configs/hpux11-64
View File
| @@ -14,7 +14,7 @@ CXXFLAGS = +z -Aa +DD64 +O2 +Onolimit +Oaggressive -D_HPUX_SOURCE -I/usr/include | |||
| MKLIB_OPTIONS = | |||
| LIB_DIR = $(TOP)/lib64 | |||
| LIB_DIR = lib64 | |||
| # Library names (actual file names) | |||
| GL_LIB_NAME = libGL.a | |||
| @@ -24,8 +24,8 @@ GLW_LIB_NAME = libGLw.a | |||
| OSMESA_LIB_NAME = libOSMesa.a | |||
| # Library/program dependencies | |||
| APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) | |||
| APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) | |||
| GL_LIB_DEPS = -L/usr/lib/X11R6/pa20_64 -L/usr/contrib/X11R6/lib/pa20_64 -lXext -lXmu -lXt -lXi -lX11 -lm -lpthread | |||
| GLU_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lm -lCsup -lcl | |||
| GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(GL_LIB_DEPS) | |||
| GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) $(GL_LIB_DEPS) | |||
| GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm -lCsup -lcl | |||
| GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(GL_LIB_DEPS) | |||
| GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(GL_LIB_DEPS) | |||
+ 2
- 2
configs/hpux11-64-static
View File
| @@ -14,7 +14,7 @@ CXXFLAGS = +O3 +DA2.0W -Aa -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X1 | |||
| MKLIB_OPTIONS = -static | |||
| LIB_DIR = $(TOP)/lib64 | |||
| LIB_DIR = lib64 | |||
| # Library names (actual file names) | |||
| GL_LIB_NAME = libGL.a | |||
| @@ -24,4 +24,4 @@ GLW_LIB_NAME = libGLw.a | |||
| OSMESA_LIB_NAME = libOSMesa.a | |||
| # Library/program dependencies | |||
| APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/lib/X11R6/pa20_64 -L/usr/contrib/X11R6/lib/pa20_64 -lXext -lXmu -lXt -lXi -lX11 -lm -lpthread -lCsup -lcl | |||
| APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/lib/X11R6/pa20_64 -L/usr/contrib/X11R6/lib/pa20_64 -lXext -lXmu -lXt -lXi -lX11 -lm -lpthread -lCsup -lcl | |||
+ 4
- 4
configs/hpux11-ia64
View File
| @@ -14,7 +14,7 @@ CXXFLAGS = +z -Aa +DD64 +O3 +DSmckinley -D_HPUX_SOURCE -I/usr/include/X11R6 -I/u | |||
| MKLIB_OPTIONS = | |||
| LIB_DIR = $(TOP)/lib64 | |||
| LIB_DIR = lib64 | |||
| # Library names (actual file names) | |||
| GL_LIB_NAME = libGL.so | |||
| @@ -25,6 +25,6 @@ OSMESA_LIB_NAME = libOSMesa.so | |||
| # Library/program dependencies | |||
| GL_LIB_DEPS = -L/usr/lib/X11R6/ -L/usr/contrib/X11R6/lib/ -lXext -lXmu -lXt -lXi -lX11 -lm -lpthread | |||
| GLU_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lm -lCsup -lcl | |||
| GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(GL_LIB_DEPS) | |||
| GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) $(GL_LIB_DEPS) | |||
| GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm -lCsup -lcl | |||
| GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(GL_LIB_DEPS) | |||
| GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(GL_LIB_DEPS) | |||
+ 2
- 2
configs/hpux11-ia64-static
View File
| @@ -14,7 +14,7 @@ CXXFLAGS = +O3 +DD64 -Aa -D_HPUX_SOURCE +DSmckinley -I/usr/include/X11R6 -I/usr/ | |||
| MKLIB_OPTIONS = -static | |||
| LIB_DIR = $(TOP)/lib64 | |||
| LIB_DIR = lib64 | |||
| # Library names (actual file names) | |||
| GL_LIB_NAME = libGL.a | |||
| @@ -24,4 +24,4 @@ GLW_LIB_NAME = libGLw.a | |||
| OSMESA_LIB_NAME = libOSMesa.a | |||
| # Library/program dependencies | |||
| APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lXt -lX11 -lpthread -lm -lCsup -lcl | |||
| APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lXt -lX11 -lpthread -lm -lCsup -lcl | |||
+ 1
- 1
configs/hpux9
View File
| @@ -12,5 +12,5 @@ CXX = c++ | |||
| CFLAGS = +z +O3 +Olibcalls +ESlit -Aa +Onolimit -D_HPUX_SOURCE -I/usr/include/X11R5 -DUSE_XSHM | |||
| CXXFLAGS = +z +O3 +Olibcalls +ESlit -Aa +Onolimit -D_HPUX_SOURCE -I/usr/include/X11R5 | |||
| APP_LIB_DEPS = -L$(LIB_DIR) -L/usr/lib/X11R5 -s -Wl,+s,-B,nonfatal,-B,immediate -lXext -lXmu -lXi -lX11 -lm | |||
| APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/lib/X11R5 -s -Wl,+s,-B,nonfatal,-B,immediate -lXext -lXmu -lXi -lX11 -lm | |||
+ 1
- 1
configs/hpux9-gcc
View File
| @@ -11,4 +11,4 @@ CXX = aCC | |||
| CFLAGS = +O3 +DAportable +z -Aa -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM | |||
| CXXFLAGS = +O3 +DAportable +Z -Aa -D_HPUX_SOURCE | |||
| APP_LIB_DEPS = -L$(LIB_DIR) -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm | |||
| APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm | |||
+ 2
- 2
configs/irix6-64
View File
| @@ -12,6 +12,6 @@ CXXFLAGS = -64 -O3 -ansi -woff 1174 -DPTHREADS | |||
| GLW_SOURCES = GLwDrawA.c GLwMDrawA.c | |||
| LIB_DIR = $(TOP)/lib64 | |||
| LIB_DIR = lib64 | |||
| APP_LIB_DEPS = -L$(LIB_DIR) -64 -rpath $(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXmu -lXi -lpthread -lm | |||
| APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -64 -rpath $(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXmu -lXi -lpthread -lm | |||
+ 2
- 2
configs/irix6-64-static
View File
| @@ -13,9 +13,9 @@ MKLIB_OPTIONS = -static | |||
| GLW_SOURCES = GLwDrawA.c GLwMDrawA.c | |||
| LIB_DIR = $(TOP)/lib64 | |||
| LIB_DIR = lib64 | |||
| APP_LIB_DEPS = -L$(LIB_DIR) -64 -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lXmu -lXi -lpthread -lm -lC | |||
| APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -64 -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lXmu -lXi -lpthread -lm -lC | |||
| GL_LIB_NAME = libGL.a | |||
| GLU_LIB_NAME = libGLU.a | |||
+ 2
- 2
configs/irix6-n32
View File
| @@ -12,6 +12,6 @@ CXXFLAGS = -n32 -mips3 -O3 -ansi -woff 1174,1552 -DPTHREADS | |||
| GLW_SOURCES = GLwDrawA.c GLwMDrawA.c | |||
| LIB_DIR = $(TOP)/lib32 | |||
| LIB_DIR = lib32 | |||
| APP_LIB_DEPS = -L$(LIB_DIR) -n32 -rpath $(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXmu -lXi -lfpe -lpthread -lm | |||
| APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -n32 -rpath $(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXmu -lXi -lfpe -lpthread -lm | |||
+ 2
- 2
configs/irix6-n32-static
View File
| @@ -13,9 +13,9 @@ MKLIB_OPTIONS = -static | |||
| GLW_SOURCES = GLwDrawA.c GLwMDrawA.c | |||
| LIB_DIR = $(TOP)/lib32 | |||
| LIB_DIR = lib32 | |||
| APP_LIB_DEPS = -L$(LIB_DIR) -n32 -glut -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lXmu -lXi -lpthread -lm -lC | |||
| APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -n32 -glut -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lXmu -lXi -lpthread -lm -lC | |||
| GL_LIB_NAME = libGL.a | |||
| GLU_LIB_NAME = libGLU.a | |||
+ 2
- 2
configs/irix6-o32
View File
| @@ -12,7 +12,7 @@ CXXFLAGS = -32 -mips2 -O2 -ansi -woff 3262,3666 | |||
| GLW_SOURCES = GLwDrawA.c GLwMDrawA.c | |||
| LIB_DIR = $(TOP)/lib32 | |||
| LIB_DIR = lib32 | |||
| APP_LIB_DEPS = -L$(LIB_DIR) -32 -rpath $(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lXmu -lXi -lm | |||
| APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -32 -rpath $(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lXmu -lXi -lm | |||
+ 2
- 2
configs/irix6-o32-static
View File
| @@ -13,9 +13,9 @@ MKLIB_OPTIONS = -static | |||
| GLW_SOURCES = GLwDrawA.c GLwMDrawA.c | |||
| LIB_DIR = $(TOP)/lib32 | |||
| LIB_DIR = lib32 | |||
| APP_LIB_DEPS = -L$(LIB_DIR) -32 -glut -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lXmu -lXi -lm -lC | |||
| APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -32 -glut -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lXmu -lXi -lm -lC | |||
| GL_LIB_NAME = libGL.a | |||
| GLU_LIB_NAME = libGLU.a | |||
+ 3
- 3
configs/linux-alpha
View File
| @@ -12,7 +12,7 @@ CXXFLAGS = -O3 -mcpu=ev5 -ansi -mieee -pedantic -fPIC -D_XOPEN_SOURCE | |||
| GLUT_CFLAGS = -fexceptions | |||
| GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread | |||
| GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm | |||
| GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11 | |||
| APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm | |||
| GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm | |||
| GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11 | |||
| APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm | |||
+ 3
- 3
configs/linux-alpha-static
View File
| @@ -22,6 +22,6 @@ OSMESA_LIB_NAME = libOSMesa.a | |||
| GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread | |||
| GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm | |||
| GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11 | |||
| APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm -L/usr/X11R6/lib -lX11 -lm | |||
| GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm | |||
| GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11 | |||
| APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm -L/usr/X11R6/lib -lX11 -lm | |||
+ 2
- 2
configs/linux-directfb
View File
| @@ -29,6 +29,6 @@ PROGRAM_DIRS = demos directfb | |||
| # Library/program dependencies | |||
| GL_LIB_DEPS = -lm -lpthread | |||
| GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -l$(GLU_LIB) | |||
| APP_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -l$(GLU_LIB) -l$(GLUT_LIB) | |||
| GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -l$(GLU_LIB) | |||
| APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -l$(GLU_LIB) -l$(GLUT_LIB) | |||
+ 1
- 1
configs/linux-dri-x86-64
View File
| @@ -11,7 +11,7 @@ ASM_FLAGS = -DUSE_X86_64_ASM | |||
| ASM_SOURCES = $(X86-64_SOURCES) | |||
| ASM_API = $(X86-64_API) | |||
| LIB_DIR = $(TOP)/lib64 | |||
| LIB_DIR = lib64 | |||
| # Library/program dependencies | |||
| EXTRA_LIB_PATH=-L/usr/X11R6/lib64 | |||
+ 3
- 3
configs/linux-glide
View File
| @@ -15,6 +15,6 @@ GLUT_CFLAGS = -fexceptions | |||
| # Library/program dependencies | |||
| GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -L/usr/local/glide/lib -lglide3x -lm -lpthread | |||
| GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm | |||
| GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11 | |||
| APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/local/glide/lib -lglide3x -lm | |||
| GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm | |||
| GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11 | |||
| APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/local/glide/lib -lglide3x -lm | |||
+ 4
- 4
configs/linux-ia64-icc
View File
| @@ -13,9 +13,9 @@ GLUT_CFLAGS = -fexceptions | |||
| MKLIB_OPTIONS = -arch icc-istatic | |||
| GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lpthread | |||
| GLU_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) | |||
| GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi | |||
| GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) $(GL_LIB_DEPS) | |||
| APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -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/usr/X11R6/lib -lX11 -lXmu -lXt -lXi | |||
| GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(GL_LIB_DEPS) | |||
| APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) | |||
+ 1
- 1
configs/linux-ia64-icc-static
View File
| @@ -23,5 +23,5 @@ GL_LIB_DEPS = | |||
| GLU_LIB_DEPS = | |||
| GLUT_LIB_DEPS = | |||
| GLW_LIB_DEPS = | |||
| APP_LIB_DEPS = -i-static -cxxlib-icc -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lpthread -lm -lcxa -lunwind | |||
| APP_LIB_DEPS = -i-static -cxxlib-icc -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lpthread -lm -lcxa -lunwind | |||
+ 2
- 2
configs/linux-icc
View File
| @@ -13,8 +13,8 @@ GLUT_CFLAGS = -fexceptions | |||
| MKLIB_OPTIONS = -arch icc | |||
| GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread | |||
| GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm | |||
| APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm | |||
| GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm | |||
| APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm | |||
| ASM_SOURCES = $(X86_SOURCES) | |||
| ASM_API = $(X86_API) | |||
+ 1
- 1
configs/linux-icc-static
View File
| @@ -21,7 +21,7 @@ OSMESA_LIB_NAME = libOSMesa.a | |||
| GL_LIB_DEPS = | |||
| GLUT_LIB_DEPS = | |||
| APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm -lpthread -lcxa -lunwind | |||
| APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm -lpthread -lcxa -lunwind | |||
| ASM_SOURCES = $(X86_SOURCES) | |||
| ASM_API = $(X86_API) | |||
+ 1
- 1
configs/linux-osmesa
View File
| @@ -21,5 +21,5 @@ PROGRAM_DIRS = osdemos | |||
| # Dependencies | |||
| OSMESA_LIB_DEPS = -lm -lpthread | |||
| GLU_LIB_DEPS = -L$(LIB_DIR) -l$(OSMESA_LIB) | |||
| GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(OSMESA_LIB) | |||
| APP_LIB_DEPS = -lOSMesa -lGLU | |||
+ 1
- 1
configs/linux-osmesa16
View File
| @@ -24,5 +24,5 @@ PROGRAM_DIRS = | |||
| # Dependencies | |||
| OSMESA_LIB_DEPS = -lm -lpthread | |||
| GLU_LIB_DEPS = -L$(LIB_DIR) -l$(OSMESA_LIB) | |||
| GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(OSMESA_LIB) | |||
| APP_LIB_DEPS = -lOSMesa16 | |||
+ 1
- 1
configs/linux-osmesa32
View File
| @@ -24,5 +24,5 @@ PROGRAM_DIRS = | |||
| # Dependencies | |||
| OSMESA_LIB_DEPS = -lm -lpthread | |||
| GLU_LIB_DEPS = -L$(LIB_DIR) -l$(OSMESA_LIB) | |||
| GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(OSMESA_LIB) | |||
| APP_LIB_DEPS = -lOSMesa32 | |||
+ 3
- 3
configs/linux-profile
View File
| @@ -16,8 +16,8 @@ GLUT_CFLAGS = -fexceptions | |||
| # Need to have -L/usr/X11R6/lib in these: | |||
| GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread | |||
| GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm | |||
| GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lXt -L/usr/X11R6/lib -lX11 | |||
| GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm | |||
| GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lXt -L/usr/X11R6/lib -lX11 | |||
| # Need to make static libs for profiling: | |||
| MKLIB_OPTIONS = -static | |||
| @@ -26,4 +26,4 @@ GLU_LIB_NAME = lib$(GLU_LIB).a | |||
| GLUT_LIB_NAME = lib$(GLUT_LIB).a | |||
| GLW_LIB_NAME = lib$(GLW_LIB).a | |||
| OSMESA_LIB_NAME = lib$(OSMesa).a | |||
| APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm -lpthread | |||
| APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm -lpthread | |||
+ 4
- 4
configs/linux-solo
View File
| @@ -28,11 +28,11 @@ CXXFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) | |||
| ASM_SOURCES = | |||
| # Library/program dependencies | |||
| DRI_LIB_DEPS = -lm -lpthread -lexpat -ldl -L$(LIB_DIR) | |||
| DRI_LIB_DEPS = -lm -lpthread -lexpat -ldl -L$(TOP)/$(LIB_DIR) | |||
| GL_LIB_DEPS = -lm -lpthread -ldl | |||
| GLU_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lm | |||
| GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lm | |||
| APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm -lpthread | |||
| GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm | |||
| GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lm | |||
| APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm -lpthread | |||
| # Directories | |||
| SRC_DIRS = glx/mini mesa glu glut/mini | |||
+ 2
- 2
configs/linux-sparc
View File
| @@ -26,5 +26,5 @@ GLUT_CFLAGS = -fexceptions | |||
| EXTRA_LIB_PATH=-L/usr/X11R6/lib | |||
| GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread | |||
| GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lX11 -lXmu -lXt -lXi -lm | |||
| GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lXt -lX11 | |||
| GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lX11 -lXmu -lXt -lXi -lm | |||
| GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lXt -lX11 | |||
+ 2
- 2
configs/linux-sparc5
View File
| @@ -12,6 +12,6 @@ CXXFLAGS = -mcpu=ultrasparc -O2 -ffast-math -ansi -pedantic -fPIC -D_SVID_SOURCE | |||
| GLUT_CFLAGS = -fexceptions | |||
| GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread | |||
| GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm | |||
| GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11 | |||
| GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm | |||
| GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11 | |||
+ 3
- 3
configs/linux-ultrasparc
View File
| @@ -12,6 +12,6 @@ CXXFLAGS = -mv8 -O2 -mtune=ultrasparc -ansi -pedantic -fPIC -D_SVID_SOURCE -D_BS | |||
| GLUT_CFLAGS = -fexceptions | |||
| GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread | |||
| GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm | |||
| GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11 | |||
| APP_LIB_DEPS = -L$(LIB_DIR)-l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm | |||
| GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm | |||
| GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11 | |||
| APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR)-l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm | |||
+ 1
- 1
configs/linux-x86-64
View File
| @@ -10,5 +10,5 @@ ASM_SOURCES = $(X86-64_SOURCES) | |||
| ASM_API = $(X86-64_API) | |||
| ASM_FLAGS = -DUSE_X86_64_ASM | |||
| LIB_DIR = $(TOP)/lib64 | |||
| LIB_DIR = lib64 | |||
| EXTRA_LIB_PATH = -L/usr/X11R6/lib64 | |||
+ 1
- 1
configs/linux-x86-64-static
View File
| @@ -19,5 +19,5 @@ OSMESA_LIB_DEPS = | |||
| GLU_LIB_DEPS = | |||
| GLUT_LIB_DEPS = | |||
| GLW_LIB_DEPS = | |||
| APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) \ | |||
| APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) \ | |||
| $(EXTRA_LIB_PATH) -lX11 -lXmu -lXt -lXi -lpthread -lstdc++ -lm | |||
+ 3
- 3
configs/linux-x86-glide
View File
| @@ -20,6 +20,6 @@ ASM_API = $(X86_API) | |||
| # Library/program dependencies | |||
| GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -L/usr/local/glide/lib -lglide3x -lm -lpthread | |||
| GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm | |||
| GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11 | |||
| APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/local/glide/lib -lglide3x -lm | |||
| GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm | |||
| GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11 | |||
| APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/local/glide/lib -lglide3x -lm | |||
+ 1
- 1
configs/linux-x86-static
View File
| @@ -19,5 +19,5 @@ OSMESA_LIB_DEPS = | |||
| GLU_LIB_DEPS = | |||
| GLUT_LIB_DEPS = | |||
| GLW_LIB_DEPS = | |||
| APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) \ | |||
| APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) \ | |||
| $(EXTRA_LIB_PATH) -lX11 -lXmu -lXt -lXi -lpthread -lstdc++ -lm | |||
+ 1
- 1
configs/netbsd
View File
| @@ -10,5 +10,5 @@ CXX = g++ | |||
| CFLAGS = -O2 -fPIC -DUSE_XSHM -I/usr/X11R6/include -DHZ=100 | |||
| CXXFLAGS = -O2 -fPIC | |||
| GLUT_CFLAGS = -fexceptions | |||
| APP_LIB_DEPS = -L$(LIB_DIR) -L/usr/X11R6/lib -lXext -lXmu -lXi -lX11 -lm | |||
| APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/X11R6/lib -lXext -lXmu -lXi -lX11 -lm | |||
+ 3
- 3
configs/openbsd
View File
| @@ -12,7 +12,7 @@ CXXFLAGS = -O2 -fPIC -I/usr/X11R6/include -DHZ=100 | |||
| GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm | |||
| OSMESA_LIB_DEPS = -lm | |||
| GLU_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) | |||
| GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lm | |||
| APP_LIB_DEPS = -L$(LIB_DIR) -L/usr/X11R6/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm | |||
| GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) | |||
| GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lm | |||
| APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/X11R6/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm | |||
+ 3
- 3
configs/osf1
View File
| @@ -11,6 +11,6 @@ CFLAGS = -O0 -std1 -ieee_with_no_inexact -DUSE_XSHM -DPTHREADS -D_REENTRANT | |||
| CXXFLAGS = -O2 -std ansi -ieee -DPTHREADS -D_REENTRANT | |||
| GL_LIB_DEPS = -lX11 -lXext -lm -lpthread | |||
| GLU_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lm | |||
| GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXmu -lXt -lXi -lm | |||
| APP_LIB_DEPS = -L$(LIB_DIR) -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lXmu -lXi -lpthread -lm | |||
| GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm | |||
| GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXmu -lXt -lXi -lm | |||
| APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lXmu -lXi -lpthread -lm | |||
+ 1
- 1
configs/osf1-static
View File
| @@ -14,4 +14,4 @@ MKLIB_OPTIONS = -static | |||
| GL_LIB_DEPS = | |||
| GLU_LIB_DEPS = | |||
| GLUT_LIB_DEPS = | |||
| APP_LIB_DEPS = -noso -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -so_archive -lX11 -lXext -lXmu -lXi -lpthread -lm -lcxx | |||
| APP_LIB_DEPS = -noso -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -so_archive -lX11 -lXext -lXmu -lXi -lpthread -lm -lcxx | |||
+ 1
- 1
configs/solaris-x86
View File
| @@ -9,7 +9,7 @@ CC = cc | |||
| CFLAGS = -Xa -xO3 -xpentium -KPIC -I/usr/openwin/include -DUSE_XSHM | |||
| MKLIB_OPTIONS = -static | |||
| APP_LIB_DEPS = -L$(LIB_DIR) -L/usr/openwin/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm -lglut -lGLU -lGL | |||
| APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/openwin/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm -lglut -lGLU -lGL | |||
| GL_LIB_NAME = libGL.a | |||
| GLU_LIB_NAME = libGLU.a | |||
+ 3
- 3
configs/solaris-x86-gcc
View File
| @@ -12,6 +12,6 @@ CXXFLAGS = -O3 -march=i486 -fPIC | |||
| GLUT_CFLAGS = -fexceptions | |||
| GL_LIB_DEPS = -L/usr/openwin/lib -lX11 -lXext -lm -lpthread | |||
| GLU_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lm | |||
| GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/openwin/lib -lX11 -lXmu -lXt -lXi -lm | |||
| APP_LIB_DEPS = -L$(LIB_DIR) -L/usr/openwin/lib -R/usr/openwin/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm -lX11 -lXext -lXi -lXmu | |||
| GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm | |||
| GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/openwin/lib -lX11 -lXmu -lXt -lXi -lm | |||
| APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/openwin/lib -R/usr/openwin/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm -lX11 -lXext -lXi -lXmu | |||
+ 3
- 3
configs/solaris-x86-gcc-static
View File
| @@ -13,9 +13,9 @@ GLUT_CFLAGS = -fexceptions | |||
| MKLIB_OPTIONS = -static | |||
| GL_LIB_DEPS = -L/usr/openwin/lib -lX11 -lXext -lm -lpthread | |||
| GLU_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lm | |||
| GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/openwin/lib -lX11 -lXmu -lXt -lXi -lm | |||
| APP_LIB_DEPS = -L$(LIB_DIR) -L/usr/openwin/lib -R/usr/openwin/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm -lX11 -lXext -lXi -lXmu | |||
| GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm | |||
| GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/openwin/lib -lX11 -lXmu -lXt -lXi -lm | |||
| APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/openwin/lib -R/usr/openwin/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm -lX11 -lXext -lXi -lXmu | |||
| GL_LIB_NAME = libGL.a | |||
| GLU_LIB_NAME = libGLU.a | |||
+ 1
- 1
configs/sunos4
View File
| @@ -7,6 +7,6 @@ CONFIG_NAME = sunos4 | |||
| # Compiler and flags | |||
| CC = acc | |||
| CFLAGS = -Kpic -O -I/usr/include/X11R5 -DUSE_XSHM -DSUNOS4 | |||
| APP_LIB_DEPS = -L$(LIB_DIR) -L/usr/lib/X11R5 -lX11 -lXext -lXmu -lXi -lm | |||
| APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/lib/X11R5 -lX11 -lXext -lXmu -lXi -lm | |||
+ 1
- 1
configs/sunos4-gcc
View File
| @@ -11,5 +11,5 @@ CFLAGS = -fPIC -O3 -I/usr/openwin/include -I/usr/include/X11R5 -I/usr/include/X1 | |||
| CXXFLAGS = -fPIC -O3 -I/usr/openwin/include -DSUNOS4 | |||
| GLUT_CFLAGS = -fexceptions -DSOLARIS_2_4_BUG | |||
| APP_LIB_DEPS = -L$(LIB_DIR) -L/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm | |||
| APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm | |||
+ 1
- 1
configs/sunos4-static
View File
| @@ -22,4 +22,4 @@ OSMESA_LIB_DEPS = | |||
| GLU_LIB_DEPS = | |||
| GLUT_LIB_DEPS = | |||
| GLW_LIB_DEPS = | |||
| 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 | |||
| APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lpthread -lm | |||
+ 4
- 4
configs/sunos5
View File
| @@ -12,7 +12,7 @@ CXXFLAGS = -KPIC -Xa -O -I/usr/openwin/include -I/usr/dt/include | |||
| GLUT_CFLAGS = -DSOLARIS_2_4_BUG | |||
| GL_LIB_DEPS = -L/usr/openwin/lib -L/usr/dt/lib -lX11 -lXext -lXmu -lXi -lm | |||
| GLU_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lm | |||
| GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lm | |||
| GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/openwin/lib -lXt -lX11 | |||
| APP_LIB_DEPS = -L$(LIB_DIR) -lCrun -lX11 -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm | |||
| GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm | |||
| GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lm | |||
| GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L/usr/openwin/lib -lXt -lX11 | |||
| APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -lCrun -lX11 -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm | |||
+ 2
- 2
configs/sunos5-gcc
View File
| @@ -32,5 +32,5 @@ GLUT_CFLAGS = -fexceptions -DSOLARIS_2_4_BUG | |||
| EXTRA_LIB_PATH=-L/usr/openwin/lib | |||
| GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXmu -lXi -lm | |||
| GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lm | |||
| APP_LIB_DEPS = -L$(LIB_DIR) -lX11 -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm | |||
| GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lm | |||
| APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -lX11 -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm | |||
+ 4
- 4
configs/sunos5-smp
View File
| @@ -12,8 +12,8 @@ CXXFLAGS = -KPIC -Xa -native -fast -xO5 -xlibmil -xsafe=mem -xdepend -I/usr/open | |||
| GLUT_CFLAGS = -DSOLARIS_2_4_BUG | |||
| GL_LIB_DEPS = -L/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm | |||
| GLU_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lm | |||
| GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lm | |||
| GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/openwin/lib -lXt -lX11 | |||
| APP_LIB_DEPS = -L$(LIB_DIR) -lX11 -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm -lCrun | |||
| GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm | |||
| GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lm | |||
| GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L/usr/openwin/lib -lXt -lX11 | |||
| APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -lX11 -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm -lCrun | |||
+ 4
- 4
configs/sunos5-v8
View File
| @@ -12,7 +12,7 @@ CXXFLAGS = -xarch=v8 -KPIC -O -I/usr/openwin/include -I/usr/dt/include -DPTHREAD | |||
| GLUT_CFLAGS = -DSOLARIS_2_4_BUG | |||
| GL_LIB_DEPS = -L/usr/openwin/lib -L/usr/dt/lib -lX11 -lXext -lXmu -lXi -lm -lpthread | |||
| GLU_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lm -lCstd -lCrun | |||
| GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lm | |||
| GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/openwin/lib -lXt -lX11 | |||
| APP_LIB_DEPS = -L$(LIB_DIR) -lX11 -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm | |||
| GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm -lCstd -lCrun | |||
| GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lm | |||
| GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L/usr/openwin/lib -lXt -lX11 | |||
| APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -lX11 -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm | |||
+ 1
- 1
configs/sunos5-v8-static
View File
| @@ -13,4 +13,4 @@ CFLAGS = -xarch=v8 -KPIC -O -I/usr/openwin/include -I/usr/dt/include -DUSE_XSHM | |||
| CXXFLAGS = -xarch=v8 -KPIC -O -I/usr/openwin/include -I/usr/dt/include -DPTHREADS | |||
| GLUT_CFLAGS = -DSOLARIS_2_4_BUG | |||
| APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/openwin/lib -lXt -lX11 -lXext -lXmu -lXi -lpthread -lm -lCstd -lCrun | |||
| APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/openwin/lib -lXt -lX11 -lXext -lXmu -lXi -lpthread -lm -lCstd -lCrun | |||
+ 5
- 5
configs/sunos5-v9
View File
| @@ -6,7 +6,7 @@ CONFIG_NAME = sunos5-v9 | |||
| MKLIB_OPTIONS = -cplusplus | |||
| LIB_DIR = $(TOP)/lib64 | |||
| LIB_DIR = lib64 | |||
| # Compiler and flags | |||
| CC = cc | |||
| @@ -16,8 +16,8 @@ CXXFLAGS = -xarch=v9 -KPIC -O -I/usr/openwin/include -I/usr/dt/include -DPTHREAD | |||
| GLUT_CFLAGS = -DSOLARIS_2_4_BUG | |||
| GL_LIB_DEPS = -L/usr/openwin/lib -L/usr/dt/lib -lX11 -lXext -lXmu -lXi -lm -lpthread | |||
| GLU_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lm -lCstd -lCrun | |||
| GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lm | |||
| GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/openwin/lib -lXt -lX11 | |||
| APP_LIB_DEPS = -L$(LIB_DIR) -lX11 -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm | |||
| GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm -lCstd -lCrun | |||
| GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lm | |||
| GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L/usr/openwin/lib -lXt -lX11 | |||
| APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -lX11 -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm | |||
+ 2
- 2
configs/sunos5-v9-static
View File
| @@ -6,7 +6,7 @@ CONFIG_NAME = sunos5-v9-static | |||
| MKLIB_OPTIONS = -static -cplusplus | |||
| LIB_DIR = $(TOP)/lib64 | |||
| LIB_DIR = lib64 | |||
| # Compiler and flags | |||
| CC = cc | |||
| @@ -15,4 +15,4 @@ CFLAGS = -xarch=v9 -KPIC -O -I/usr/openwin/include -I/usr/dt/include -DUSE_XSHM | |||
| CXXFLAGS = -xarch=v9 -KPIC -O -I/usr/openwin/include -I/usr/dt/include -DPTHREADS | |||
| GLUT_CFLAGS = -DSOLARIS_2_4_BUG | |||
| APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/openwin/lib -lXt -lX11 -lXext -lXmu -lXi -lpthread -lm -lCstd -lCrun | |||
| APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/openwin/lib -lXt -lX11 -lXext -lXmu -lXi -lpthread -lm -lCstd -lCrun | |||
+ 1
- 1
configs/ultrix-gcc
View File
| @@ -18,4 +18,4 @@ GLUT_LIB_NAME = libglut.a | |||
| GLW_LIB_NAME = libGLw.a | |||
| OSMESA_LIB_NAME = libOSMesa.a | |||
| APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lXmu -lX11 -lXi -lm | |||
| APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lXmu -lX11 -lXi -lm | |||
+ 4
- 4
progs/demos/Makefile
View File
| @@ -5,13 +5,13 @@ include $(TOP)/configs/current | |||
| INCDIR = $(TOP)/include | |||
| OSMESA_LIBS = -L$(LIB_DIR) -lglut -lOSMesa -lGLU -lGL $(APP_LIB_DEPS) | |||
| OSMESA_LIBS = -L$(TOP)/$(LIB_DIR) -lglut -lOSMesa -lGLU -lGL $(APP_LIB_DEPS) | |||
| OSMESA16_LIBS = -L$(LIB_DIR) -lglut -lOSMesa16 -lGLU -lGL $(APP_LIB_DEPS) | |||
| OSMESA16_LIBS = -L$(TOP)/$(LIB_DIR) -lglut -lOSMesa16 -lGLU -lGL $(APP_LIB_DEPS) | |||
| OSMESA32_LIBS = -L$(LIB_DIR) -lglut -lOSMesa32 -lGLU -lGL $(APP_LIB_DEPS) | |||
| OSMESA32_LIBS = -L$(TOP)/$(LIB_DIR) -lglut -lOSMesa32 -lGLU -lGL $(APP_LIB_DEPS) | |||
| LIB_DEP = $(LIB_DIR)/$(GL_LIB_NAME) $(LIB_DIR)/$(GLU_LIB_NAME) $(LIB_DIR)/$(GLUT_LIB_NAME) | |||
| LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME) | |||
| PROGS = \ | |||
| arbfplight \ | |||
+ 1
- 1
progs/directfb/Makefile
View File
| @@ -6,7 +6,7 @@ include $(TOP)/configs/current | |||
| INCDIR = $(TOP)/include -I$(TOP)/progs | |||
| LIB_DEP = $(LIB_DIR)/$(GL_LIB_NAME) $(LIB_DIR)/$(GLU_LIB_NAME) | |||
| LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) | |||
| CFLAGS += $(shell pkg-config --cflags directfb) | |||
| APP_LIB_DEPS += $(shell pkg-config --libs directfb) | |||
+ 10
- 10
progs/egl/Makefile
View File
| @@ -24,36 +24,36 @@ PROGRAMS = \ | |||
| default: $(PROGRAMS) | |||
| demo1: demo1.o $(LIB_DIR)/libEGL.so | |||
| $(CC) $(CFLAGS) demo1.o -L$(LIB_DIR) -lEGL $(LIBDRM_LIB) -o $@ | |||
| demo1: demo1.o $(TOP)/$(LIB_DIR)/libEGL.so | |||
| $(CC) $(CFLAGS) demo1.o -L$(TOP)/$(LIB_DIR) -lEGL $(LIBDRM_LIB) -o $@ | |||
| demo1.o: demo1.c $(HEADERS) | |||
| $(CC) -c $(CFLAGS) -I$(TOP)/include demo1.c | |||
| demo2: demo2.o $(LIB_DIR)/libEGL.so | |||
| $(CC) $(CFLAGS) demo2.o -L$(LIB_DIR) -lEGL $(LIBDRM_LIB) $(APP_LIB_DEPS) -o $@ | |||
| demo2: demo2.o $(TOP)/$(LIB_DIR)/libEGL.so | |||
| $(CC) $(CFLAGS) demo2.o -L$(TOP)/$(LIB_DIR) -lEGL $(LIBDRM_LIB) $(APP_LIB_DEPS) -o $@ | |||
| demo2.o: demo2.c $(HEADERS) | |||
| $(CC) -c $(CFLAGS) -I$(TOP)/include demo2.c | |||
| demo3: demo3.o $(LIB_DIR)/libEGL.so | |||
| $(CC) $(CFLAGS) demo3.o -L$(LIB_DIR) -lEGL $(LIBDRM_LIB) $(APP_LIB_DEPS) -o $@ | |||
| demo3: demo3.o $(TOP)/$(LIB_DIR)/libEGL.so | |||
| $(CC) $(CFLAGS) demo3.o -L$(TOP)/$(LIB_DIR) -lEGL $(LIBDRM_LIB) $(APP_LIB_DEPS) -o $@ | |||
| demo3.o: demo3.c $(HEADERS) | |||
| $(CC) -c $(CFLAGS) -I$(TOP)/include demo3.c | |||
| eglinfo: eglinfo.o $(LIB_DIR)/libEGL.so | |||
| $(CC) $(CFLAGS) eglinfo.o -L$(LIB_DIR) -lEGL $(LIBDRM_LIB) -o $@ | |||
| eglinfo: eglinfo.o $(TOP)/$(LIB_DIR)/libEGL.so | |||
| $(CC) $(CFLAGS) eglinfo.o -L$(TOP)/$(LIB_DIR) -lEGL $(LIBDRM_LIB) -o $@ | |||
| eglinfo.o: eglinfo.c $(HEADERS) | |||
| $(CC) -c $(CFLAGS) -I$(TOP)/include eglinfo.c | |||
| eglgears: eglgears.o $(LIB_DIR)/libEGL.so | |||
| $(CC) $(CFLAGS) eglgears.o -L$(LIB_DIR) -lEGL $(LIBDRM_LIB) $(APP_LIB_DEPS) -o $@ | |||
| eglgears: eglgears.o $(TOP)/$(LIB_DIR)/libEGL.so | |||
| $(CC) $(CFLAGS) eglgears.o -L$(TOP)/$(LIB_DIR) -lEGL $(LIBDRM_LIB) $(APP_LIB_DEPS) -o $@ | |||
| eglgears.o: eglgears.c $(HEADERS) | |||
| $(CC) -c $(CFLAGS) -I$(TOP)/include eglgears.c | |||
+ 4
- 4
progs/osdemos/Makefile
View File
| @@ -5,13 +5,13 @@ include $(TOP)/configs/current | |||
| INCDIR = $(TOP)/include | |||
| OSMESA_LIBS = -L$(LIB_DIR) -lOSMesa $(APP_LIB_DEPS) | |||
| OSMESA_LIBS = -L$(TOP)/$(LIB_DIR) -lOSMesa $(APP_LIB_DEPS) | |||
| OSMESA16_LIBS = -L$(LIB_DIR) -lglut -lOSMesa16 -lGLU -lGL $(APP_LIB_DEPS) | |||
| OSMESA16_LIBS = -L$(TOP)/$(LIB_DIR) -lglut -lOSMesa16 -lGLU -lGL $(APP_LIB_DEPS) | |||
| OSMESA32_LIBS = -L$(LIB_DIR) -lglut -lOSMesa32 -lGLU -lGL $(APP_LIB_DEPS) | |||
| OSMESA32_LIBS = -L$(TOP)/$(LIB_DIR) -lglut -lOSMesa32 -lGLU -lGL $(APP_LIB_DEPS) | |||
| LIB_DEP = $(LIB_DIR)/$(GL_LIB_NAME) $(LIB_DIR)/$(GLU_LIB_NAME) $(LIB_DIR)/$(GLUT_LIB_NAME) | |||
| LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME) | |||
| PROGS = \ | |||
| osdemo \ | |||
+ 1
- 1
progs/redbook/Makefile
View File
| @@ -5,7 +5,7 @@ include $(TOP)/configs/current | |||
| INCDIR = $(TOP)/include | |||
| LIB_DEP = $(LIB_DIR)/$(GL_LIB_NAME) $(LIB_DIR)/$(GLU_LIB_NAME) $(LIB_DIR)/$(GLUT_LIB_NAME) | |||
| LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME) | |||
| PROGS = aaindex aapoly aargb accanti accpersp alpha alpha3D anti \ | |||
| bezcurve bezmesh checker clip colormat cube depthcue dof \ | |||
+ 1
- 1
progs/samples/Makefile
View File
| @@ -5,7 +5,7 @@ include $(TOP)/configs/current | |||
| INCDIR = $(TOP)/include | |||
| LIB_DEP = $(LIB_DIR)/$(GL_LIB_NAME) $(LIB_DIR)/$(GLU_LIB_NAME) $(LIB_DIR)/$(GLUT_LIB_NAME) | |||
| LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME) | |||
| PROGS = accum bitmap1 bitmap2 blendeq blendxor copy cursor depth eval fog \ | |||
| font line logo nurb olympic overlay point prim quad select \ | |||
+ 1
- 1
progs/slang/Makefile
View File
| @@ -6,7 +6,7 @@ include $(TOP)/configs/current | |||
| INCDIR = $(TOP)/include | |||
| LIB_DEP = $(LIB_DIR)/$(GL_LIB_NAME) | |||
| LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) | |||
| # | |||
| # targets | |||
+ 1
- 1
progs/xdemos/Makefile
View File
| @@ -6,7 +6,7 @@ include $(TOP)/configs/current | |||
| INCDIR = $(TOP)/include | |||
| LIB_DEP = $(LIB_DIR)/$(GL_LIB_NAME) $(LIB_DIR)/$(GLU_LIB_NAME) | |||
| LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) | |||
| PROGS = glthreads \ | |||
| glxdemo \ | |||
+ 3
- 3
src/Makefile
View File
| @@ -7,7 +7,7 @@ include $(TOP)/configs/current | |||
| SUBDIRS = $(SRC_DIRS) | |||
| default: message $(LIB_DIR) subdirs | |||
| default: message $(TOP)/$(LIB_DIR) subdirs | |||
| message: | |||
| @@ -28,8 +28,8 @@ install: | |||
| fi \ | |||
| done | |||
| $(LIB_DIR): | |||
| -mkdir $(LIB_DIR) | |||
| $(TOP)/$(LIB_DIR): | |||
| -mkdir $(TOP)/$(LIB_DIR) | |||
| clean: | |||
+ 3
- 3
src/egl/drivers/demo/Makefile
View File
| @@ -17,12 +17,12 @@ OBJECTS = $(SOURCES:.c=.o) | |||
| default: $(LIB_DIR)/demodriver.so | |||
| default: $(TOP)/$(LIB_DIR)/demodriver.so | |||
| $(LIB_DIR)/demodriver.so: $(OBJECTS) | |||
| $(TOP)/$(LIB_DIR)/demodriver.so: $(OBJECTS) | |||
| $(TOP)/bin/mklib -o demodriver.so -noprefix \ | |||
| -install $(LIB_DIR) $(OBJECTS) | |||
| -install $(TOP)/$(LIB_DIR) $(OBJECTS) | |||
+ 3
- 3
src/egl/drivers/dri/Makefile
View File
| @@ -39,11 +39,11 @@ default: depend library Makefile | |||
| # EGLdri Library | |||
| library: $(LIB_DIR)/libEGLdri.so | |||
| library: $(TOP)/$(LIB_DIR)/libEGLdri.so | |||
| $(LIB_DIR)/libEGLdri.so: $(OBJECTS) | |||
| $(TOP)/$(LIB_DIR)/libEGLdri.so: $(OBJECTS) | |||
| $(TOP)/bin/mklib -o EGLdri -major 1 -minor 0 \ | |||
| -install $(LIB_DIR) -ldl $(OBJECTS) | |||
| -install $(TOP)/$(LIB_DIR) -ldl $(OBJECTS) | |||
| clean: | |||
+ 3
- 3
src/egl/main/Makefile
View File
| @@ -43,11 +43,11 @@ default: depend library | |||
| # EGL Library | |||
| library: $(LIB_DIR)/libEGL.so | |||
| library: $(TOP)/$(LIB_DIR)/libEGL.so | |||
| $(LIB_DIR)/libEGL.so: $(OBJECTS) | |||
| $(TOP)/$(LIB_DIR)/libEGL.so: $(OBJECTS) | |||
| $(TOP)/bin/mklib -o EGL -major 1 -minor 0 \ | |||
| -install $(LIB_DIR) -ldl $(OBJECTS) | |||
| -install $(TOP)/$(LIB_DIR) -ldl $(OBJECTS) | |||
+ 2
- 2
src/glu/Makefile
View File
| @@ -14,8 +14,8 @@ default: $(TOP)/configs/current | |||
| done | |||
| install: | |||
| $(INSTALL) -d $(INSTALL_DIR)/lib | |||
| $(COPY_LIBS) $(LIB_DIR)/libGLU.* $(INSTALL_DIR)/lib | |||
| $(INSTALL) -d $(INSTALL_DIR)/$(LIB_DIR) | |||
| $(COPY_LIBS) $(TOP)/$(LIB_DIR)/libGLU.* $(INSTALL_DIR)/$(LIB_DIR) | |||
| clean: | |||
| @for dir in $(SUBDIRS) ; do \ | |||
+ 5
- 5
src/glu/mesa/Makefile
View File
| @@ -37,17 +37,17 @@ default: | |||
| echo "$(GLU_LIB_NAME) not build under BeOS, but integrated into ${GL_LIB_NAME}." ; \ | |||
| exit 0 ; \ | |||
| else \ | |||
| $(MAKE) "${LIB_DIR}/${GLU_LIB_NAME}" ; \ | |||
| $(MAKE) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) ; \ | |||
| fi | |||
| $(LIB_DIR): | |||
| -mkdir $(LIB_DIR) | |||
| $(TOP)/$(LIB_DIR): | |||
| -mkdir $(TOP)/$(LIB_DIR) | |||
| # Make the library: | |||
| $(LIB_DIR)/$(GLU_LIB_NAME): $(OBJECTS) | |||
| $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME): $(OBJECTS) | |||
| @ $(TOP)/bin/mklib -o $(GLU_LIB) -linker '$(CC)' \ | |||
| -major $(GLU_MAJOR) -minor $(GLU_MINOR) -patch $(GLU_TINY) \ | |||
| $(MKLIB_OPTIONS) -install $(LIB_DIR) \ | |||
| $(MKLIB_OPTIONS) -install $(TOP)/$(LIB_DIR) \ | |||
| $(GLU_LIB_DEPS) $(OBJECTS) | |||
| clean: | |||
+ 5
- 5
src/glu/sgi/Makefile
View File
| @@ -128,17 +128,17 @@ default: | |||
| echo "$(GLU_LIB_NAME) not build under BeOS, but integrated into ${GL_LIB_NAME}." ; \ | |||
| exit 0 ; \ | |||
| else \ | |||
| $(MAKE) "${LIB_DIR}/${GLU_LIB_NAME}" ; \ | |||
| $(MAKE) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) ; \ | |||
| fi | |||
| $(LIB_DIR): | |||
| -mkdir $(LIB_DIR) | |||
| $(TOP)/$(LIB_DIR): | |||
| -mkdir $(TOP)/$(LIB_DIR) | |||
| # Make the library: | |||
| $(LIB_DIR)/$(GLU_LIB_NAME): $(OBJECTS) | |||
| $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME): $(OBJECTS) | |||
| $(TOP)/bin/mklib -o $(GLU_LIB) -linker '$(CXX)' \ | |||
| -major $(GLU_MAJOR) -minor $(GLU_MINOR) -patch $(GLU_TINY) \ | |||
| -cplusplus $(MKLIB_OPTIONS) -install $(LIB_DIR) \ | |||
| -cplusplus $(MKLIB_OPTIONS) -install $(TOP)/$(LIB_DIR) \ | |||
| $(GLU_LIB_DEPS) $(OBJECTS) | |||
+ 5
- 5
src/glut/beos/Makefile
View File
| @@ -75,16 +75,16 @@ INCLUDES = \ | |||
| # ---- TARGETS | |||
| default: $(LIB_DIR) $(LIB_DIR)/$(GLUT_LIB_NAME) | |||
| default: $(TOP)/$(LIB_DIR) $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME) | |||
| # Create the lib directory if missing | |||
| $(LIB_DIR): | |||
| mkdir $(LIB_DIR) | |||
| $(TOP)/$(LIB_DIR): | |||
| mkdir $(TOP)/$(LIB_DIR) | |||
| # Make the library | |||
| $(LIB_DIR)/$(GLUT_LIB_NAME): depend $(OBJECTS) | |||
| $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME): depend $(OBJECTS) | |||
| @$(TOP)/bin/mklib -o $(GLUT_LIB) -major $(GLUT_MAJOR) -minor $(GLUT_MINOR) -patch $(GLUT_TINY) \ | |||
| -install $(LIB_DIR) $(MKLIB_OPTIONS) $(GLUT_LIB_DEPS) \ | |||
| -install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) $(GLUT_LIB_DEPS) \ | |||
| $(OBJECTS) | |||
| clean: | |||
+ 3
- 3
src/glut/directfb/Makefile
View File
| @@ -56,14 +56,14 @@ OBJECTS = $(SOURCES:.c=.o) | |||
| ##### TARGETS ##### | |||
| default: depend $(LIB_DIR)/$(GLUT_LIB_NAME) | |||
| default: depend $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME) | |||
| # Make the library | |||
| $(LIB_DIR)/$(GLUT_LIB_NAME): depend $(OBJECTS) | |||
| $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME): depend $(OBJECTS) | |||
| $(TOP)/bin/mklib -o $(GLUT_LIB) -linker '$(CC)' \ | |||
| -major $(GLUT_MAJOR) -minor $(GLUT_MINOR) -patch $(GLUT_TINY) \ | |||
| $(GLUT_LIB_DEPS) -install $(LIB_DIR) \ | |||
| $(GLUT_LIB_DEPS) -install $(TOP)/$(LIB_DIR) \ | |||
| $(MKLIB_OPTIONS) $(OBJECTS) | |||
+ 3
- 3
src/glut/ggi/Makefile
View File
| @@ -27,14 +27,14 @@ OBJECTS = $(SOURCES:.c=.o) | |||
| ##### TARGETS ##### | |||
| default: $(LIB_DIR)/$(GLUT_LIB_NAME) | |||
| default: $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME) | |||
| # Make the library | |||
| $(LIB_DIR)/$(GLUT_LIB_NAME): depend $(OBJECTS) | |||
| $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME): depend $(OBJECTS) | |||
| $(TOP)/bin/mklib -o $(GLUT_LIB) -linker '$(CC)' \ | |||
| -major $(GLUT_MAJOR) -minor $(GLUT_MINOR) \ | |||
| -patch $(GLUT_TINY) $(MKLIB_OPTIONS) -install $(LIB_DIR) \ | |||
| -patch $(GLUT_TINY) $(MKLIB_OPTIONS) -install $(TOP)/$(LIB_DIR) \ | |||
| $(GLUT_LIB_DEPS) $(OBJECTS) | |||
+ 5
- 5
src/glut/glx/Makefile
View File
| @@ -85,22 +85,22 @@ OBJECTS = $(SOURCES:.c=.o) | |||
| ##### TARGETS ##### | |||
| default: $(LIB_DIR)/$(GLUT_LIB_NAME) | |||
| default: $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME) | |||
| # Make the library | |||
| $(LIB_DIR)/$(GLUT_LIB_NAME): depend $(OBJECTS) | |||
| $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME): depend $(OBJECTS) | |||
| $(TOP)/bin/mklib -o $(GLUT_LIB) -linker '$(CC)' \ | |||
| -major $(GLUT_MAJOR) -minor $(GLUT_MINOR) -patch $(GLUT_TINY) \ | |||
| $(MKLIB_OPTIONS) -install $(LIB_DIR) \ | |||
| $(MKLIB_OPTIONS) -install $(TOP)/$(LIB_DIR) \ | |||
| $(GLUT_LIB_DEPS) $(OBJECTS) | |||
| install: | |||
| $(INSTALL) -d $(INSTALL_DIR)/include/GL | |||
| $(INSTALL) -d $(INSTALL_DIR)/lib | |||
| $(INSTALL) -d $(INSTALL_DIR)/$(LIB_DIR) | |||
| $(INSTALL) -m 644 $(TOP)/include/GL/glut.h $(INSTALL_DIR)/include/GL | |||
| $(COPY_LIBS) $(LIB_DIR)/libglut* $(INSTALL_DIR)/lib | |||
| $(COPY_LIBS) $(TOP)/$(LIB_DIR)/libglut* $(INSTALL_DIR)/$(LIB_DIR) | |||
| clean: | |||
+ 3
- 3
src/glut/mini/Makefile
View File
| @@ -50,14 +50,14 @@ OBJECTS = $(SOURCES:.c=.o) | |||
| ##### TARGETS ##### | |||
| default: depend $(LIB_DIR)/$(GLUT_LIB_NAME) | |||
| default: depend $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME) | |||
| # Make the library | |||
| $(LIB_DIR)/$(GLUT_LIB_NAME): depend $(OBJECTS) | |||
| $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME): depend $(OBJECTS) | |||
| $(TOP)/bin/mklib -o $(GLUT_LIB) -linker '$(CC)' \ | |||
| -major $(GLUT_MAJOR) -minor $(GLUT_MINOR) -patch $(GLUT_TINY) \ | |||
| $(GLUT_LIB_DEPS) -install $(LIB_DIR) \ | |||
| $(GLUT_LIB_DEPS) -install $(TOP)/$(LIB_DIR) \ | |||
| $(MKLIB_OPTIONS) $(OBJECTS) | |||
+ 5
- 5
src/glw/Makefile
View File
| @@ -23,13 +23,13 @@ OBJECTS = $(GLW_SOURCES:.c=.o) | |||
| ##### TARGETS ##### | |||
| default: $(LIB_DIR)/$(GLW_LIB_NAME) | |||
| default: $(TOP)/$(LIB_DIR)/$(GLW_LIB_NAME) | |||
| install: | |||
| $(INSTALL) -d $(INSTALL_DIR)/include/GL | |||
| $(INSTALL) -d $(INSTALL_DIR)/lib | |||
| $(INSTALL) -d $(INSTALL_DIR)/$(LIB_DIR) | |||
| $(INSTALL) -m 644 *.h $(INSTALL_DIR)/include/GL | |||
| $(COPY_LIBS) $(LIB_DIR)/libGLw.* $(INSTALL_DIR)/lib | |||
| $(COPY_LIBS) $(TOP)/$(LIB_DIR)/libGLw.* $(INSTALL_DIR)/$(LIB_DIR) | |||
| clean: | |||
| -rm depend depend.bak | |||
| @@ -37,10 +37,10 @@ clean: | |||
| # Make the library | |||
| $(LIB_DIR)/$(GLW_LIB_NAME): $(OBJECTS) | |||
| $(TOP)/$(LIB_DIR)/$(GLW_LIB_NAME): $(OBJECTS) | |||
| $(TOP)/bin/mklib -o $(GLW_LIB) -linker '$(CC)' \ | |||
| -major $(MAJOR) -minor $(MINOR) -patch $(TINY) \ | |||
| $(MKLIB_OPTIONS) -install $(LIB_DIR) \ | |||
| $(MKLIB_OPTIONS) -install $(TOP)/$(LIB_DIR) \ | |||
| $(GLW_LIB_DEPS) $(OBJECTS) | |||
+ 6
- 6
src/glx/mini/Makefile
View File
| @@ -46,16 +46,16 @@ INCLUDE_DIRS = \ | |||
| ##### TARGETS ##### | |||
| default: depend $(LIB_DIR)/$(GL_LIB_NAME) | |||
| default: depend $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) | |||
| # Make libGL | |||
| $(LIB_DIR)/$(GL_LIB_NAME): $(OBJECTS) Makefile | |||
| $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME): $(OBJECTS) Makefile | |||
| $(TOP)/bin/mklib -o $(GL_LIB) -linker '$(CC)' \ | |||
| -major 1 -minor 2 $(MKLIB_OPTIONS) \ | |||
| -install $(LIB_DIR) $(GL_LIB_DEPS) $(OBJECTS) `/usr/bin/pkg-config --libs libdrm` `/usr/bin/pkg-config --libs pciaccess` | |||
| rm -f $(LIB_DIR)/miniglx.conf | |||
| install example.miniglx.conf $(LIB_DIR)/miniglx.conf | |||
| -install $(TOP)/$(LIB_DIR) $(GL_LIB_DEPS) $(OBJECTS) `/usr/bin/pkg-config --libs libdrm` `/usr/bin/pkg-config --libs pciaccess` | |||
| rm -f $(TOP)/$(LIB_DIR)/miniglx.conf | |||
| install example.miniglx.conf $(TOP)/$(LIB_DIR)/miniglx.conf | |||
| drmtest: xf86drm.o drmtest.o | |||
| @@ -75,7 +75,7 @@ tags: | |||
| # Remove .o and backup files | |||
| clean: | |||
| -rm -f drmtest $(LIB_DIR)/libGL.so* | |||
| -rm -f drmtest $(TOP)/$(LIB_DIR)/libGL.so* | |||
| -rm -f *.o *~ | |||
| -rm -f depend | |||
+ 5
- 5
src/glx/x11/Makefile
View File
| @@ -2,7 +2,7 @@ TOP = ../../.. | |||
| include $(TOP)/configs/current | |||
| EXTRA_DEFINES = -DXF86VIDMODE -D_REENTRANT -UIN_DRI_DRIVER \ | |||
| -DDEFAULT_DRIVER_DIR=\"$(DRI_DRIVER_INSTALL_DIR)\" | |||
| -DDEFAULT_DRIVER_DIR=\"$(DRI_DRIVER_SEARCH_DIR)\" | |||
| SOURCES = \ | |||
| glcontextmodes.c \ | |||
| @@ -61,16 +61,16 @@ INCLUDES = -I. \ | |||
| ##### TARGETS ##### | |||
| default: depend $(LIB_DIR)/$(GL_LIB_NAME) | |||
| default: depend $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) | |||
| glcontextmodes.c: | |||
| ln -s $(TOP)/src/mesa/drivers/dri/common/glcontextmodes.c . | |||
| # Make libGL | |||
| $(LIB_DIR)/$(GL_LIB_NAME): $(OBJECTS) Makefile | |||
| $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME): $(OBJECTS) Makefile | |||
| $(TOP)/bin/mklib -o $(GL_LIB) -linker '$(CC)' \ | |||
| -major 1 -minor 2 $(MKLIB_OPTIONS) \ | |||
| -install $(LIB_DIR) $(GL_LIB_DEPS) $(OBJECTS) | |||
| -install $(TOP)/$(LIB_DIR) $(GL_LIB_DEPS) $(OBJECTS) | |||
| depend: $(SOURCES) $(MESA_GLAPI_SOURCES) $(MESA_ASM_API) Makefile | |||
| @@ -88,7 +88,7 @@ install: | |||
| # Remove .o and backup files | |||
| clean: | |||
| -rm -f $(LIB_DIR)/libGL.so* | |||
| -rm -f $(TOP)/$(LIB_DIR)/libGL.so* | |||
| -rm -f *.o *~ | |||
| -rm -f depend | |||
+ 10
- 10
src/mesa/Makefile
View File
| @@ -66,7 +66,7 @@ linux-solo: depend subdirs libmesa.a | |||
| libgl-core: $(CORE_OBJECTS) | |||
| @ $(TOP)/bin/mklib -o $(GL_LIB) -linker '$(CC)' \ | |||
| -major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \ | |||
| -install $(LIB_DIR) $(MKLIB_OPTIONS) $(CORE_OBJECTS) $(GL_LIB_DEPS) | |||
| -install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) $(CORE_OBJECTS) $(GL_LIB_DEPS) | |||
| directfb: depend subdirs libgl-core | |||
| cd drivers/directfb; $(MAKE) | |||
| @@ -96,30 +96,30 @@ OSMESA16_OBJECTS = \ | |||
| $(OSMESA_DRIVER_OBJECTS) | |||
| stand-alone: depend subdirs $(LIB_DIR)/$(GL_LIB_NAME) $(LIB_DIR)/$(OSMESA_LIB_NAME) | |||
| stand-alone: depend subdirs $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME) | |||
| osmesa-only: depend subdirs $(LIB_DIR)/$(OSMESA_LIB_NAME) | |||
| osmesa-only: depend subdirs $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME) | |||
| # Make the GL library | |||
| $(LIB_DIR)/$(GL_LIB_NAME): $(STAND_ALONE_OBJECTS) | |||
| $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME): $(STAND_ALONE_OBJECTS) | |||
| @ $(TOP)/bin/mklib -o $(GL_LIB) -linker '$(CC)' \ | |||
| -major $(GL_MAJOR) -minor $(GL_MINOR) -patch $(GL_TINY) \ | |||
| -install $(LIB_DIR) \ | |||
| -install $(TOP)/$(LIB_DIR) \ | |||
| $(MKLIB_OPTIONS) $(GL_LIB_DEPS) $(STAND_ALONE_OBJECTS) | |||
| # Make the OSMesa library | |||
| $(LIB_DIR)/$(OSMESA_LIB_NAME): $(OSMESA_DRIVER_OBJECTS) $(OSMESA16_OBJECTS) | |||
| $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME): $(OSMESA_DRIVER_OBJECTS) $(OSMESA16_OBJECTS) | |||
| @ if [ "${DRIVER_DIRS}" = "osmesa" ] ; then \ | |||
| $(TOP)/bin/mklib -o $(OSMESA_LIB) -linker '$(CC)' \ | |||
| -major $(MESA_MAJOR) \ | |||
| -minor $(MESA_MINOR) -patch $(MESA_TINY) \ | |||
| -install $(LIB_DIR) $(MKLIB_OPTIONS) \ | |||
| -install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \ | |||
| $(OSMESA_LIB_DEPS) $(OSMESA16_OBJECTS) ; \ | |||
| else \ | |||
| $(TOP)/bin/mklib -o $(OSMESA_LIB) -linker '$(CC)' \ | |||
| -major $(MESA_MAJOR) \ | |||
| -minor $(MESA_MINOR) -patch $(GL_TINY) \ | |||
| -install $(LIB_DIR) $(MKLIB_OPTIONS) \ | |||
| -install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \ | |||
| $(OSMESA_LIB_DEPS) $(OSMESA_DRIVER_OBJECTS) ; \ | |||
| fi | |||
| @@ -150,9 +150,9 @@ subdirs: | |||
| install: default | |||
| $(INSTALL) -d $(INSTALL_DIR)/include/GL | |||
| $(INSTALL) -d $(INSTALL_DIR)/lib | |||
| $(INSTALL) -d $(INSTALL_DIR)/$(LIB_DIR) | |||
| $(INSTALL) -m 644 $(TOP)/include/GL/*.h $(INSTALL_DIR)/include/GL | |||
| $(COPY_LIBS) $(LIB_DIR)/libGL.* $(INSTALL_DIR)/lib | |||
| $(COPY_LIBS) $(TOP)/$(LIB_DIR)/libGL.* $(INSTALL_DIR)/$(LIB_DIR) | |||
| @if [ "${DRIVER_DIRS}" = "dri" ] ; then \ | |||
| cd drivers/dri ; $(MAKE) install ; \ | |||
| fi | |||
+ 5
- 5
src/mesa/drivers/beos/Makefile
View File
| @@ -167,7 +167,7 @@ OBJECTS := $(DRIVER_OBJECTS:.cpp=.o) | |||
| $(CC) $(INCLUDES) $(CFLAGS) -c $< -o $@ | |||
| default: depend $(LIB_DIR) $(LIB_DIR)/$(GL_LIB_NAME) | |||
| default: depend $(TOP)/$(LIB_DIR) $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) | |||
| $(MESA_MODULES): | |||
| cd $(TOP)/src/mesa; $(MAKE) mesa.a ; | |||
| @@ -175,11 +175,11 @@ $(MESA_MODULES): | |||
| $(GLU_MODULES): | |||
| cd $(GLU_DIR); $(MAKE) $(subst $(GLU_DIR)/,,$(GLU_MODULES)) ; | |||
| $(LIB_DIR): | |||
| mkdir $(LIB_DIR) | |||
| $(TOP)/$(LIB_DIR): | |||
| mkdir $(TOP)/$(LIB_DIR) | |||
| $(LIB_DIR)/$(GL_LIB_NAME): $(OBJECTS) $(MESA_MODULES) $(GLU_MODULES) | |||
| @$(TOP)/bin/mklib -o $(GL_LIB) -install $(LIB_DIR) -major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \ | |||
| $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME): $(OBJECTS) $(MESA_MODULES) $(GLU_MODULES) | |||
| @$(TOP)/bin/mklib -o $(GL_LIB) -install $(TOP)/$(LIB_DIR) -major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \ | |||
| $(MKLIB_OPTIONS) $(GL_LIB_DEPS) $(OBJECTS) $(MESA_MODULES) $(GLU_MODULES) | |||
| # $(GLU_OBJECTS): | |||
+ 1
- 1
src/mesa/drivers/directfb/Makefile
View File
| @@ -34,7 +34,7 @@ default: directfbgl_mesa | |||
| # Mesa DirectFBGL module | |||
| directfbgl_mesa: $(DIRECTFBGL_MESA_OBJECTS) | |||
| $(CC) -shared $(CFLAGS) $(DIRECTFBGL_MESA_OBJECTS) -o $(DIRECTFBGL_MESA) \ | |||
| -Wl,-soname -Wl,$(DIRECTFBGL_MESA) -L$(LIB_DIR) -lGL -lm | |||
| -Wl,-soname -Wl,$(DIRECTFBGL_MESA) -L$(TOP)/$(LIB_DIR) -lGL -lm | |||
| install: | |||
+ 3
- 3
src/mesa/drivers/dri/Makefile
View File
| @@ -6,11 +6,11 @@ include $(TOP)/configs/current | |||
| default: $(LIB_DIR) subdirs | |||
| default: $(TOP)/$(LIB_DIR) subdirs | |||
| $(LIB_DIR): | |||
| -mkdir $(LIB_DIR) | |||
| $(TOP)/$(LIB_DIR): | |||
| -mkdir $(TOP)/$(LIB_DIR) | |||
| subdirs: | |||
+ 5
- 5
src/mesa/drivers/dri/Makefile.template
View File
| @@ -62,12 +62,12 @@ SHARED_INCLUDES = \ | |||
| ##### TARGETS ##### | |||
| default: depend symlinks $(LIBNAME) $(LIB_DIR)/$(LIBNAME) | |||
| default: depend symlinks $(LIBNAME) $(TOP)/$(LIB_DIR)/$(LIBNAME) | |||
| #$(LIB_DIR)/$(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile | |||
| #$(TOP)/$(LIB_DIR)/$(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile | |||
| # @echo BUILDING FOR: $(WINDOW_SYSTEM) | |||
| # $(TOP)/bin/mklib -o $(LIBNAME) -noprefix -install $(LIB_DIR) \ | |||
| # $(TOP)/bin/mklib -o $(LIBNAME) -noprefix -install $(TOP)/$(LIB_DIR) \ | |||
| # $(WINLIB) $(LIB_DEPS) $(WINOBJ) $(MESA_MODULES) $(OBJECTS) | |||
| $(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile $(TOP)/src/mesa/drivers/dri/Makefile.template | |||
| @@ -75,8 +75,8 @@ $(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile $(TOP)/src/mesa/driver | |||
| $(OBJECTS) $(MESA_MODULES) $(WINOBJ) $(DRI_LIB_DEPS) | |||
| $(LIB_DIR)/$(LIBNAME): $(LIBNAME) | |||
| $(INSTALL) $(LIBNAME) $(LIB_DIR) | |||
| $(TOP)/$(LIB_DIR)/$(LIBNAME): $(LIBNAME) | |||
| $(INSTALL) $(LIBNAME) $(TOP)/$(LIB_DIR) | |||
+ 3
- 3
src/mesa/drivers/dri/glcore/Makefile
View File
| @@ -57,11 +57,11 @@ OBJECTS = $(C_SOURCES:.c=.o) \ | |||
| ##### TARGETS ##### | |||
| default: depend $(LIB_DIR)/$(LIBNAME) | |||
| default: depend $(TOP)/$(LIB_DIR)/$(LIBNAME) | |||
| $(LIB_DIR)/$(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile | |||
| CC="$(CC)" CXX="$(CXX)" $(TOP)/bin/mklib -o $(LIBNAME) -noprefix -install $(LIB_DIR) \ | |||
| $(TOP)/$(LIB_DIR)/$(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile | |||
| CC="$(CC)" CXX="$(CXX)" $(TOP)/bin/mklib -o $(LIBNAME) -noprefix -install $(TOP)/$(LIB_DIR) \ | |||
| $(OBJECTS) $(WINLIB) $(LIB_DEPS) $(WINOBJ) $(MESA_MODULES) | |||
Loading…