[haiku-commits] haiku: hrev45150 - src/add-ons/opengl/swpipe build/jam
- From: kallisti5@xxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Fri, 11 Jan 2013 18:07:36 +0100 (CET)
hrev45150 adds 1 changeset to branch 'master'
old head: 414ba3b2a3e6df1ef9a177472ca18c59500bdc3e
new head: 7657c0acdec93be56146e5941bc8dfaf47bb66db
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=7657c0a+%5E414ba3b
----------------------------------------------------------------------------
7657c0a: swpipe: Refactor llvm build dependencies
* Little cleaner now taking advantage of
the fact that Jam ignores unmatched
dependencies. Thanks Urias for the idea!
[ Alexander von Gluck IV <kallisti5@xxxxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev45150
Commit: 7657c0acdec93be56146e5941bc8dfaf47bb66db
URL: http://cgit.haiku-os.org/haiku/commit/?id=7657c0a
Author: Alexander von Gluck IV <kallisti5@xxxxxxxxxxx>
Date: Fri Jan 11 17:06:01 2013 UTC
----------------------------------------------------------------------------
2 files changed, 35 insertions(+), 42 deletions(-)
build/jam/BuildFeatures | 26 ++++++++++--------
src/add-ons/opengl/swpipe/Jamfile | 51 ++++++++++++++---------------------
----------------------------------------------------------------------------
diff --git a/build/jam/BuildFeatures b/build/jam/BuildFeatures
index 46062fc..28d22f9 100644
--- a/build/jam/BuildFeatures
+++ b/build/jam/BuildFeatures
@@ -378,22 +378,26 @@ if $(TARGET_ARCH) = x86 {
lib.haiku/libgallium.a
: $(zipFile)
: extracted-mesa ] ;
- HAIKU_GALLIUM_SOFTPIPE_LIB = [ ExtractArchive $(HAIKU_MESA_DIR)
- :
- lib.haiku/libsoftpipe.a
- : $(zipFile)
- : extracted-mesa ] ;
- HAIKU_GALLIUM_LLVMPIPE_LIB = [ ExtractArchive $(HAIKU_MESA_DIR)
- :
- lib.haiku/libllvmpipe.a
- : $(zipFile)
- : extracted-mesa ] ;
+
+ if FIsBuildFeatureEnabled(llvm) {
+ HAIKU_GALLIUM_LLVMPIPE_LIB = [ ExtractArchive $(HAIKU_MESA_DIR)
+ :
+ lib.haiku/libllvmpipe.a
+ : $(zipFile)
+ : extracted-mesa ] ;
+ Depends $(HAIKU_GALLIUM_LLVMPIPE_LIB) : $(HAIKU_LLVM_LIBS) ;
+ } else {
+ HAIKU_GALLIUM_SOFTPIPE_LIB = [ ExtractArchive $(HAIKU_MESA_DIR)
+ :
+ lib.haiku/libsoftpipe.a
+ : $(zipFile)
+ : extracted-mesa ] ;
+ }
HAIKU_MESA_HEADERS = [ FDirName $(HAIKU_MESA_DIR) include ] ;
Depends $(HAIKU_MESA_HEADERS_DEPENDENCY) :
$(HAIKU_GLU_HEADERS_DEPENDENCY) ;
Depends $(HAIKU_GLAPI_LIBS) : $(HAIKU_GLU_LIBS) ;
- Depends $(HAIKU_GALLIUM_LLVMPIPE_LIB) : $(HAIKU_LLVM_LIBS) ;
EnableBuildFeatures mesa ;
} else {
diff --git a/src/add-ons/opengl/swpipe/Jamfile
b/src/add-ons/opengl/swpipe/Jamfile
index b46eded..4f462b6 100644
--- a/src/add-ons/opengl/swpipe/Jamfile
+++ b/src/add-ons/opengl/swpipe/Jamfile
@@ -21,36 +21,25 @@ UseHeaders [ FDirName $(HAIKU_MESA_DIR) src mesa ] ;
AddResources Software\ Renderer : SoftwareRenderer.rdef ;
if FIsBuildFeatureEnabled(llvm) {
- # LLVM Pipe enabled Gallium Software Renderer
- # Requires:
- # - LLVM optional package
- # - Mesa optional package compiled with LLVM installed
SubDirC++Flags [ FDefines HAVE_LLVM=0x0302 ] ;
+}
- Addon Software\ Renderer :
- $(sources)
- :
- libGL.so
- $(HAIKU_GALLIUM_LLVMPIPE_LIB)
- $(HAIKU_MESA_LIB)
- $(HAIKU_GLSL_LIB)
- $(HAIKU_GALLIUM_LIB)
- $(HAIKU_LLVM_LIBS)
- be translation stdc++ $(TARGET_LIBSUPC++)
- ;
-} else {
- # SoftPipe enabled Gallium Software Renderer
- # Note: Slow and pointless for production use!
- # Requires:
- # - Mesa optional package compiled *without* LLVM installed.
- Addon Software\ Renderer :
- $(sources)
- :
- libGL.so
- $(HAIKU_GALLIUM_SOFTPIPE_LIB)
- $(HAIKU_MESA_LIB)
- $(HAIKU_GLSL_LIB)
- $(HAIKU_GALLIUM_LIB)
- be translation stdc++ $(TARGET_LIBSUPC++)
- ;
-}
\ No newline at end of file
+# LLVM Pipe enabled Gallium Software Renderer
+# Requires:
+# - LLVM optional package
+# - Mesa optional package compiled with LLVM installed
+# SoftPipe enabled Gallium Software Renderer
+# Requires:
+# - Mesa optional package compiled *without* LLVM installed
+Addon Software\ Renderer :
+ $(sources)
+ :
+ libGL.so
+ $(HAIKU_GALLIUM_SOFTPIPE_LIB)
+ $(HAIKU_GALLIUM_LLVMPIPE_LIB)
+ $(HAIKU_MESA_LIB)
+ $(HAIKU_GLSL_LIB)
+ $(HAIKU_GALLIUM_LIB)
+ $(HAIKU_LLVM_LIBS)
+ be translation stdc++ $(TARGET_LIBSUPC++)
+;
Other related posts:
- » [haiku-commits] haiku: hrev45150 - src/add-ons/opengl/swpipe build/jam - kallisti5
