diff options
| author | Zack Rusin <zack@tungstengraphics.com> | 2007-10-29 10:01:29 -0400 |
|---|---|---|
| committer | Keith Whitwell <keith@tungstengraphics.com> | 2007-10-29 16:14:10 +0000 |
| commit | a6a3d8cb755c36d4ae1dc4dbfb310f06862a37b4 (patch) | |
| tree | 754efd88f96e7cdb24f6404e28979ada233eef4d | |
| parent | a70c5e37f1c2e43738469e4799ad2b9e7c604782 (diff) | |
Remove conditionals from the makefiles.
| -rw-r--r-- | src/mesa/pipe/llvm/instructions.cpp | 2 | ||||
| -rw-r--r-- | src/mesa/pipe/llvm/llvmtgsi.cpp | 3 | ||||
| -rw-r--r-- | src/mesa/pipe/llvm/storage.cpp | 2 | ||||
| -rw-r--r-- | src/mesa/sources | 4 |
4 files changed, 6 insertions, 5 deletions
diff --git a/src/mesa/pipe/llvm/instructions.cpp b/src/mesa/pipe/llvm/instructions.cpp index 645ab9106f..b0aa0cc746 100644 --- a/src/mesa/pipe/llvm/instructions.cpp +++ b/src/mesa/pipe/llvm/instructions.cpp @@ -29,6 +29,7 @@ * Authors: * Zack Rusin zack@tungstengraphics.com */ +#ifdef MESA_LLVM #include "instructions.h" @@ -1165,3 +1166,4 @@ llvm::Function * Instructions::findFunction(int label) return func; } +#endif //MESA_LLVM diff --git a/src/mesa/pipe/llvm/llvmtgsi.cpp b/src/mesa/pipe/llvm/llvmtgsi.cpp index b57a0f8366..4611ac1766 100644 --- a/src/mesa/pipe/llvm/llvmtgsi.cpp +++ b/src/mesa/pipe/llvm/llvmtgsi.cpp @@ -29,6 +29,7 @@ * Authors: * Zack Rusin zack@tungstengraphics.com */ +#ifdef MESA_LLVM #include "llvmtgsi.h" @@ -67,8 +68,6 @@ #include <fstream> #include <iostream> -#ifdef MESA_LLVM - struct gallivm_prog { llvm::Module *module; void *function; diff --git a/src/mesa/pipe/llvm/storage.cpp b/src/mesa/pipe/llvm/storage.cpp index dca8b39958..ff62fcf3e4 100644 --- a/src/mesa/pipe/llvm/storage.cpp +++ b/src/mesa/pipe/llvm/storage.cpp @@ -29,6 +29,7 @@ * Authors: * Zack Rusin zack@tungstengraphics.com */ +#ifdef MESA_LLVM #include "storage.h" @@ -391,3 +392,4 @@ void Storage::popTemps() m_temps = m_tempStack.top(); m_tempStack.pop(); } +#endif //MESA_LLVM diff --git a/src/mesa/sources b/src/mesa/sources index 30d3c32b83..e27f02a9bc 100644 --- a/src/mesa/sources +++ b/src/mesa/sources @@ -187,12 +187,10 @@ TGSIDECO_SOURCES = \ pipe/tgsi/deco/deco_caps.c -ifeq ($(MESA_LLVM),1) - LLVMTGSI_SOURCES = \ +LLVMTGSI_SOURCES = \ pipe/llvm/llvmtgsi.cpp \ pipe/llvm/storage.cpp \ pipe/llvm/instructions.cpp -endif STATECACHE_SOURCES = \ pipe/cso_cache/cso_hash.c \ |