summaryrefslogtreecommitdiff
path: root/configs
diff options
context:
space:
mode:
authorZack Rusin <zack@tungstengraphics.com>2007-10-24 08:34:01 -0400
committerZack Rusin <zack@tungstengraphics.com>2007-10-24 11:21:05 -0400
commitd76a7b61bb2de2425289f462e07a678cf3c4ba59 (patch)
tree1d29b47fde67578acab60d1ae55bfb88ea8fe2ff /configs
parent5040eefbb758fb0e02125ad3a6bfb3dba13cb7fa (diff)
Cleanup some code.
Diffstat (limited to 'configs')
-rw-r--r--configs/default3
-rw-r--r--configs/linux-llvm16
2 files changed, 9 insertions, 10 deletions
diff --git a/configs/default b/configs/default
index 9379833a9c..a7de3f813d 100644
--- a/configs/default
+++ b/configs/default
@@ -40,8 +40,6 @@ GLUT_LIB = glut
GLW_LIB = GLw
OSMESA_LIB = OSMesa
-LLVM_CFLAGS=-DMESA_NO_LLVM=1
-LLVM_CXXFLAGS=-DMESA_NO_LLVM=1
# Library names (actual file names)
GL_LIB_NAME = lib$(GL_LIB).so
@@ -67,6 +65,7 @@ DRIVER_DIRS = x11 osmesa
# Which subdirs under $(TOP)/progs/ to enter:
PROGRAM_DIRS = demos redbook samples glsl xdemos
+
# Library/program dependencies
#EXTRA_LIB_PATH ?=
GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread
diff --git a/configs/linux-llvm b/configs/linux-llvm
index addefaa511..8e9b408861 100644
--- a/configs/linux-llvm
+++ b/configs/linux-llvm
@@ -11,21 +11,21 @@ LLVM_VERSION := $(shell llvm-config --version)
ifeq ($(LLVM_VERSION),)
$(warning Could not find LLVM! Make Sure 'llvm-config' is in the path)
- MESA_NO_LLVM=1
+ MESA_LLVM=0
else
- MESA_NO_LLVM=0
+ MESA_LLVM=1
$(info Using LLVM version: $(LLVM_VERSION))
endif
-ifeq ($(MESA_NO_LLVM),0)
-# LLVM_CFLAGS=`llvm-config --cflags` -DMESA_NO_LLVM=0
- LLVM_CFLAGS=-DMESA_NO_LLVM=0
- LLVM_CXXFLAGS=`llvm-config --cxxflags` -DMESA_NO_LLVM=0 -Wno-long-long
+ifeq ($(MESA_LLVM),1)
+# LLVM_CFLAGS=`llvm-config --cflags` -DMESA_LLVM=1
+ LLVM_CFLAGS=-DMESA_LLVM=1
+ LLVM_CXXFLAGS=`llvm-config --cxxflags` -DMESA_LLVM=1 -Wno-long-long
LLVM_LDFLAGS=`llvm-config --ldflags`
LLVM_LIBS=`llvm-config --libs`
else
- LLVM_CFLAGS=-DMESA_NO_LLVM=1
- LLVM_CXXFLAGS=-DMESA_NO_LLVM=1
+ LLVM_CFLAGS=
+ LLVM_CXXFLAGS=
endif
GL_LIB_DEPS = $(LLVM_LDFLAGS) $(LLVM_LIBS) $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread