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

Mesa 9.0.1: Build cleanup

Browse Source 
* Try to keep each renderer designed
  the same.
* swrast will build... swpipe won't
  build until we have an llvm build
  package. (should in a few days once
  llvm 3.2 is released)
This commit is contained in:
Alexander von Gluck IV
2012-12-21 19:23:41 -06:00
parent e685ddf799
commit ecbdee63cf
4 changed files with 103 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/BuildFeatures
+6 -6
View File
@@ -230,13 +230,9 @@ if $(TARGET_ARCH) = x86 {
# Mesa
if $(TARGET_ARCH) = x86 {
local glslObject ;
local galliumObjects ;
local zipFile ;
if $(HAIKU_GCC_VERSION[1]) >= 4 {
HAIKU_MESA_FILE = mesa-9.0-x86-gcc4-2012-11-17.zip ;
glslObject = lib.haiku/libglsl.a ;
galliumObjects = lib.haiku/libgallium.a ;
HAIKU_MESA_FILE = mesa-9.0.1-x86-gcc4-2012-12-19.zip ;
} else {
HAIKU_MESA_FILE = mesa-7.8.2-x86-gcc2-2012-01-17.zip ;
}
@@ -256,10 +252,14 @@ if $(TARGET_ARCH) = x86 {
: $(zipFile)
: extracted-mesa ] ;
HAIKU_MESA_LIBS =
$(HAIKU_MESA_DIR)/lib.haiku/libmesa.a
$(HAIKU_MESA_DIR)/lib.haiku/libglsl.a ;
HAIKU_MESA_HEADERS = [ FDirName $(HAIKU_MESA_DIR) include ] ;
Depends $(HAIKU_MESA_HEADERS_DEPENDENCY) : $(HAIKU_GLU_HEADERS_DEPENDENCY) ;
Depends $(HAIKU_MESA_LIBS) : $(HAIKU_GLU_LIBS) ;
Depends $(HAIKU_GLAPI_LIBS) : $(HAIKU_GLU_LIBS) ;
EnableBuildFeatures mesa ;
} else {