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

opengl: Improve libGL linking and Mesa optional package

Browse Source 
* Move compiled binaries into lib.haiku within Mesa optional
  pacakge, this enables us to use Make or scons to build Mesa
* Untangle libGL linking and order library inclusion
* Remove zmuldef hacks
* Compile libgallium into the libGL on Mesa 8.0 / gcc4 images
* Don't Mesa calculate cpu optimizations due to visibility
  issues, use Mesa cpu functions for this.
* Don't allow undefined symbols in libGL.so to ensure sanity.
* Move Mesa optional packages to haiku-files
This commit is contained in:
Alexander von Gluck IV
2012-01-17 14:57:49 +00:00
parent ec4f80739e
commit 3c0d5dcaf1
5 changed files with 29 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/OptionalBuildFeatures
+14 -18
View File
@@ -171,13 +171,18 @@ if $(HAIKU_BUILD_FEATURE_CLUCENE) {
# Mesa
local mesaBaseURL = http://pub.haikufire.com/mesa ;
local mesaBaseURL = http://haiku-files.org/files/optional-packages ;
if $(TARGET_ARCH) = x86 {
local glslObject ;
local galliumObjects ;
local zipFile ;
if $(HAIKU_GCC_VERSION[1]) >= 4 {
HAIKU_MESA_FILE = mesa-8.0-devel-gcc4-x86.zip ;
#HAIKU_MESA_FILE = mesa-8.0dev-x86-gcc4-2012-01-17.zip ;
HAIKU_MESA_FILE = mesa-8.0devdbg-x86-gcc4-2012-01-17.zip ;
glslObject = lib.haiku/libglsl.a ;
galliumObjects = lib.haiku/libgallium.a ;
} else {
HAIKU_MESA_FILE = mesa-7.8.2-gcc2-x86.zip ;
HAIKU_MESA_FILE = mesa-7.8.2-x86-gcc2-2012-01-17.zip ;
}
zipFile = [ DownloadFile $(HAIKU_MESA_FILE)
@@ -189,24 +194,15 @@ if $(TARGET_ARCH) = x86 {
HAIKU_MESA_HEADERS_DEPENDENCY = [ ExtractArchive $(HAIKU_MESA_DIR)
: include/ : $(zipFile) : extracted-mesa ] ;
if $(HAIKU_GCC_VERSION[1]) >= 4 {
HAIKU_MESA_LIBS = [ ExtractArchive $(HAIKU_MESA_DIR)
HAIKU_MESA_LIBS = [ ExtractArchive $(HAIKU_MESA_DIR)
:
src/mesa/libmesa.a
src/mapi/glapi/libglapi.a
lib/libGLU.a
lib.haiku/libglu.a
$(galliumObjects)
lib.haiku/libglapi.a
$(glslObject)
lib.haiku/libmesa.a
: $(zipFile)
: extracted-mesa ] ;
} else {
# Older Mesa 7.8
HAIKU_MESA_LIBS = [ ExtractArchive $(HAIKU_MESA_DIR)
:
src/mesa/libmesa.a
src/mesa/libglapi.a
lib/libGLU.a
: $(zipFile)
: extracted-mesa ] ;
}
HAIKU_MESA_HEADERS = [ FDirName $(HAIKU_MESA_DIR) include ] ;