From: Brian Paul Date: Thu, 13 Apr 2006 02:59:29 +0000 (+0000) Subject: new configs, misc updates (Dan Schikore) X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=cb32dcfa3390a8e379d134a9ca4e4717f45b0f7e;p=mesa.git new configs, misc updates (Dan Schikore) --- diff --git a/configs/aix b/configs/aix index fe8e48cd654..a509732876d 100644 --- a/configs/aix +++ b/configs/aix @@ -8,8 +8,8 @@ CONFIG_NAME = aix CC = cc CXX = xlC -CFLAGS = -O -DAIXV3 -CXXFLAGS = -O -DAIXV3 +CFLAGS = -O -DAIXV3 -DPTHREADS +CXXFLAGS = -O -DAIXV3 -DPTHREADS MKLIB_OPTIONS = # Library names (actual file names) @@ -19,10 +19,10 @@ GLUT_LIB_NAME = libglut.a GLW_LIB_NAME = libGLw.a OSMESA_LIB_NAME = libOSMesa.a -GL_LIB_DEPS = -lX11 -lXext -lm +GL_LIB_DEPS = -lX11 -lXext -lpthread -lm GLU_LIB_DEPS = -L$(TOP)/lib -l$(GL_LIB) -lm -lC GLUT_LIB_DEPS = -L$(TOP)/lib -l$(GLU_LIB) -l$(GL_LIB) -lXi -lXmu -lX11 -lm -GLW_LIB_DEPS = -L$(TOP)/lib -l$(GL_LIB) -lXt -lX11 +GLW_LIB_DEPS = -L$(TOP)/lib -l$(GL_LIB) -lXm -lXt -lX11 OSMESA_LIB_DEPS = -L$(TOP)/lib -l$(GL_LIB) -APP_LIB_DEPS = -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lXmu -lXi -lm -lC +APP_LIB_DEPS = -L$(TOP)/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lXmu -lXi -lpthread -lm -lC diff --git a/configs/aix-64 b/configs/aix-64 index 0d98475293c..723e5369232 100644 --- a/configs/aix-64 +++ b/configs/aix-64 @@ -8,9 +8,10 @@ CONFIG_NAME = aix-64 CC = xlc CXX = xlC -CFLAGS = -q64 -qmaxmem=16384 -O -DAIXV3 -CXXFLAGS = -q64 -qmaxmem=16384 -O -DAIXV3 +CFLAGS = -q64 -qmaxmem=16384 -O -DAIXV3 -DPTHREADS +CXXFLAGS = -q64 -qmaxmem=16384 -O -DAIXV3 -DPTHREADS MKLIB_OPTIONS = -arch AIX64 +LIB_DIR=$(TOP)/lib64 # Library names (actual file names) GL_LIB_NAME = libGL.a @@ -19,10 +20,9 @@ GLUT_LIB_NAME = libglut.a GLW_LIB_NAME = libGLw.a OSMESA_LIB_NAME = libOSMesa.a -GL_LIB_DEPS = -lX11 -lXext -lm -GLU_LIB_DEPS = -L$(TOP)/lib -l$(GL_LIB) -lm -lC -GLUT_LIB_DEPS = -L$(TOP)/lib -l$(GLU_LIB) -l$(GL_LIB) -lXi -lXmu -lX11 -lm -GLW_LIB_DEPS = -L$(TOP)/lib -l$(GL_LIB) -lXt -lX11 -OSMESA_LIB_DEPS = -L$(TOP)/lib -l$(GL_LIB) -APP_LIB_DEPS = -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lXmu -lXi -lm -lC +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 +APP_LIB_DEPS = -L$(TOP)/lib64 -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lXmu -lXi -lm -lpthread -lC diff --git a/configs/aix-64-static b/configs/aix-64-static new file mode 100644 index 00000000000..a4076c05ae2 --- /dev/null +++ b/configs/aix-64-static @@ -0,0 +1,25 @@ +# Configuration for AIX, static libs + +include $(TOP)/configs/default + +CONFIG_NAME = aix-64-static + +# Compiler and flags +CC = cc +CXX = xlC + +CFLAGS = -q64 -O -DAIXV3 -DPTHREADS +CXXFLAGS = -q64 -O -DAIXV3 -DPTHREADS +MKLIB_OPTIONS = -static -arch AIX64 +LIB_DIR=$(TOP)/lib64 + +# Library names (actual file names) +GL_LIB_NAME = libGL.a +GLU_LIB_NAME = libGLU.a +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) \ + -lX11 -lXext -lXmu -lXi -lm -lpthread -lC + diff --git a/configs/aix-static b/configs/aix-static index f6f086edb6a..323284201f2 100644 --- a/configs/aix-static +++ b/configs/aix-static @@ -8,8 +8,8 @@ CONFIG_NAME = aix-static CC = cc CXX = xlC -CFLAGS = -O -DAIXV3 -CXXFLAGS = -O -DAIXV3 +CFLAGS = -O -DAIXV3 -DPTHREADS +CXXFLAGS = -O -DAIXV3 -DPTHREADS MKLIB_OPTIONS = -static # Library names (actual file names) @@ -19,5 +19,7 @@ GLUT_LIB_NAME = libglut.a GLW_LIB_NAME = libGLw.a OSMESA_LIB_NAME = libOSMesa.a -APP_LIB_DEPS = -L$(LIB_DIR) -lX11 -lXext -lXmu -lXi -lm +APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) \ + -lX11 -lXext -lXmu -lXi -lm -lpthread -lC + diff --git a/configs/darwin b/configs/darwin index 5abd16448be..0c8a6ec47a7 100644 --- a/configs/darwin +++ b/configs/darwin @@ -5,13 +5,11 @@ include $(TOP)/configs/default CONFIG_NAME = darwin # Compiler and flags -CC = c++ -CXX = c++ +CC = cc +CXX = cc CFLAGS = -I/usr/X11R6/include -O3 -fPIC -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin CXXFLAGS = -I/usr/X11R6/include -O3 -fPIC -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin -MKLIB_OPTIONS = -cplusplus - # Library names (actual file names) GL_LIB_NAME = libGL.dylib GLU_LIB_NAME = libGLU.dylib diff --git a/configs/darwin-static b/configs/darwin-static index c7f9c5f06be..3eb6581fb02 100644 --- a/configs/darwin-static +++ b/configs/darwin-static @@ -16,9 +16,9 @@ GLUT_LIB_NAME = libglut.a GLW_LIB_NAME = libGLw.a OSMESA_LIB_NAME = libOSMesa.a -GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread +GL_LIB_DEPS = OSMESA_LIB_DEPS = GLU_LIB_DEPS = GLUT_LIB_DEPS = GLW_LIB_DEPS = -APP_LIB_DEPS = -L$(TOP)/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm +APP_LIB_DEPS = -Wl,-search_paths_first -L$(TOP)/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lstdc++ -lgcc_s.1 -lm diff --git a/configs/darwin-static-x86ppc b/configs/darwin-static-x86ppc new file mode 100644 index 00000000000..79415a3a375 --- /dev/null +++ b/configs/darwin-static-x86ppc @@ -0,0 +1,26 @@ +# Configuration for Darwin / MacOS X, making static libs + +include $(TOP)/configs/darwin + +CONFIG_NAME = darwin-static + +# Compiler and flags +CFLAGS = -arch ppc -arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk \ + -I/usr/X11R6/include -O3 -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin +CXXFLAGS = -arch ppc -arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk \ + -I/usr/X11R6/include -O3 -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin +MKLIB_OPTIONS = -static -archopt "-arch ppc -arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk" + +# Library names (actual file names) +GL_LIB_NAME = libGL.a +GLU_LIB_NAME = libGLU.a +GLUT_LIB_NAME = libglut.a +GLW_LIB_NAME = libGLw.a +OSMESA_LIB_NAME = libOSMesa.a + +GL_LIB_DEPS = +OSMESA_LIB_DEPS = +GLU_LIB_DEPS = +GLUT_LIB_DEPS = +GLW_LIB_DEPS = +APP_LIB_DEPS = -Wl,-search_paths_first -L$(TOP)/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lstdc++ -lgcc_s.1 -lm diff --git a/configs/darwin-x86ppc b/configs/darwin-x86ppc new file mode 100644 index 00000000000..b8b5acc4ef0 --- /dev/null +++ b/configs/darwin-x86ppc @@ -0,0 +1,33 @@ +# Configuration for Darwin / MacOS X, making dynamic libs + +include $(TOP)/configs/default + +CONFIG_NAME = darwin + +# Compiler and flags +CC = cc +CXX = cc +CFLAGS = -arch ppc -arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk \ + -I/usr/X11R6/include -O3 -fPIC -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin +CXXFLAGS = -arch ppc -arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk \ + -I/usr/X11R6/include -O3 -fPIC -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin + +MKLIB_OPTIONS = -archopt "-arch ppc -arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk" + +# Library names (actual file names) +GL_LIB_NAME = libGL.dylib +GLU_LIB_NAME = libGLU.dylib +GLUT_LIB_NAME = libglut.dylib +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 +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 + +# omit glw lib for now: +SRC_DIRS = mesa glu glut/glx + diff --git a/configs/hpux11-32 b/configs/hpux11-32 index 9ff407bd53e..59cc0918b27 100644 --- a/configs/hpux11-32 +++ b/configs/hpux11-32 @@ -10,7 +10,7 @@ CXX = aCC CFLAGS = +z -Ae +O2 +Onolimit +Oaggressive -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM -DPTHREADS -CXXFLAGS = +z -Aa +O2 +Onolimit +Oaggressive -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include +CXXFLAGS = +z -Aa +O2 +Onolimit +Oaggressive -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DPTHREADS MKLIB_OPTIONS = @@ -23,4 +23,8 @@ GLW_LIB_NAME = libGLw.a OSMESA_LIB_NAME = libOSMesa.a # Library/program dependencies -APP_LIB_DEPS = -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm +APP_LIB_DEPS = -L$(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) diff --git a/configs/hpux11-32-static b/configs/hpux11-32-static index 7507ab0b0b5..7dc7608e5f8 100644 --- a/configs/hpux11-32-static +++ b/configs/hpux11-32-static @@ -8,9 +8,9 @@ CONFIG_NAME = hpux11-32-static CC = cc CXX = aCC -CFLAGS = +O3 +DA2.0 -Aa -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM -DPTHREADS +CFLAGS = +O3 +DA2.0 -Ae -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM -DPTHREADS -CXXFLAGS = +O3 +DA2.0 -Aa -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include +CXXFLAGS = +O3 +DA2.0 -Aa -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DPTHREADS MKLIB_OPTIONS = -static @@ -23,4 +23,5 @@ GLW_LIB_NAME = libGLw.a OSMESA_LIB_NAME = libOSMesa.a # Library/program dependencies -APP_LIB_DEPS = -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm +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 + diff --git a/configs/hpux11-64 b/configs/hpux11-64 index b0869cf81df..8b28f261c99 100644 --- a/configs/hpux11-64 +++ b/configs/hpux11-64 @@ -10,11 +10,11 @@ CXX = aCC CFLAGS = +z -Ae +DD64 +O2 +Onolimit +Oaggressive -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM -DPTHREADS -CXXFLAGS = +z -Aa +DD64 +O2 +Onolimit +Oaggressive -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include +CXXFLAGS = +z -Aa +DD64 +O2 +Onolimit +Oaggressive -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DPTHREADS MKLIB_OPTIONS = -LIBDIR = $(TOP)/lib64 +LIB_DIR = $(TOP)/lib64 # Library names (actual file names) GL_LIB_NAME = libGL.a @@ -24,4 +24,8 @@ GLW_LIB_NAME = libGLw.a OSMESA_LIB_NAME = libOSMesa.a # Library/program dependencies -APP_LIB_DEPS = -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm +APP_LIB_DEPS = -L$(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) diff --git a/configs/hpux11-64-static b/configs/hpux11-64-static index 451dc4208e4..e2b23ce8ae4 100644 --- a/configs/hpux11-64-static +++ b/configs/hpux11-64-static @@ -8,13 +8,13 @@ CONFIG_NAME = hpux11-64-static CC = cc CXX = aCC -CFLAGS = +O3 +DA2.0W -Aa -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM -DPTHREADS +CFLAGS = +O3 +DA2.0W -Ae -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM -DPTHREADS -CXXFLAGS = +O3 +DA2.0W -Aa -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include +CXXFLAGS = +O3 +DA2.0W -Aa -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DPTHREADS MKLIB_OPTIONS = -static -LIBDIR = $(TOP)/lib64 +LIB_DIR = $(TOP)/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/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm +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 diff --git a/configs/hpux11-ia64 b/configs/hpux11-ia64 new file mode 100644 index 00000000000..dc1291b8b5d --- /dev/null +++ b/configs/hpux11-ia64 @@ -0,0 +1,30 @@ +# Configuration for HPUX IA64 v11, 64-bit + +include $(TOP)/configs/default + +CONFIG_NAME = hpux11-ia64 + +# Compiler and flags +CC = cc +CXX = aCC + +CFLAGS = +z -Ae +DD64 +O3 +DSmckinley -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM -DPTHREADS + +CXXFLAGS = +z -Aa +DD64 +O3 +DSmckinley -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DPTHREADS + +MKLIB_OPTIONS = + +LIB_DIR = $(TOP)/lib64 + +# Library names (actual file names) +GL_LIB_NAME = libGL.so +GLU_LIB_NAME = libGLU.so +GLUT_LIB_NAME = libglut.so +GLW_LIB_NAME = libGLw.so +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) diff --git a/configs/hpux11-ia64-static b/configs/hpux11-ia64-static new file mode 100644 index 00000000000..407aa9630ca --- /dev/null +++ b/configs/hpux11-ia64-static @@ -0,0 +1,27 @@ +# Configuration for HPUX v11, 64-bit, static libs + +include $(TOP)/configs/default + +CONFIG_NAME = hpux11-ia64-static + +# Compiler and flags +CC = cc +CXX = aCC + +CFLAGS = +O3 +DD64 -Aa -D_HPUX_SOURCE +DSmckinley -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM -DPTHREADS + +CXXFLAGS = +O3 +DD64 -Aa -D_HPUX_SOURCE +DSmckinley -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DPTHREADS + +MKLIB_OPTIONS = -static + +LIB_DIR = $(TOP)/lib64 + +# Library names (actual file names) +GL_LIB_NAME = libGL.a +GLU_LIB_NAME = libGLU.a +GLUT_LIB_NAME = libglut.a +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 diff --git a/configs/irix6-64 b/configs/irix6-64 index 6c33d33ba92..df2d1426a47 100644 --- a/configs/irix6-64 +++ b/configs/irix6-64 @@ -7,12 +7,12 @@ CONFIG_NAME = irix6-64 # Compiler and flags CC = cc CXX = CC -CFLAGS = -64 -O3 -ansi -woff 1068,1069,1174,1185,1209,1474,1552 -DUSE_XSHM -CXXFLAGS = -64 -O3 -ansi -woff 1174 +CFLAGS = -64 -O3 -ansi -woff 1068,1069,1174,1185,1209,1474,1552 -DUSE_XSHM -DPTHREADS +CXXFLAGS = -64 -O3 -ansi -woff 1174 -DPTHREADS MKLIB_OPTIONS = -archopt 64 GLW_SOURCES = GLwDrawA.c GLwMDrawA.c LIB_DIR = $(TOP)/lib64 -APP_LIB_DEPS = -L$(LIB_DIR) -64 -rpath $(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXmu -lXi -lm +APP_LIB_DEPS = -L$(LIB_DIR) -64 -rpath $(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXmu -lXi -lpthread -lm diff --git a/configs/irix6-64-static b/configs/irix6-64-static index d66af5be878..e3d78558c9e 100644 --- a/configs/irix6-64-static +++ b/configs/irix6-64-static @@ -7,15 +7,15 @@ CONFIG_NAME = irix6-64-static # Compiler and flags CC = cc CXX = CC -CFLAGS = -64 -O3 -ansi -woff 1068,1069,1174,1185,1209,1474,1552 -DUSE_XSHM -CXXFLAGS = -64 -O3 -ansi -woff 1174 +CFLAGS = -64 -O3 -ansi -woff 1068,1069,1174,1185,1209,1474,1552 -DUSE_XSHM -DPTHREADS +CXXFLAGS = -64 -O3 -ansi -woff 1174 -DPTHREADS MKLIB_OPTIONS = -archopt 64 -static GLW_SOURCES = GLwDrawA.c GLwMDrawA.c LIB_DIR = $(TOP)/lib64 -APP_LIB_DEPS = -L$(LIB_DIR) -64 -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lXmu -lXi -lm +APP_LIB_DEPS = -L$(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 @@ -23,3 +23,4 @@ GLUT_LIB_NAME = libglut.a GLW_LIB_NAME = libGLw.a OSMESA_LIB_NAME = libOSMesa.a + diff --git a/configs/irix6-n32 b/configs/irix6-n32 index 4bf2964014f..32def6a0a20 100644 --- a/configs/irix6-n32 +++ b/configs/irix6-n32 @@ -7,12 +7,12 @@ CONFIG_NAME = irix6-n32 # Compiler and flags CC = cc CXX = CC -CFLAGS = -n32 -mips3 -O3 -ansi -woff 1174,1521,1552 -DUSE_XSHM -CXXFLAGS = -n32 -mips3 -O3 -ansi -woff 1174,1552 +CFLAGS = -n32 -mips3 -O3 -ansi -woff 1174,1521,1552 -DUSE_XSHM -DPTHREADS +CXXFLAGS = -n32 -mips3 -O3 -ansi -woff 1174,1552 -DPTHREADS MKLIB_OPTIONS = -archopt n32 GLW_SOURCES = GLwDrawA.c GLwMDrawA.c LIB_DIR = $(TOP)/lib32 -APP_LIB_DEPS = -L$(LIB_DIR) -n32 -rpath $(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXmu -lXi -lfpe -lm +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 diff --git a/configs/irix6-n32-static b/configs/irix6-n32-static index b60de380c62..0458590f0dc 100644 --- a/configs/irix6-n32-static +++ b/configs/irix6-n32-static @@ -7,15 +7,15 @@ CONFIG_NAME = irix6-n32-static # Compiler and flags CC = cc CXX = CC -CFLAGS = -n32 -mips2 -O2 -ansi -woff 1521,1552 -DUSE_XSHM -CXXFLAGS = -n32 -mips2 -O2 -ansi -woff 3262,3666 +CFLAGS = -n32 -mips2 -O2 -ansi -woff 1521,1552 -DUSE_XSHM -DPTHREADS +CXXFLAGS = -n32 -mips2 -O2 -ansi -woff 3262,3666 -DPTHREADS MKLIB_OPTIONS = -archopt n32 -static GLW_SOURCES = GLwDrawA.c GLwMDrawA.c LIB_DIR = $(TOP)/lib32 -APP_LIB_DEPS = -L$(LIB_DIR) -n32 -glut -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lXmu -lXi -lm +APP_LIB_DEPS = -L$(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 diff --git a/configs/irix6-o32-static b/configs/irix6-o32-static index ac3d6ee17a6..ec51b9cdc5a 100644 --- a/configs/irix6-o32-static +++ b/configs/irix6-o32-static @@ -15,7 +15,7 @@ GLW_SOURCES = GLwDrawA.c GLwMDrawA.c LIB_DIR = $(TOP)/lib32 -APP_LIB_DEPS = -L$(LIB_DIR) -32 -glut -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lXmu -lXi -lm +APP_LIB_DEPS = -L$(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 diff --git a/configs/linux-ia64-icc b/configs/linux-ia64-icc new file mode 100644 index 00000000000..4eeb1783406 --- /dev/null +++ b/configs/linux-ia64-icc @@ -0,0 +1,21 @@ +# Configuration for Linux with Intel C compiler + +include $(TOP)/configs/default + +CONFIG_NAME = linux-icc + +# Compiler and flags +CC = icc +CXX = icpc +CFLAGS = -O3 -ansi -KPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include +CXXFLAGS = -O3 -ansi -KPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include +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) + + diff --git a/configs/linux-ia64-icc-static b/configs/linux-ia64-icc-static new file mode 100644 index 00000000000..981ad5a53de --- /dev/null +++ b/configs/linux-ia64-icc-static @@ -0,0 +1,27 @@ +# Configuration for Linux with Intel C compiler, static libs + +include $(TOP)/configs/default + +CONFIG_NAME = linux-icc-static + +# Compiler and flags +CC = icc +CXX = icpc +CFLAGS = -O3 -ansi -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include +CXXFLAGS = -O3 -ansi -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include +GLUT_CFLAGS = -fexceptions +MKLIB_OPTIONS = -static -arch icc-istatic + +# Library names (actual file names) +GL_LIB_NAME = libGL.a +GLU_LIB_NAME = libGLU.a +GLUT_LIB_NAME = libglut.a +GLW_LIB_NAME = libGLw.a +OSMESA_LIB_NAME = libOSMesa.a + +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 + diff --git a/configs/linux-x86-static b/configs/linux-x86-static index d4ccfca803e..c838a84012e 100644 --- a/configs/linux-x86-static +++ b/configs/linux-x86-static @@ -19,3 +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) \ + $(EXTRA_LIB_PATH) -lX11 -lXmu -lXt -lXi -lpthread -lstdc++ -lm diff --git a/configs/osf1 b/configs/osf1 index bc88c204221..2d8d72fb994 100644 --- a/configs/osf1 +++ b/configs/osf1 @@ -7,10 +7,10 @@ CONFIG_NAME = osf1 # Compiler and flags CC = cc CXX = cxx -CFLAGS = -O0 -std1 -ieee_with_no_inexact -DUSE_XSHM -CXXFLAGS = -O2 -std ansi -ieee +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 -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 diff --git a/configs/osf1-static b/configs/osf1-static new file mode 100644 index 00000000000..974718d400f --- /dev/null +++ b/configs/osf1-static @@ -0,0 +1,17 @@ +# Configuration for OSF/1 + +include $(TOP)/configs/default + +CONFIG_NAME = osf1 + +# Compiler and flags +CC = cc +CXX = cxx +CFLAGS = -O2 -std1 -ieee_with_no_inexact -DUSE_XSHM -DPTHREADS -D_REENTRANT +CXXFLAGS = -O2 -std ansi -ieee -DPTHREADS -D_REENTRANT +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 diff --git a/configs/sunos5-v8 b/configs/sunos5-v8 new file mode 100644 index 00000000000..cae109b58d1 --- /dev/null +++ b/configs/sunos5-v8 @@ -0,0 +1,18 @@ +# Configuration for SunOS 5 + +include $(TOP)/configs/default + +CONFIG_NAME = sunos5-v8 + +# Compiler and flags +CC = cc +CXX = CC +CFLAGS = -xarch=v8 -KPIC -O -I/usr/openwin/include -I/usr/dt/include -DUSE_XSHM -DPTHREADS +CXXFLAGS = -xarch=v8 -KPIC -O -I/usr/openwin/include -I/usr/dt/include -DPTHREADS +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 diff --git a/configs/sunos5-v8-static b/configs/sunos5-v8-static new file mode 100644 index 00000000000..3b9fcee7d7f --- /dev/null +++ b/configs/sunos5-v8-static @@ -0,0 +1,16 @@ +# Configuration for SunOS 5 + +include $(TOP)/configs/default + +CONFIG_NAME = sunos5-v8-static + +MKLIB_OPTIONS = -static + +# Compiler and flags +CC = cc +CXX = CC +CFLAGS = -xarch=v8 -KPIC -O -I/usr/openwin/include -I/usr/dt/include -DUSE_XSHM -DPTHREADS +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 diff --git a/configs/sunos5-v9 b/configs/sunos5-v9 new file mode 100644 index 00000000000..68a746cb877 --- /dev/null +++ b/configs/sunos5-v9 @@ -0,0 +1,23 @@ +# Configuration for SunOS 5 + +include $(TOP)/configs/default + +CONFIG_NAME = sunos5-v9 + +MKLIB_OPTIONS = -archopt SUNV9 -cplusplus + +LIB_DIR = $(TOP)/lib64 + +# Compiler and flags +CC = cc +CXX = CC +CFLAGS = -xarch=v9 -KPIC -O -I/usr/openwin/include -I/usr/dt/include -DUSE_XSHM -DPTHREADS +CXXFLAGS = -xarch=v9 -KPIC -O -I/usr/openwin/include -I/usr/dt/include -DPTHREADS +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 + diff --git a/configs/sunos5-v9-static b/configs/sunos5-v9-static new file mode 100644 index 00000000000..264b23cd6d4 --- /dev/null +++ b/configs/sunos5-v9-static @@ -0,0 +1,18 @@ +# Configuration for SunOS 5 + +include $(TOP)/configs/default + +CONFIG_NAME = sunos5-v9-static + +MKLIB_OPTIONS = -static -cplusplus + +LIB_DIR = $(TOP)/lib64 + +# Compiler and flags +CC = cc +CXX = CC +CFLAGS = -xarch=v9 -KPIC -O -I/usr/openwin/include -I/usr/dt/include -DUSE_XSHM -DPTHREADS +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