i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

swpipe: Refactor llvm build dependencies

Browse Source 
* Little cleaner now taking advantage of
  the fact that Jam ignores unmatched
  dependencies. Thanks Urias for the idea!
This commit is contained in:
Alexander von Gluck IV
2013-01-11 11:06:01 -06:00
parent 414ba3b2a3
commit 7657c0acde
2 changed files with 35 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/BuildFeatures
+10 -6
View File
@@ -378,22 +378,26 @@ if $(TARGET_ARCH) = x86 {
lib.haiku/libgallium.a lib.haiku/libgallium.a
: $(zipFile) : $(zipFile)
: extracted-mesa ] ; : extracted-mesa ] ;
HAIKU_GALLIUM_SOFTPIPE_LIB = [ ExtractArchive $(HAIKU_MESA_DIR)
: if FIsBuildFeatureEnabled(llvm) {
lib.haiku/libsoftpipe.a
: $(zipFile)
: extracted-mesa ] ;
HAIKU_GALLIUM_LLVMPIPE_LIB = [ ExtractArchive $(HAIKU_MESA_DIR) HAIKU_GALLIUM_LLVMPIPE_LIB = [ ExtractArchive $(HAIKU_MESA_DIR)
: :
lib.haiku/libllvmpipe.a lib.haiku/libllvmpipe.a
: $(zipFile) : $(zipFile)
: extracted-mesa ] ; : 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 ] ; HAIKU_MESA_HEADERS = [ FDirName $(HAIKU_MESA_DIR) include ] ;
Depends $(HAIKU_MESA_HEADERS_DEPENDENCY) : $(HAIKU_GLU_HEADERS_DEPENDENCY) ; Depends $(HAIKU_MESA_HEADERS_DEPENDENCY) : $(HAIKU_GLU_HEADERS_DEPENDENCY) ;
Depends $(HAIKU_GLAPI_LIBS) : $(HAIKU_GLU_LIBS) ; Depends $(HAIKU_GLAPI_LIBS) : $(HAIKU_GLU_LIBS) ;
Depends $(HAIKU_GALLIUM_LLVMPIPE_LIB) : $(HAIKU_LLVM_LIBS) ;
EnableBuildFeatures mesa ; EnableBuildFeatures mesa ;
} else { } else {
src/add-ons/opengl/swpipe/Jamfile
+7 -18
View File
@@ -21,16 +21,21 @@ UseHeaders [ FDirName $(HAIKU_MESA_DIR) src mesa ] ;
AddResources Software\ Renderer : SoftwareRenderer.rdef ; AddResources Software\ Renderer : SoftwareRenderer.rdef ;
if FIsBuildFeatureEnabled(llvm) { if FIsBuildFeatureEnabled(llvm) {
SubDirC++Flags [ FDefines HAVE_LLVM=0x0302 ] ;
}
# LLVM Pipe enabled Gallium Software Renderer # LLVM Pipe enabled Gallium Software Renderer
# Requires: # Requires:
# - LLVM optional package # - LLVM optional package
# - Mesa optional package compiled with LLVM installed # - Mesa optional package compiled with LLVM installed
SubDirC++Flags [ FDefines HAVE_LLVM=0x0302 ] ; # SoftPipe enabled Gallium Software Renderer
# Requires:
# - Mesa optional package compiled *without* LLVM installed
Addon Software\ Renderer : Addon Software\ Renderer :
$(sources) $(sources)
: :
libGL.so libGL.so
$(HAIKU_GALLIUM_SOFTPIPE_LIB)
$(HAIKU_GALLIUM_LLVMPIPE_LIB) $(HAIKU_GALLIUM_LLVMPIPE_LIB)
$(HAIKU_MESA_LIB) $(HAIKU_MESA_LIB)
$(HAIKU_GLSL_LIB) $(HAIKU_GLSL_LIB)
@@ -38,19 +43,3 @@ if FIsBuildFeatureEnabled(llvm) {
$(HAIKU_LLVM_LIBS) $(HAIKU_LLVM_LIBS)
be translation stdc++ $(TARGET_LIBSUPC++) 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++)
;
}