It's not used anywhere that I can see. Signed-off-by: Matt Turner <matts...@gmail.com> --- configs/aix | 2 +- configs/aix-64 | 2 +- configs/aix-64-static | 2 +- configs/aix-gcc | 2 +- configs/aix-static | 2 +- configs/darwin | 2 +- configs/freebsd | 2 +- configs/hpux10 | 2 +- configs/hpux10-gcc | 2 +- configs/hpux10-static | 4 ++-- configs/hpux11-32 | 2 +- configs/hpux11-32-static | 2 +- configs/hpux11-32-static-nothreads | 2 +- configs/hpux11-64 | 2 +- configs/hpux11-64-static | 2 +- configs/hpux11-ia64 | 2 +- configs/hpux11-ia64-static | 2 +- configs/hpux9 | 2 +- configs/hpux9-gcc | 2 +- configs/irix6-64 | 2 +- configs/irix6-64-static | 2 +- configs/irix6-n32 | 2 +- configs/irix6-n32-static | 2 +- configs/irix6-o32 | 2 +- configs/irix6-o32-static | 2 +- configs/linux-ia64-icc-static | 2 +- configs/linux-icc-static | 2 +- configs/linux-osmesa-static | 2 +- configs/linux-static | 2 +- configs/linux-x86-64-static | 2 +- configs/linux-x86-static | 2 +- configs/netbsd | 2 +- configs/osf1 | 2 +- configs/osf1-static | 2 +- configs/solaris-x86 | 2 +- configs/solaris-x86-gcc | 2 +- configs/solaris-x86-gcc-static | 2 +- configs/sunos4 | 2 +- configs/sunos4-gcc | 2 +- configs/sunos4-static | 2 +- configs/sunos5 | 2 +- configs/sunos5-gcc | 2 +- configs/sunos5-smp | 2 +- configs/sunos5-v8 | 2 +- configs/sunos5-v8-static | 2 +- configs/sunos5-v9 | 2 +- configs/sunos5-v9-cc-g++ | 2 +- configs/sunos5-v9-static | 2 +- configs/ultrix-gcc | 2 +- 49 files changed, 50 insertions(+), 50 deletions(-)
diff --git a/configs/aix b/configs/aix index b3c0756..b9578b2 100644 --- a/configs/aix +++ b/configs/aix @@ -24,5 +24,5 @@ GL_LIB_DEPS = -lX11 -lXext -lpthread -lm GLU_LIB_DEPS = -L$(TOP)/lib -l$(GL_LIB) -lm -lC 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$(TOP)/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lXi -lpthread -lm -lC +APP_LIB_DEPS = -L$(TOP)/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lpthread -lm -lC diff --git a/configs/aix-64 b/configs/aix-64 index f59147b..2b2f28d 100644 --- a/configs/aix-64 +++ b/configs/aix-64 @@ -21,5 +21,5 @@ OSMESA_LIB_NAME = libOSMesa.a GL_LIB_DEPS = -lX11 -lXext -lm -lpthread GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm -lC 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 -lXi -lm -lpthread -lC +APP_LIB_DEPS = -L$(TOP)/lib64 -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lm -lpthread -lC diff --git a/configs/aix-64-static b/configs/aix-64-static index f162d6b..90731a7 100644 --- a/configs/aix-64-static +++ b/configs/aix-64-static @@ -20,5 +20,5 @@ GLW_LIB_NAME = libGLw.a OSMESA_LIB_NAME = libOSMesa.a APP_LIB_DEPS = -q64 -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) \ - -lX11 -lXext -lXi -lm -lpthread -lC + -lX11 -lXext -lm -lpthread -lC diff --git a/configs/aix-gcc b/configs/aix-gcc index 310491b..7ceee31 100644 --- a/configs/aix-gcc +++ b/configs/aix-gcc @@ -18,5 +18,5 @@ CXXFLAGS += -fno-strict-aliasing MKLIB_OPTIONS = -arch aix-gcc GL_LIB_DEPS = -lX11 -lXext -lm GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm -APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -Wl,-brtl -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm -lX11 -lXext -lXi +APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -Wl,-brtl -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm -lX11 -lXext diff --git a/configs/aix-static b/configs/aix-static index a7adda2..e02db54 100644 --- a/configs/aix-static +++ b/configs/aix-static @@ -19,6 +19,6 @@ GLW_LIB_NAME = libGLw.a OSMESA_LIB_NAME = libOSMesa.a APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) \ - -lX11 -lXext -lXi -lm -lpthread -lC + -lX11 -lXext -lm -lpthread -lC diff --git a/configs/darwin b/configs/darwin index e5f159a..1dbb8a7 100644 --- a/configs/darwin +++ b/configs/darwin @@ -48,7 +48,7 @@ GL_LIB_DEPS = -L$(INSTALL_DIR)/$(LIB_DIR) -L$(X11_DIR)/$(LIB_DIR) -lX11 -lXext - OSMESA_LIB_DEPS = GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L$(INSTALL_DIR)/$(LIB_DIR) -L$(X11_DIR)/$(LIB_DIR) -lX11 -lXt -APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L$(INSTALL_DIR)/$(LIB_DIR) -L$(X11_DIR)/$(LIB_DIR) -lX11 -lXt -lXi -lm +APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L$(INSTALL_DIR)/$(LIB_DIR) -L$(X11_DIR)/$(LIB_DIR) -lX11 -lXt -lm SRC_DIRS = glsl mapi/glapi mapi/vgapi glx/apple mesa gallium glu GLU_DIRS = sgi diff --git a/configs/freebsd b/configs/freebsd index 49e6dcc..ecc7319 100644 --- a/configs/freebsd +++ b/configs/freebsd @@ -27,4 +27,4 @@ CFLAGS += -fno-strict-aliasing CXXFLAGS += -fno-strict-aliasing EXTRA_LIB_PATH = -L/usr/local/lib -APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) $(EXTRA_LIB_PATH) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lXext -lXi -lX11 -lm +APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) $(EXTRA_LIB_PATH) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lXext -lX11 -lm diff --git a/configs/hpux10 b/configs/hpux10 index 503123e..352cc32 100644 --- a/configs/hpux10 +++ b/configs/hpux10 @@ -11,4 +11,4 @@ CXX = aCC CFLAGS = -O +DAportable +z -Ae -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM CXXFLAGS = -O +DAportable +Z -Ae -D_HPUX_SOURCE -APP_LIB_DEPS = -$(TOP)/$(LIB_DIR) -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXi -lX11 -lm +APP_LIB_DEPS = -$(TOP)/$(LIB_DIR) -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lX11 -lm diff --git a/configs/hpux10-gcc b/configs/hpux10-gcc index 3e5055b..a8696d4 100644 --- a/configs/hpux10-gcc +++ b/configs/hpux10-gcc @@ -15,5 +15,5 @@ CXXFLAGS = -ansi -O3 -D_HPUX_SOURCE CFLAGS += -fno-strict-aliasing CXXFLAGS += -fno-strict-aliasing -APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXi -lX11 -lm +APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lX11 -lm diff --git a/configs/hpux10-static b/configs/hpux10-static index 6ac315b..7694300 100644 --- a/configs/hpux10-static +++ b/configs/hpux10-static @@ -24,5 +24,5 @@ GL_LIB_DEPS = OSMESA_LIB_DEPS = GLU_LIB_DEPS = GLW_LIB_DEPS = -APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXext -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 -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 -lXt -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 -lX11 -lm -lstdc++ diff --git a/configs/hpux11-32 b/configs/hpux11-32 index d783ae0..59fc7b8 100644 --- a/configs/hpux11-32 +++ b/configs/hpux11-32 @@ -23,6 +23,6 @@ OSMESA_LIB_NAME = libOSMesa.a # Library/program dependencies 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 +GL_LIB_DEPS = -L/usr/lib/X11R6/ -L/usr/contrib/X11R6/lib/ -lXext -lXt -lX11 -lm -lpthread GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm -lCsup -lcl GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(GL_LIB_DEPS) diff --git a/configs/hpux11-32-static b/configs/hpux11-32-static index ffe757f..0a8b841 100644 --- a/configs/hpux11-32-static +++ b/configs/hpux11-32-static @@ -22,5 +22,5 @@ GLW_LIB_NAME = libGLw.a OSMESA_LIB_NAME = libOSMesa.a # Library/program dependencies -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 -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 -lXt -lX11 -lm -lpthread -lCsup -lcl diff --git a/configs/hpux11-32-static-nothreads b/configs/hpux11-32-static-nothreads index 7117a6c..84a30f0 100644 --- a/configs/hpux11-32-static-nothreads +++ b/configs/hpux11-32-static-nothreads @@ -22,4 +22,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 -lXi -lX11 -lm +APP_LIB_DEPS = -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lX11 -lm diff --git a/configs/hpux11-64 b/configs/hpux11-64 index e55f795..beab1c8 100644 --- a/configs/hpux11-64 +++ b/configs/hpux11-64 @@ -24,6 +24,6 @@ OSMESA_LIB_NAME = libOSMesa.a # Library/program dependencies 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 -lXt -lXi -lX11 -lm -lpthread +GL_LIB_DEPS = -L/usr/lib/X11R6/pa20_64 -L/usr/contrib/X11R6/lib/pa20_64 -lXext -lXt -lX11 -lm -lpthread GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm -lCsup -lcl GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(GL_LIB_DEPS) diff --git a/configs/hpux11-64-static b/configs/hpux11-64-static index 572bf75..da45d00 100644 --- a/configs/hpux11-64-static +++ b/configs/hpux11-64-static @@ -23,4 +23,4 @@ GLW_LIB_NAME = libGLw.a OSMESA_LIB_NAME = libOSMesa.a # Library/program dependencies -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 -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 -lXt -lX11 -lm -lpthread -lCsup -lcl diff --git a/configs/hpux11-ia64 b/configs/hpux11-ia64 index ddf4523..b229734 100644 --- a/configs/hpux11-ia64 +++ b/configs/hpux11-ia64 @@ -23,6 +23,6 @@ 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 -lXt -lXi -lX11 -lm -lpthread +GL_LIB_DEPS = -L/usr/lib/X11R6/ -L/usr/contrib/X11R6/lib/ -lXext -lXt -lX11 -lm -lpthread GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm -lCsup -lcl GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(GL_LIB_DEPS) diff --git a/configs/hpux11-ia64-static b/configs/hpux11-ia64-static index 4a87e3e..828e1b4 100644 --- a/configs/hpux11-ia64-static +++ b/configs/hpux11-ia64-static @@ -23,4 +23,4 @@ GLW_LIB_NAME = libGLw.a OSMESA_LIB_NAME = libOSMesa.a # Library/program dependencies -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 -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 -lXt -lX11 -lpthread -lm -lCsup -lcl diff --git a/configs/hpux9 b/configs/hpux9 index bb32d49..5af7439 100644 --- a/configs/hpux9 +++ b/configs/hpux9 @@ -12,5 +12,5 @@ CXX = c++ CFLAGS = +z -O +Olibcalls +ESlit -Ae +Onolimit -D_HPUX_SOURCE -I/usr/include/X11R5 -DUSE_XSHM CXXFLAGS = +z -O +Olibcalls +ESlit -Ae +Onolimit -D_HPUX_SOURCE -I/usr/include/X11R5 -APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/lib/X11R5 -s -Wl,+s,-B,nonfatal,-B,immediate -lXext -lXi -lX11 -lm +APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/lib/X11R5 -s -Wl,+s,-B,nonfatal,-B,immediate -lXext -lX11 -lm diff --git a/configs/hpux9-gcc b/configs/hpux9-gcc index 6fc2e17..2473d0a 100644 --- a/configs/hpux9-gcc +++ b/configs/hpux9-gcc @@ -11,4 +11,4 @@ CXX = aCC CFLAGS = -O +DAportable +z -Ae -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM CXXFLAGS = -O +DAportable +Z -Ae -D_HPUX_SOURCE -APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXi -lX11 -lm +APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lX11 -lm diff --git a/configs/irix6-64 b/configs/irix6-64 index 305dbf9..6ee7a2a 100644 --- a/configs/irix6-64 +++ b/configs/irix6-64 @@ -14,4 +14,4 @@ GLW_SOURCES = GLwDrawA.c GLwMDrawA.c LIB_DIR = lib64 -APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -64 -rpath $(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -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 -lpthread -lm diff --git a/configs/irix6-64-static b/configs/irix6-64-static index 1e9aa9b..f7769c3 100644 --- a/configs/irix6-64-static +++ b/configs/irix6-64-static @@ -15,7 +15,7 @@ GLW_SOURCES = GLwDrawA.c GLwMDrawA.c LIB_DIR = lib64 -APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -64 -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lXi -lpthread -lm -lC +APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -64 -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lpthread -lm -lC GL_LIB_NAME = libGL.a GLU_LIB_NAME = libGLU.a diff --git a/configs/irix6-n32 b/configs/irix6-n32 index e0fcceb..87a3efa 100644 --- a/configs/irix6-n32 +++ b/configs/irix6-n32 @@ -14,4 +14,4 @@ GLW_SOURCES = GLwDrawA.c GLwMDrawA.c LIB_DIR = lib32 -APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -n32 -rpath $(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -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 -lfpe -lpthread -lm diff --git a/configs/irix6-n32-static b/configs/irix6-n32-static index 596d319..76a8d7c 100644 --- a/configs/irix6-n32-static +++ b/configs/irix6-n32-static @@ -15,7 +15,7 @@ GLW_SOURCES = GLwDrawA.c GLwMDrawA.c LIB_DIR = lib32 -APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -n32 -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lXi -lpthread -lm -lC +APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -n32 -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lpthread -lm -lC GL_LIB_NAME = libGL.a GLU_LIB_NAME = libGLU.a diff --git a/configs/irix6-o32 b/configs/irix6-o32 index 9e28699..007f9c2 100644 --- a/configs/irix6-o32 +++ b/configs/irix6-o32 @@ -14,5 +14,5 @@ GLW_SOURCES = GLwDrawA.c GLwMDrawA.c LIB_DIR = lib32 -APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -32 -rpath $(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -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 -lm diff --git a/configs/irix6-o32-static b/configs/irix6-o32-static index 19d50e0..ab42575 100644 --- a/configs/irix6-o32-static +++ b/configs/irix6-o32-static @@ -15,7 +15,7 @@ GLW_SOURCES = GLwDrawA.c GLwMDrawA.c LIB_DIR = lib32 -APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -32 -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lXi -lm -lC +APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -32 -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lm -lC GL_LIB_NAME = libGL.a GLU_LIB_NAME = libGLU.a diff --git a/configs/linux-ia64-icc-static b/configs/linux-ia64-icc-static index 866d943..abd3aca 100644 --- a/configs/linux-ia64-icc-static +++ b/configs/linux-ia64-icc-static @@ -20,5 +20,5 @@ OSMESA_LIB_NAME = libOSMesa.a GL_LIB_DEPS = GLU_LIB_DEPS = GLW_LIB_DEPS = -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 -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 -lXt -lpthread -lm -lcxa -lunwind diff --git a/configs/linux-icc-static b/configs/linux-icc-static index b24d966..4c82a68 100644 --- a/configs/linux-icc-static +++ b/configs/linux-icc-static @@ -18,7 +18,7 @@ GLW_LIB_NAME = libGLw.a OSMESA_LIB_NAME = libOSMesa.a GL_LIB_DEPS = -APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -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 -lXt -lm -lpthread -lcxa -lunwind MESA_ASM_SOURCES = $(X86_SOURCES) GLAPI_ASM_SOURCES = $(X86_API) diff --git a/configs/linux-osmesa-static b/configs/linux-osmesa-static index 3f15968..7de1cf0 100644 --- a/configs/linux-osmesa-static +++ b/configs/linux-osmesa-static @@ -31,4 +31,4 @@ OSMESA_LIB_DEPS = GLU_LIB_DEPS = GLW_LIB_DEPS = APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) \ - $(EXTRA_LIB_PATH) -lX11 -lXt -lXi -lpthread -lstdc++ -lm + $(EXTRA_LIB_PATH) -lX11 -lXt -lpthread -lstdc++ -lm diff --git a/configs/linux-static b/configs/linux-static index ead9e92..8cc5824 100644 --- a/configs/linux-static +++ b/configs/linux-static @@ -21,4 +21,4 @@ GLW_LIB_DEPS = # Need to specify all libraries we may need APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) \ - -l$(GL_LIB) -lm -L/usr/X11R6/lib/ -lX11 -lXext -lXi -lpthread + -l$(GL_LIB) -lm -L/usr/X11R6/lib/ -lX11 -lXext -lpthread diff --git a/configs/linux-x86-64-static b/configs/linux-x86-64-static index e157f71..8c6fc34 100644 --- a/configs/linux-x86-64-static +++ b/configs/linux-x86-64-static @@ -22,4 +22,4 @@ GLW_LIB_DEPS = # Need to specify all libraries we may need APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -Wl,--start-group \ -l$(GL_LIB) $(TOP)/src/mesa/pipe/softpipe/libsoftpipe.a -Wl,--end-group \ - $(EXTRA_LIB_PATH) -lX11 -lXext -lXt -lXi -lpthread -lstdc++ -lm + $(EXTRA_LIB_PATH) -lX11 -lXext -lXt -lpthread -lstdc++ -lm diff --git a/configs/linux-x86-static b/configs/linux-x86-static index e6a63ec..ada3563 100644 --- a/configs/linux-x86-static +++ b/configs/linux-x86-static @@ -21,4 +21,4 @@ GLW_LIB_DEPS = # Need to specify all libraries we may need APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) \ - -l$(GL_LIB) $(EXTRA_LIB_PATH) -lX11 -lXext -lXt -lXi -lpthread -lstdc++ -lm + -l$(GL_LIB) $(EXTRA_LIB_PATH) -lX11 -lXext -lXt -lpthread -lstdc++ -lm diff --git a/configs/netbsd b/configs/netbsd index 973a205..01676e1 100644 --- a/configs/netbsd +++ b/configs/netbsd @@ -9,7 +9,7 @@ CC = gcc CXX = g++ CFLAGS = -O2 -fPIC -DUSE_XSHM -I/usr/X11R6/include -DHZ=100 CXXFLAGS = -O2 -fPIC -APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/X11R6/lib -lXext -lXi -lX11 -lm +APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/X11R6/lib -lXext -lX11 -lm # Work around aliasing bugs - developers should comment this out CFLAGS += -fno-strict-aliasing diff --git a/configs/osf1 b/configs/osf1 index eb2f378..faf1ef7 100644 --- a/configs/osf1 +++ b/configs/osf1 @@ -12,4 +12,4 @@ CXXFLAGS = -O2 -std ansi -ieee -DPTHREADS -D_REENTRANT GL_LIB_DEPS = -lX11 -lXext -lm -lpthread GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm -APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lXi -lpthread -lm +APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lpthread -lm diff --git a/configs/osf1-static b/configs/osf1-static index 5a287e6..3338dca 100644 --- a/configs/osf1-static +++ b/configs/osf1-static @@ -13,4 +13,4 @@ MKLIB_OPTIONS = -static GL_LIB_DEPS = GLU_LIB_DEPS = -APP_LIB_DEPS = -noso -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -so_archive -lX11 -lXext -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 -lpthread -lm -lcxx diff --git a/configs/solaris-x86 b/configs/solaris-x86 index c663afe..141189d 100644 --- a/configs/solaris-x86 +++ b/configs/solaris-x86 @@ -9,7 +9,7 @@ CC = cc CFLAGS = -Xa -xO3 -xpentium -KPIC -I/usr/openwin/include -DUSE_XSHM MKLIB_OPTIONS = -static -APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/openwin/lib -R/usr/openwin/lib -lX11 -lXext -lXi -lm -lGLU -lGL +APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/openwin/lib -R/usr/openwin/lib -lX11 -lXext -lm -lGLU -lGL GL_LIB_NAME = libGL.a GLU_LIB_NAME = libGLU.a diff --git a/configs/solaris-x86-gcc b/configs/solaris-x86-gcc index 606541b..16ec6da 100644 --- a/configs/solaris-x86-gcc +++ b/configs/solaris-x86-gcc @@ -16,4 +16,4 @@ CXXFLAGS += -fno-strict-aliasing GL_LIB_DEPS = -L/usr/openwin/lib -lX11 -lXext -lm -lpthread GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -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 +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 diff --git a/configs/solaris-x86-gcc-static b/configs/solaris-x86-gcc-static index 1ce08a5..5bd6f42 100644 --- a/configs/solaris-x86-gcc-static +++ b/configs/solaris-x86-gcc-static @@ -17,7 +17,7 @@ CXXFLAGS += -fno-strict-aliasing GL_LIB_DEPS = -L/usr/openwin/lib -lX11 -lXext -lm -lpthread GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -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 +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 GL_LIB_NAME = libGL.a GLU_LIB_NAME = libGLU.a diff --git a/configs/sunos4 b/configs/sunos4 index 2723f45..10a3e56 100644 --- a/configs/sunos4 +++ b/configs/sunos4 @@ -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$(TOP)/$(LIB_DIR) -L/usr/lib/X11R5 -lX11 -lXext -lXi -lm +APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/lib/X11R5 -lX11 -lXext -lm diff --git a/configs/sunos4-gcc b/configs/sunos4-gcc index c1e7405..dcff20c 100644 --- a/configs/sunos4-gcc +++ b/configs/sunos4-gcc @@ -14,5 +14,5 @@ CXXFLAGS = -fPIC -O3 -I/usr/openwin/include -DSUNOS4 CFLAGS += -fno-strict-aliasing CXXFLAGS += -fno-strict-aliasing -APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/openwin/lib -lX11 -lXext -lXi -lm +APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/openwin/lib -lX11 -lXext -lm diff --git a/configs/sunos4-static b/configs/sunos4-static index 767469f..147e3ba 100644 --- a/configs/sunos4-static +++ b/configs/sunos4-static @@ -20,4 +20,4 @@ GL_LIB_DEPS = OSMESA_LIB_DEPS = GLU_LIB_DEPS = GLW_LIB_DEPS = -APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXext -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 -lXt -lpthread -lm diff --git a/configs/sunos5 b/configs/sunos5 index 28b5edb..1905dfe 100644 --- a/configs/sunos5 +++ b/configs/sunos5 @@ -10,7 +10,7 @@ CXX = c++ CFLAGS = -KPIC -Xa -O -I/usr/openwin/include -I/usr/dt/include -DUSE_XSHM CXXFLAGS = -KPIC -Xa -O -I/usr/openwin/include -I/usr/dt/include -GL_LIB_DEPS = -L/usr/openwin/lib -L/usr/dt/lib -lX11 -lXext -lXi -lm +GL_LIB_DEPS = -L/usr/openwin/lib -L/usr/dt/lib -lX11 -lXext -lm GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -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 diff --git a/configs/sunos5-gcc b/configs/sunos5-gcc index 3e3bd4b..a1ffa33 100644 --- a/configs/sunos5-gcc +++ b/configs/sunos5-gcc @@ -34,5 +34,5 @@ CXXFLAGS += -fno-strict-aliasing # Library/program dependencies EXTRA_LIB_PATH=-L/usr/openwin/lib -GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXi -lm +GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lm APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -lX11 -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm diff --git a/configs/sunos5-smp b/configs/sunos5-smp index 3e7b96c..532db77 100644 --- a/configs/sunos5-smp +++ b/configs/sunos5-smp @@ -10,7 +10,7 @@ CXX = c++ CFLAGS = -KPIC -Xa -native -fast -xO5 -xlibmil -xsafe=mem -xdepend -I/usr/openwin/include -I/usr/dt/include -DUSE_XSHM -DSOLARIS_2_4_BUG CXXFLAGS = -KPIC -Xa -native -fast -xO5 -xlibmil -xsafe=mem -xdepend -I/usr/openwin/include -I/usr/dt/include -GL_LIB_DEPS = -L/usr/openwin/lib -lX11 -lXext -lXi -lm +GL_LIB_DEPS = -L/usr/openwin/lib -lX11 -lXext -lm GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -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 diff --git a/configs/sunos5-v8 b/configs/sunos5-v8 index 814b0be..705ccf7 100644 --- a/configs/sunos5-v8 +++ b/configs/sunos5-v8 @@ -10,7 +10,7 @@ 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 -GL_LIB_DEPS = -L/usr/openwin/lib -L/usr/dt/lib -lX11 -lXext -lXi -lm -lpthread +GL_LIB_DEPS = -L/usr/openwin/lib -L/usr/dt/lib -lX11 -lXext -lm -lpthread GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm -lCstd -lCrun 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 diff --git a/configs/sunos5-v8-static b/configs/sunos5-v8-static index ccce58b..7e63177 100644 --- a/configs/sunos5-v8-static +++ b/configs/sunos5-v8-static @@ -12,4 +12,4 @@ 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 -APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/openwin/lib -lXt -lX11 -lXext -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 -lpthread -lm -lCstd -lCrun diff --git a/configs/sunos5-v9 b/configs/sunos5-v9 index a9dad34..9c95ff9 100644 --- a/configs/sunos5-v9 +++ b/configs/sunos5-v9 @@ -14,7 +14,7 @@ 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 -GL_LIB_DEPS = -L/usr/openwin/lib -L/usr/dt/lib -lX11 -lXext -lXi -lm -lpthread +GL_LIB_DEPS = -L/usr/openwin/lib -L/usr/dt/lib -lX11 -lXext -lm -lpthread GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm -lCstd -lCrun 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 diff --git a/configs/sunos5-v9-cc-g++ b/configs/sunos5-v9-cc-g++ index e851632..0bcd038 100644 --- a/configs/sunos5-v9-cc-g++ +++ b/configs/sunos5-v9-cc-g++ @@ -27,7 +27,7 @@ CXXFLAGS += -fno-strict-aliasing 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 -GL_LIB_DEPS = -L/usr/openwin/lib -L/usr/dt/lib -lX11 -lXext -lXi -lm -lpthread +GL_LIB_DEPS = -L/usr/openwin/lib -L/usr/dt/lib -lX11 -lXext -lm -lpthread GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm -lCstd -lCrun 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 diff --git a/configs/sunos5-v9-static b/configs/sunos5-v9-static index 8ca45a6..5142ef6 100644 --- a/configs/sunos5-v9-static +++ b/configs/sunos5-v9-static @@ -14,4 +14,4 @@ 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 -APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/openwin/lib -lXt -lX11 -lXext -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 -lpthread -lm -lCstd -lCrun diff --git a/configs/ultrix-gcc b/configs/ultrix-gcc index 016badf..6911b65 100644 --- a/configs/ultrix-gcc +++ b/configs/ultrix-gcc @@ -20,4 +20,4 @@ GLU_LIB_NAME = libGLU.a GLW_LIB_NAME = libGLw.a OSMESA_LIB_NAME = libOSMesa.a -APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXi -lm +APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lm -- 1.7.3.4 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev