swpipe: Refactor llvm build dependencies

* 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
+20 -31
View File
@@ -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++)
;
}
# 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++)
;