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

Merge branch 'master' into sam460ex

Browse Source
This commit is contained in:
François Revol
2012-11-14 00:10:45 +01:00
parent dd686298c5 fb7f48a9eb
commit f39613c10b
3 changed files with 34 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/OptionalBuildFeatures
+26 -1
View File
@@ -180,6 +180,29 @@ if $(HAIKU_BUILD_FEATURE_CLUCENE) {
} }
# GLU (GL Utilities)
if $(TARGET_ARCH) = x86 {
if $(HAIKU_GCC_VERSION[1]) >= 4 {
HAIKU_GLU_FILE = glu-9.0-x86-gcc4-2012-11-13.zip ;
} else {
HAIKU_GLU_FILE = glu-9.0-x86-gcc2-2012-11-13.zip ;
}
local zipFile = [ DownloadFile $(HAIKU_GLU_FILE)
: $(baseURL)/lib/$(HAIKU_GLU_FILE) ] ;
HAIKU_GLU_DIR = [ FDirName $(HAIKU_OPTIONAL_BUILD_PACKAGES_DIR)
$(HAIKU_GLU_FILE:B) ] ;
HAIKU_GLU_HEADERS_DEPENDENCY = [ ExtractArchive $(HAIKU_GLU_DIR)
: develop/headers/os/opengl/GL : $(zipFile) : extracted-glu-headers ] ;
HAIKU_GLU_LIBS = [ ExtractArchive $(HAIKU_GLU_DIR)
: system/lib/libGLU.a : $(zipFile) : extracted-glu ] ;
HAIKU_GLU_HEADERS = [ FDirName $(HAIKU_GLU_DIR) develop headers os opengl ] ;
} else {
Echo "GLU not yet available on $(TARGET_ARCH)" ;
}
# Mesa # Mesa
if $(TARGET_ARCH) = x86 { if $(TARGET_ARCH) = x86 {
local glslObject ; local glslObject ;
@@ -205,7 +228,6 @@ if $(TARGET_ARCH) = x86 {
HAIKU_MESA_LIBS = [ ExtractArchive $(HAIKU_MESA_DIR) HAIKU_MESA_LIBS = [ ExtractArchive $(HAIKU_MESA_DIR)
: :
lib.haiku/libglu.a
$(galliumObjects) $(galliumObjects)
lib.haiku/libglapi.a lib.haiku/libglapi.a
$(glslObject) $(glslObject)
@@ -215,6 +237,9 @@ if $(TARGET_ARCH) = x86 {
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_LIBS) : $(HAIKU_GLU_LIBS) ;
} else { } else {
Echo "Mesa 3D rendering support not available on $(TARGET_ARCH)" ; Echo "Mesa 3D rendering support not available on $(TARGET_ARCH)" ;
} }
src/kits/opengl/Jamfile
+5
View File
@@ -19,7 +19,9 @@ if $(TARGET_PLATFORM) != haiku {
} }
SubDirSysHdrs $(HAIKU_GLU_HEADERS) ;
SubDirSysHdrs $(HAIKU_MESA_HEADERS) ; SubDirSysHdrs $(HAIKU_MESA_HEADERS) ;
Includes [ FGristFiles $(sources) ] : $(HAIKU_GLU_HEADERS_DEPENDENCY) ;
Includes [ FGristFiles $(sources) ] : $(HAIKU_MESA_HEADERS_DEPENDENCY) ; Includes [ FGristFiles $(sources) ] : $(HAIKU_MESA_HEADERS_DEPENDENCY) ;
UseHeaders [ FDirName $(HAIKU_MESA_DIR) include ] ; UseHeaders [ FDirName $(HAIKU_MESA_DIR) include ] ;
@@ -41,6 +43,9 @@ if $(HAIKU_GCC_VERSION[1]) < 3 {
SharedLibrary libGL.so : $(sources) : SharedLibrary libGL.so : $(sources) :
# GLU
$(HAIKU_GLU_LIBS)
# Glut # Glut
<opengl>glut.o <opengl>glut.o
src/libs/glut/Jamfile
+3
View File
@@ -55,6 +55,9 @@ if $(HAIKU_GCC_VERSION[1]) < 3 {
} }
# Ensure GLU dependency is met
Includes [ FGristFiles $(sourcesCc) $(sourcesCpp) ]
: $(HAIKU_GLU_HEADERS_DEPENDENCY) ;
# Ensure Mesa dependency is met # Ensure Mesa dependency is met
Includes [ FGristFiles $(sourcesCc) $(sourcesCpp) ] Includes [ FGristFiles $(sourcesCc) $(sourcesCpp) ]
: $(HAIKU_MESA_HEADERS_DEPENDENCY) ; : $(HAIKU_MESA_HEADERS_DEPENDENCY) ;