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

OpenGL: Fix library dependencies

Browse Source 
* Fixes gcc2 build
This commit is contained in:
Alexander von Gluck IV
2012-12-21 22:55:56 -06:00
parent 96a4619b92
commit a892e43ee3
5 changed files with 36 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/BuildFeatures
+26 -5
View File
@@ -246,15 +246,36 @@ if $(TARGET_ARCH) = x86 {
HAIKU_MESA_HEADERS_DEPENDENCY = [ ExtractArchive $(HAIKU_MESA_DIR) HAIKU_MESA_HEADERS_DEPENDENCY = [ ExtractArchive $(HAIKU_MESA_DIR)
: include/ : $(zipFile) : extracted-mesa ] ; : include/ : $(zipFile) : extracted-mesa ] ;
HAIKU_GLAPI_LIBS = [ ExtractArchive $(HAIKU_MESA_DIR) HAIKU_GLAPI_LIB = [ ExtractArchive $(HAIKU_MESA_DIR)
: :
lib.haiku/libglapi.a lib.haiku/libglapi.a
: $(zipFile) : $(zipFile)
: extracted-mesa ] ; : extracted-mesa ] ;
HAIKU_GLSL_LIB = [ ExtractArchive $(HAIKU_MESA_DIR)
HAIKU_MESA_LIBS = :
$(HAIKU_MESA_DIR)/lib.haiku/libmesa.a lib.haiku/libglsl.a
$(HAIKU_MESA_DIR)/lib.haiku/libglsl.a ; : $(zipFile)
: extracted-mesa ] ;
HAIKU_MESA_LIB = [ ExtractArchive $(HAIKU_MESA_DIR)
:
lib.haiku/libmesa.a
: $(zipFile)
: extracted-mesa ] ;
HAIKU_GALLIUM_LIB = [ ExtractArchive $(HAIKU_MESA_DIR)
:
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 ] ;
HAIKU_MESA_HEADERS = [ FDirName $(HAIKU_MESA_DIR) include ] ; HAIKU_MESA_HEADERS = [ FDirName $(HAIKU_MESA_DIR) include ] ;
src/add-ons/opengl/swpipe/Jamfile
+5 -5
View File
@@ -13,7 +13,7 @@ local sources =
GalliumFramebuffer.cpp GalliumFramebuffer.cpp
bitmap_wrapper.cpp ; bitmap_wrapper.cpp ;
local HAIKU_SWPIPE_DRIVER = $(HAIKU_MESA_DIR)/lib.haiku/libsoftpipe.a ; local HAIKU_SWPIPE_DRIVER = $(HAIKU_GALLIUM_SOFTPIPE_LIB) ;
local llvmLibraries = ; local llvmLibraries = ;
if $(HAIKU_LLVM_DIR) { if $(HAIKU_LLVM_DIR) {
@@ -24,8 +24,7 @@ if $(HAIKU_LLVM_DIR) {
SubDirSysHdrs /boot/common/include ; SubDirSysHdrs /boot/common/include ;
HAIKU_LLVM_DIR = /boot/common/lib ; HAIKU_LLVM_DIR = /boot/common/lib ;
HAIKU_SWPIPE_DRIVER = HAIKU_SWPIPE_DRIVER = $(HAIKU_GALLIUM_LLVMPIPE_LIB) ;
$(HAIKU_MESA_DIR)/lib.haiku/libllvmpipe.a ;
llvmLibraries = llvmLibraries =
$(HAIKU_LLVM_DIR)/libLLVMAsmParser.a $(HAIKU_LLVM_DIR)/libLLVMAsmParser.a
@@ -122,8 +121,9 @@ Addon Software\ Renderer :
$(sources) $(sources)
: libGL.so : libGL.so
$(HAIKU_SWPIPE_DRIVER) $(HAIKU_SWPIPE_DRIVER)
$(HAIKU_MESA_LIBS) $(HAIKU_MESA_LIB)
$(HAIKU_MESA_DIR)/lib.haiku/libgallium.a $(HAIKU_GLSL_LIB)
$(HAIKU_GALLIUM_LIB)
$(llvmLibraries) $(llvmLibraries)
be translation stdc++ $(TARGET_LIBSUPC++) be translation stdc++ $(TARGET_LIBSUPC++)
; ;
src/add-ons/opengl/swrast/Jamfile
+2 -1
View File
@@ -28,6 +28,7 @@ AddResources Software\ Rasterizer : MesaSoftwareRenderer.rdef ;
Addon Software\ Rasterizer : Addon Software\ Rasterizer :
MesaSoftwareRenderer.cpp MesaSoftwareRenderer.cpp
: :
$(HAIKU_MESA_LIBS) $(HAIKU_MESA_LIB)
$(HAIKU_GLSL_LIB)
libGL.so be $(TARGET_LIBSUPC++) libGL.so be $(TARGET_LIBSUPC++)
; ;
src/add-ons/opengl/swrast_legacy/Jamfile
+2 -2
View File
@@ -47,8 +47,8 @@ UseHeaders [ FDirName $(HAIKU_MESA_DIR) src mesa x86 ] ;
AddResources Legacy\ Software\ Rasterizer : MesaSoftwareRenderer.rdef ; AddResources Legacy\ Software\ Rasterizer : MesaSoftwareRenderer.rdef ;
Addon Legacy\ Software\ Rasterizer : Addon Legacy\ Software\ Rasterizer :
MesaSoftwareRenderer.cpp $(sources)
: :
$(HAIKU_MESA_DIR)/lib.haiku/libmesa.a $(HAIKU_MESA_LIB)
libGL.so be $(TARGET_LIBSUPC++) libGL.so be $(TARGET_LIBSUPC++)
; ;
src/kits/opengl/Jamfile
+1 -2
View File
@@ -18,7 +18,6 @@ if $(TARGET_PLATFORM) != haiku {
# We need our public GL headers also when not compiling for Haiku. # We need our public GL headers also when not compiling for Haiku.
} }
SubDirSysHdrs $(HAIKU_GLU_HEADERS) ; SubDirSysHdrs $(HAIKU_GLU_HEADERS) ;
SubDirSysHdrs $(HAIKU_MESA_HEADERS) ; SubDirSysHdrs $(HAIKU_MESA_HEADERS) ;
Includes [ FGristFiles $(sources) ] : $(HAIKU_GLU_HEADERS_DEPENDENCY) ; Includes [ FGristFiles $(sources) ] : $(HAIKU_GLU_HEADERS_DEPENDENCY) ;
@@ -47,7 +46,7 @@ SharedLibrary libGL.so : $(sources) :
$(HAIKU_GLU_LIBS) $(HAIKU_GLU_LIBS)
# GLAPI Dispatch code (from Mesa buildpackage) # GLAPI Dispatch code (from Mesa buildpackage)
$(HAIKU_GLAPI_LIBS) $(HAIKU_GLAPI_LIB)
# External libraries: # External libraries:
game # BWindowScreen needed by BGLScreen stub class game # BWindowScreen needed by BGLScreen stub class