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

Mesa: Reorganize the Mesa BuildFeature

Browse Source 
* Only specify some library deps on gcc4
  as they are unused on gcc2
This commit is contained in:
Alexander von Gluck IV
2013-04-28 16:35:38 +00:00
parent c87173f9b2
commit 292b0d784c
1 changed files with 33 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/BuildFeatures
+14 -10
View File
@@ -355,24 +355,32 @@ if $(TARGET_ARCH) = x86 {
HAIKU_MESA_DIR = [ FDirName $(HAIKU_OPTIONAL_BUILD_PACKAGES_DIR) HAIKU_MESA_DIR = [ FDirName $(HAIKU_OPTIONAL_BUILD_PACKAGES_DIR)
$(HAIKU_MESA_FILE:B) ] ; $(HAIKU_MESA_FILE:B) ] ;
HAIKU_MESA_HEADERS = [ FDirName $(HAIKU_MESA_DIR) include ] ;
HAIKU_MESA_HEADERS_DEPENDENCY = [ ExtractArchive $(HAIKU_MESA_DIR) HAIKU_MESA_HEADERS_DEPENDENCY = [ ExtractArchive $(HAIKU_MESA_DIR)
: include/ : $(zipFile) : extracted-mesa ] ; : include/ : $(zipFile) : extracted-mesa ] ;
# Base Mesa libraries
HAIKU_MESA_LIB = [ ExtractArchive $(HAIKU_MESA_DIR)
:
lib.haiku/libmesa.a
: $(zipFile)
: extracted-mesa ] ;
HAIKU_GLAPI_LIB = [ 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 ] ;
Depends $(HAIKU_MESA_HEADERS_DEPENDENCY) : $(HAIKU_GLU_HEADERS_DEPENDENCY) ;
Depends $(HAIKU_GLAPI_LIBS) : $(HAIKU_GLU_LIBS) ;
# Extended Mesa libraries for newer versions
if $(HAIKU_GCC_VERSION[1]) >= 4 {
HAIKU_GLSL_LIB = [ ExtractArchive $(HAIKU_MESA_DIR) HAIKU_GLSL_LIB = [ ExtractArchive $(HAIKU_MESA_DIR)
: :
lib.haiku/libglsl.a lib.haiku/libglsl.a
: $(zipFile) : $(zipFile)
: extracted-mesa ] ; : extracted-mesa ] ;
HAIKU_MESA_LIB = [ ExtractArchive $(HAIKU_MESA_DIR)
:
lib.haiku/libmesa.a
: $(zipFile)
: extracted-mesa ] ;
HAIKU_GALLIUM_LIB = [ ExtractArchive $(HAIKU_MESA_DIR) HAIKU_GALLIUM_LIB = [ ExtractArchive $(HAIKU_MESA_DIR)
: :
lib.haiku/libgallium.a lib.haiku/libgallium.a
@@ -393,11 +401,7 @@ if $(TARGET_ARCH) = x86 {
: $(zipFile) : $(zipFile)
: extracted-mesa ] ; : extracted-mesa ] ;
} }
}
HAIKU_MESA_HEADERS = [ FDirName $(HAIKU_MESA_DIR) include ] ;
Depends $(HAIKU_MESA_HEADERS_DEPENDENCY) : $(HAIKU_GLU_HEADERS_DEPENDENCY) ;
Depends $(HAIKU_GLAPI_LIBS) : $(HAIKU_GLU_LIBS) ;
EnableBuildFeatures mesa ; EnableBuildFeatures mesa ;
} else { } else {