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

swrasts: Clean up build system

Browse Source 
* Make two independent rast add-ons to avoid
  file name collisions
* Clean up some gcc2 vs gcc4 jamfile defines
This commit is contained in:
Alexander von Gluck IV
2012-03-12 15:41:09 -05:00
parent 2502c69c60
commit 0b15050616
4 changed files with 17 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/HaikuImage
+11 -2
View File
@@ -589,10 +589,19 @@ AddBootModuleSymlinksToHaikuImage
# add-ons # add-ons
AddFilesToHaikuImage system add-ons accelerants AddFilesToHaikuImage system add-ons accelerants
: $(SYSTEM_ADD_ONS_ACCELERANTS) ; : $(SYSTEM_ADD_ONS_ACCELERANTS) ;
# OpenGL renderers
if $(TARGET_ARCH) = x86 { if $(TARGET_ARCH) = x86 {
AddFilesToHaikuHybridImage system add-ons opengl if $(HAIKU_GCC_VERSION[1]) = 2 {
: Mesa\ Software\ Renderer : : true ; AddFilesToHaikuHybridImage system add-ons opengl
: Legacy\ Software\ Rasterizer : : true ;
} else {
AddFilesToHaikuHybridImage system add-ons opengl
: Software\ Rasterizer : : true ;
# Future Gallium3d
}
} }
AddFilesToHaikuHybridImage system add-ons Translators AddFilesToHaikuHybridImage system add-ons Translators
: $(SYSTEM_ADD_ONS_TRANSLATORS) : : true ; : $(SYSTEM_ADD_ONS_TRANSLATORS) : : true ;
AddFilesToHaikuImage system add-ons locale catalogs AddFilesToHaikuImage system add-ons locale catalogs
src/add-ons/opengl/Jamfile
+2 -8
View File
@@ -1,14 +1,8 @@
SubDir HAIKU_TOP src add-ons opengl ; SubDir HAIKU_TOP src add-ons opengl ;
# Haiku Mesa Software Rasterizer # Haiku Mesa Software Rasterizer
if $(HAIKU_GCC_VERSION[1]) >= 4 { SubInclude HAIKU_TOP src add-ons opengl swrast ;
# Mainline Mesa SubInclude HAIKU_TOP src add-ons opengl swrast_legacy ;
SubInclude HAIKU_TOP src add-ons opengl swrast ;
} else {
# Mesa 7.8.2
SubInclude HAIKU_TOP src add-ons opengl swrast_legacy ;
}
# SubInclude HAIKU_TOP src add-ons opengl nvidia ; # SubInclude HAIKU_TOP src add-ons opengl nvidia ;
# SubInclude HAIKU_TOP src add-ons opengl radeon ; # SubInclude HAIKU_TOP src add-ons opengl radeon ;
src/add-ons/opengl/swrast/Jamfile
+1 -9
View File
@@ -20,14 +20,6 @@ if $(TARGET_PLATFORM) != haiku {
} else if $(TARGET_ARCH) = sparc { } else if $(TARGET_ARCH) = sparc {
defines += USE_SPARC_ASM ; defines += USE_SPARC_ASM ;
} }
# For GCC2
local flags ;
if $(HAIKU_GCC_VERSION[1]) < 3 {
flags = --no-warnings ;
}
SubDirC++Flags [ FDefines $(defines) ] $(flags) ;
} }
@@ -48,7 +40,7 @@ UseHeaders [ FDirName $(HAIKU_MESA_DIR) src mesa glapi ] ;
UseHeaders [ FDirName $(HAIKU_MESA_DIR) src mesa tnl ] ; UseHeaders [ FDirName $(HAIKU_MESA_DIR) src mesa tnl ] ;
UseHeaders [ FDirName $(HAIKU_MESA_DIR) src mesa x86 ] ; UseHeaders [ FDirName $(HAIKU_MESA_DIR) src mesa x86 ] ;
Addon Mesa\ Software\ Renderer : Addon Software\ Rasterizer :
MesaSoftwareRenderer.cpp : MesaSoftwareRenderer.cpp :
libGL.so libGL.so
be be
src/add-ons/opengl/swrast_legacy/Jamfile
+3 -8
View File
@@ -21,13 +21,8 @@ if $(TARGET_PLATFORM) != haiku {
defines += USE_SPARC_ASM ; defines += USE_SPARC_ASM ;
} }
# For GCC2 # For GCC2, GL headers produce warnings
local flags ; SubDirC++Flags [ FDefines $(defines) ] --no-warnings ;
if $(HAIKU_GCC_VERSION[1]) < 3 {
flags = --no-warnings ;
}
SubDirC++Flags [ FDefines $(defines) ] $(flags) ;
} }
@@ -48,7 +43,7 @@ UseHeaders [ FDirName $(HAIKU_MESA_DIR) src mesa glapi ] ;
UseHeaders [ FDirName $(HAIKU_MESA_DIR) src mesa tnl ] ; UseHeaders [ FDirName $(HAIKU_MESA_DIR) src mesa tnl ] ;
UseHeaders [ FDirName $(HAIKU_MESA_DIR) src mesa x86 ] ; UseHeaders [ FDirName $(HAIKU_MESA_DIR) src mesa x86 ] ;
Addon Mesa\ Software\ Renderer : Addon Legacy\ Software\ Rasterizer :
MesaSoftwareRenderer.cpp : MesaSoftwareRenderer.cpp :
libGL.so libGL.so
be be