Fixed building libGL.so for non haiku targets.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@15100 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
+10
-2
@@ -4,6 +4,12 @@ SetSubDirSupportedPlatformsBeOSCompatible ;
|
|||||||
|
|
||||||
UsePrivateHeaders opengl ;
|
UsePrivateHeaders opengl ;
|
||||||
|
|
||||||
|
if $(TARGET_PLATFORM) != haiku {
|
||||||
|
UseHeaders [ FDirName $(HAIKU_TOP) headers os opengl ] : true ;
|
||||||
|
# We need the public GL headers also when not compiling for Haiku.
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
UseHeaders [ FDirName $(SUBDIR) mesa ] ;
|
UseHeaders [ FDirName $(SUBDIR) mesa ] ;
|
||||||
UseHeaders [ FDirName $(SUBDIR) mesa main ] ;
|
UseHeaders [ FDirName $(SUBDIR) mesa main ] ;
|
||||||
UseHeaders [ FDirName $(SUBDIR) mesa glapi ] ;
|
UseHeaders [ FDirName $(SUBDIR) mesa glapi ] ;
|
||||||
@@ -43,9 +49,11 @@ SharedLibrary libGL.so :
|
|||||||
# GLUT API is included in libGL.so under Haiku, not a separate libglut.so library
|
# GLUT API is included in libGL.so under Haiku, not a separate libglut.so library
|
||||||
<opengl>glut.o
|
<opengl>glut.o
|
||||||
|
|
||||||
libbe.so
|
|
||||||
libgame.so # BWindowScreen needed by BGLScreen stub class
|
|
||||||
libmesa.a # For GL API dispatching, mostly
|
libmesa.a # For GL API dispatching, mostly
|
||||||
|
|
||||||
|
# External libs:
|
||||||
|
be
|
||||||
|
game # BWindowScreen needed by BGLScreen stub class
|
||||||
;
|
;
|
||||||
|
|
||||||
Package haiku-opengl-cvs :
|
Package haiku-opengl-cvs :
|
||||||
|
|||||||
@@ -1,5 +1,12 @@
|
|||||||
SubDir HAIKU_TOP src kits opengl glu ;
|
SubDir HAIKU_TOP src kits opengl glu ;
|
||||||
|
|
||||||
|
SetSubDirSupportedPlatformsBeOSCompatible ;
|
||||||
|
|
||||||
|
if $(TARGET_PLATFORM) != haiku {
|
||||||
|
UseHeaders [ FDirName $(HAIKU_TOP) headers os opengl ] : true ;
|
||||||
|
# We need the public GL headers also when not compiling for Haiku.
|
||||||
|
}
|
||||||
|
|
||||||
UseHeaders [ FDirName $(SUBDIR) include ] ;
|
UseHeaders [ FDirName $(SUBDIR) include ] ;
|
||||||
UseHeaders [ FDirName $(SUBDIR) libnurbs interface ] ;
|
UseHeaders [ FDirName $(SUBDIR) libnurbs interface ] ;
|
||||||
UseHeaders [ FDirName $(SUBDIR) libnurbs internals ] ;
|
UseHeaders [ FDirName $(SUBDIR) libnurbs internals ] ;
|
||||||
|
|||||||
@@ -1,5 +1,12 @@
|
|||||||
SubDir HAIKU_TOP src kits opengl mesa ;
|
SubDir HAIKU_TOP src kits opengl mesa ;
|
||||||
|
|
||||||
|
SetSubDirSupportedPlatformsBeOSCompatible ;
|
||||||
|
|
||||||
|
if $(TARGET_PLATFORM) != haiku {
|
||||||
|
UseHeaders [ FDirName $(HAIKU_TOP) headers os opengl ] : true ;
|
||||||
|
# We need the public GL headers also when not compiling for Haiku.
|
||||||
|
}
|
||||||
|
|
||||||
UsePrivateHeaders opengl ;
|
UsePrivateHeaders opengl ;
|
||||||
|
|
||||||
UseHeaders [ FDirName $(SUBDIR) main ] ;
|
UseHeaders [ FDirName $(SUBDIR) main ] ;
|
||||||
|
|||||||
Reference in New Issue
Block a user