Moved Mesa libs (mesa, glu & glut) under src/libs/mesa, where it should have

been since long already.
This should help aljen reintegrate his gallium branch sooner than later, 
which after the speed improvment on softpipe made last days will 
be welcomed, I'll bet ;-)

Maybe it's possible to even have both current Mesa Software Renderer add-on 
*and* Gallium-based SoftPipe one. Will need to actually support renderer 
selection (in OpenGL preference panel or via a missing OpenGL Kit API), 
as today the first add-on found is the only one ever selected...



git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@33282 a95241bf-73f2-0310-859d-f6bbb57e9c96

src/add-ons/opengl/mesa_software_renderer/Jamfile

@@ -7,7 +7,6 @@ if $(TARGET_PLATFORM) != haiku {
 		# We need our public GL headers also when not compiling for Haiku.
 }
 
-
 {
 	local defines ;
 	defines = BEOS_THREADS GNU_ASSEMBLER ;
@@ -24,23 +23,20 @@ if $(TARGET_PLATFORM) != haiku {
 	SubDirC++Flags [ FDefines $(defines) ] ;
 }
 
-UsePrivateHeaders interface opengl ;
 
-UseHeaders [ FDirName $(HAIKU_TOP) src kits opengl mesa ] ;
+UsePrivateHeaders interface ;
-UseHeaders [ FDirName $(HAIKU_TOP) src kits opengl mesa main ] ;
+UseLibraryHeaders mesa ;
-UseHeaders [ FDirName $(HAIKU_TOP) src kits opengl mesa glapi ] ;
+
-UseHeaders [ FDirName $(HAIKU_TOP) src kits opengl mesa tnl ] ;
+UseHeaders [ FDirName $(HAIKU_TOP) src libs mesa mesa ] ;
-UseHeaders [ FDirName $(HAIKU_TOP) src kits opengl mesa x86 ] ;
+UseHeaders [ FDirName $(HAIKU_TOP) src libs mesa mesa main ] ;
-UseHeaders [ FDirName $(HAIKU_TOP) src kits opengl mesa ppc ] ;
+UseHeaders [ FDirName $(HAIKU_TOP) src libs mesa mesa glapi ] ;
-UseHeaders [ FDirName $(HAIKU_TOP) src kits opengl mesa sparc ] ;
+UseHeaders [ FDirName $(HAIKU_TOP) src libs mesa mesa tnl ] ;
+UseHeaders [ FDirName $(HAIKU_TOP) src libs mesa mesa x86 ] ;
+UseHeaders [ FDirName $(HAIKU_TOP) src libs mesa mesa ppc ] ;
+UseHeaders [ FDirName $(HAIKU_TOP) src libs mesa mesa sparc ] ;
 
 Addon Mesa\ Software\ Renderer :
 	MesaSoftwareRenderer.cpp
 	: libGL.so libmesa.a be $(TARGET_LIBSUPC++)
 ;
 
-Package haiku-opengl-cvs : 
-	Mesa\ Software\ Renderer :  
-	boot home config add-ons opengl 
-;
- 

src/add-ons/opengl/nvidia/Jamfile

@@ -10,12 +10,12 @@ if $(TARGET_PLATFORM) != haiku {
 
 UsePrivateHeaders opengl ;
 
-UseHeaders [ FDirName $(HAIKU_TOP) src kits opengl mesa ] ;
+UseHeaders [ FDirName $(HAIKU_TOP) src libs mesa mesa ] ;
-UseHeaders [ FDirName $(HAIKU_TOP) src kits opengl mesa main ] ;
+UseHeaders [ FDirName $(HAIKU_TOP) src libs mesa mesa main ] ;
-UseHeaders [ FDirName $(HAIKU_TOP) src kits opengl mesa glapi ] ;
+UseHeaders [ FDirName $(HAIKU_TOP) src libs mesa mesa glapi ] ;
-UseHeaders [ FDirName $(HAIKU_TOP) src kits opengl mesa tnl ] ;
+UseHeaders [ FDirName $(HAIKU_TOP) src libs mesa mesa tnl ] ;
-UseHeaders [ FDirName $(HAIKU_TOP) src kits opengl mesa x86 ] ;
+UseHeaders [ FDirName $(HAIKU_TOP) src libs mesa mesa x86 ] ;
-UseHeaders [ FDirName $(HAIKU_TOP) src kits opengl mesa ppc ] ;
+UseHeaders [ FDirName $(HAIKU_TOP) src libs mesa mesa ppc ] ;
 
 Addon NVidia\ Hardware\ Renderer : opengl :
 	NVidiaHardwareRenderer.cpp

src/add-ons/opengl/radeon/Jamfile

@@ -10,12 +10,12 @@ if $(TARGET_PLATFORM) != haiku {
 
 UsePrivateHeaders opengl ;
 
-UseHeaders [ FDirName $(HAIKU_TOP) src kits opengl mesa ] ;
+UseHeaders [ FDirName $(HAIKU_TOP) src libs mesa mesa ] ;
-UseHeaders [ FDirName $(HAIKU_TOP) src kits opengl mesa main ] ;
+UseHeaders [ FDirName $(HAIKU_TOP) src libs mesa mesa main ] ;
-UseHeaders [ FDirName $(HAIKU_TOP) src kits opengl mesa glapi ] ;
+UseHeaders [ FDirName $(HAIKU_TOP) src libs mesa mesa glapi ] ;
-UseHeaders [ FDirName $(HAIKU_TOP) src kits opengl mesa tnl ] ;
+UseHeaders [ FDirName $(HAIKU_TOP) src libs mesa mesa tnl ] ;
-UseHeaders [ FDirName $(HAIKU_TOP) src kits opengl mesa x86 ] ;
+UseHeaders [ FDirName $(HAIKU_TOP) src libs mesa mesa x86 ] ;
-UseHeaders [ FDirName $(HAIKU_TOP) src kits opengl mesa ppc ] ;
+UseHeaders [ FDirName $(HAIKU_TOP) src libs mesa mesa ppc ] ;
 
 Addon Radeon\ Hardware\ Renderer : opengl :
 	RadeonHardwareRenderer.cpp

src/kits/opengl/Jamfile

@@ -2,7 +2,8 @@ SubDir HAIKU_TOP src kits opengl ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
-UsePrivateHeaders interface opengl ;
+UsePrivateHeaders interface ;
+UseLibraryHeaders mesa ;
 UsePrivateSystemHeaders ;
 
 if $(TARGET_PLATFORM) != haiku {
@@ -11,14 +12,14 @@ if $(TARGET_PLATFORM) != haiku {
 }
 
 
-UseHeaders [ FDirName $(SUBDIR) mesa ] ;
+UseHeaders [ FDirName $(HAIKU_TOP) src libs mesa mesa ] ;
-UseHeaders [ FDirName $(SUBDIR) mesa main ] ;
+UseHeaders [ FDirName $(HAIKU_TOP) src libs mesa mesa main ] ;
-UseHeaders [ FDirName $(SUBDIR) mesa glapi ] ;
+UseHeaders [ FDirName $(HAIKU_TOP) src libs mesa mesa glapi ] ;
-UseHeaders [ FDirName $(SUBDIR) mesa math ] ;
+UseHeaders [ FDirName $(HAIKU_TOP) src libs mesa mesa math ] ;
-UseHeaders [ FDirName $(SUBDIR) mesa tnl ] ;
+UseHeaders [ FDirName $(HAIKU_TOP) src libs mesa mesa tnl ] ;
-UseHeaders [ FDirName $(SUBDIR) mesa shader ] ;
+UseHeaders [ FDirName $(HAIKU_TOP) src libs mesa mesa shader ] ;
-UseHeaders [ FDirName $(SUBDIR) mesa swrast ] ;
+UseHeaders [ FDirName $(HAIKU_TOP) src libs mesa mesa swrast ] ;
-UseHeaders [ FDirName $(SUBDIR) mesa swrast_setup ] ;
+UseHeaders [ FDirName $(HAIKU_TOP) src libs mesa mesa swrast_setup ] ;
 
 {
 	local defines ;
@@ -36,6 +37,7 @@ UseHeaders [ FDirName $(SUBDIR) mesa swrast_setup ] ;
 	defines = [ FDefines $(defines) ] ;
 	SubDirCcFlags $(defines) ;
 	SubDirC++Flags $(defines) ;
+	SubDirAsFlags $(defines) ;
 }
 
 SharedLibrary libGL.so :
@@ -43,7 +45,6 @@ SharedLibrary libGL.so :
 	GLDispatcher.cpp
 	GLRenderer.cpp
 	GLRendererRoster.cpp
-
 	:
 
 	# Mesa GL API dispatching code
@@ -60,11 +61,3 @@ SharedLibrary libGL.so :
 	game			# BWindowScreen needed by BGLScreen stub class 
 	$(TARGET_LIBSTDC++)
 ;
-
-Package haiku-opengl-cvs :
-	libGL.so : 
-	boot beos system lib ;
-
-SubInclude HAIKU_TOP src kits opengl glu ;
-SubInclude HAIKU_TOP src kits opengl glut ;
-SubInclude HAIKU_TOP src kits opengl mesa ;

src/libs/Jamfile

@@ -18,6 +18,7 @@ SubInclude HAIKU_TOP src libs libtelnet ;
 SubInclude HAIKU_TOP src libs linprog ;
 SubInclude HAIKU_TOP src libs lp_solve ;
 SubInclude HAIKU_TOP src libs mapm ;
+SubInclude HAIKU_TOP src libs mesa ;
 SubInclude HAIKU_TOP src libs ncurses ;
 SubInclude HAIKU_TOP src libs pdflib ;
 SubInclude HAIKU_TOP src libs png ;

src/libs/mesa/glu/Jamfile

@@ -1,4 +1,4 @@
-SubDir HAIKU_TOP src kits opengl glu ;
+SubDir HAIKU_TOP src libs mesa glu ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;