summaryrefslogtreecommitdiffstats
path: root/configs
diff options
context:
space:
mode:
authorIan Romanick <idr@us.ibm.com>2008-01-03 14:59:14 -0800
committerIan Romanick <idr@us.ibm.com>2008-01-23 15:25:52 -0800
commitffcb4d84984dde393d914e1a4af5b83488683071 (patch)
tree8063f41c7c65357ad3d210e97c0ec1ba2cec21ea /configs
parenteb4a7382dc7ef425d6cb7e176026cc07f6105e1e (diff)
downloadexternal_mesa3d-ffcb4d84984dde393d914e1a4af5b83488683071.zip
external_mesa3d-ffcb4d84984dde393d914e1a4af5b83488683071.tar.gz
external_mesa3d-ffcb4d84984dde393d914e1a4af5b83488683071.tar.bz2
Use EXTRA_LIB_PATH with *_LIB_DEPS
Make sure EXTRA_LIB_PATH is used with all the LIB_DEPS. Re-order some of the options and tweak the whitespace to make the various LIB_DEPS more readable. This makes building for Cell on x86 a bit easier and doesn't seem to effect other builds.
Diffstat (limited to 'configs')
-rw-r--r--configs/default12
1 files changed, 6 insertions, 6 deletions
diff --git a/configs/default b/configs/default
index 92fc743..6ce0249 100644
--- a/configs/default
+++ b/configs/default
@@ -68,12 +68,12 @@ PROGRAM_DIRS = demos redbook samples glsl xdemos
# Library/program dependencies
#EXTRA_LIB_PATH ?=
-GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread
-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 -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
+GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread
+OSMESA_LIB_DEPS = $(EXTRA_LIB_PATH) -L$(TOP)/$(LIB_DIR) -l$(GL_LIB)
+GLU_LIB_DEPS = $(EXTRA_LIB_PATH) -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm
+GLUT_LIB_DEPS = $(EXTRA_LIB_PATH) -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXmu -lXi -lm
+GLW_LIB_DEPS = $(EXTRA_LIB_PATH) -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lXt -lX11
+APP_LIB_DEPS = $(EXTRA_LIB_PATH) -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm