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

Merge branch 'master' into x86_64

Browse Source
This commit is contained in:
Alex Smith
2012-11-18 16:42:27 +00:00
parent 2913b1dbd2 8a6451b9fd
commit 5ccc0cb224
8 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/HaikuImage
+1
View File
@@ -5,6 +5,7 @@
local X86_ONLY = ; local X86_ONLY = ;
local PPC_ONLY = ; local PPC_ONLY = ;
local M68K_ONLY = ; local M68K_ONLY = ;
local ARM_ONLY = ;
if $(TARGET_ARCH) = x86 { if $(TARGET_ARCH) = x86 {
X86_ONLY = "" ; X86_ONLY = "" ;
} else if $(TARGET_ARCH) = ppc { } else if $(TARGET_ARCH) = ppc {
build/jam/OptionalBuildFeatures
+1 -2
View File
@@ -217,8 +217,7 @@ if $(TARGET_ARCH) = x86 {
local galliumObjects ; local galliumObjects ;
local zipFile ; local zipFile ;
if $(HAIKU_GCC_VERSION[1]) >= 4 { if $(HAIKU_GCC_VERSION[1]) >= 4 {
HAIKU_MESA_FILE = mesa-8.1devel-x86-gcc4-2012-06-07.zip ; HAIKU_MESA_FILE = mesa-9.0-x86-gcc4-2012-11-17.zip ;
#HAIKU_MESA_FILE = mesa-8.1develdbg-x86-gcc4-2012-06-07.zip ;
glslObject = lib.haiku/libglsl.a ; glslObject = lib.haiku/libglsl.a ;
galliumObjects = lib.haiku/libgallium.a ; galliumObjects = lib.haiku/libgallium.a ;
} else { } else {
src/add-ons/screen_savers/flurry/Jamfile
+1
View File
@@ -1,4 +1,5 @@
SubDir HAIKU_TOP src add-ons screen_savers flurry ; SubDir HAIKU_TOP src add-ons screen_savers flurry ;
SubDirSysHdrs $(HAIKU_GLU_HEADERS) ;
SubDirSysHdrs $(HAIKU_MESA_HEADERS) ; SubDirSysHdrs $(HAIKU_MESA_HEADERS) ;
# For GCC2 # For GCC2
src/add-ons/screen_savers/glife/Jamfile
+1
View File
@@ -1,4 +1,5 @@
SubDir HAIKU_TOP src add-ons screen_savers glife ; SubDir HAIKU_TOP src add-ons screen_savers glife ;
SubDirSysHdrs $(HAIKU_GLU_HEADERS) ;
SubDirSysHdrs $(HAIKU_MESA_HEADERS) ; SubDirSysHdrs $(HAIKU_MESA_HEADERS) ;
SetSubDirSupportedPlatformsBeOSCompatible ; SetSubDirSupportedPlatformsBeOSCompatible ;
src/apps/glteapot/Jamfile
+1
View File
@@ -1,4 +1,5 @@
SubDir HAIKU_TOP src apps glteapot ; SubDir HAIKU_TOP src apps glteapot ;
SubDirSysHdrs $(HAIKU_GLU_HEADERS) ;
SubDirSysHdrs $(HAIKU_MESA_HEADERS) ; SubDirSysHdrs $(HAIKU_MESA_HEADERS) ;
SetSubDirSupportedPlatformsBeOSCompatible ; SetSubDirSupportedPlatformsBeOSCompatible ;
src/kits/game/DirectWindow.cpp
+1 -1
View File
@@ -365,7 +365,7 @@ BDirectWindow::GetClippingRegion(BRegion *region, BPoint *origin) const
if (IsLocked() || !_LockDirect()) if (IsLocked() || !_LockDirect())
return B_ERROR; return B_ERROR;
if (fInDirectConnect) { if (!fInDirectConnect) {
_UnlockDirect(); _UnlockDirect();
return B_ERROR; return B_ERROR;
} }
src/libs/glut/Jamfile
+1 -3
View File
@@ -1,4 +1,5 @@
SubDir HAIKU_TOP src libs glut ; SubDir HAIKU_TOP src libs glut ;
SubDirSysHdrs $(HAIKU_GLU_HEADERS) ;
SubDirSysHdrs $(HAIKU_MESA_HEADERS) ; SubDirSysHdrs $(HAIKU_MESA_HEADERS) ;
SetSubDirSupportedPlatformsBeOSCompatible ; SetSubDirSupportedPlatformsBeOSCompatible ;
@@ -55,9 +56,6 @@ 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) ;
src/tests/kits/opengl/glinfo/Jamfile
+1 -1
View File
@@ -1,5 +1,5 @@
SubDir HAIKU_TOP src tests kits opengl glinfo ; SubDir HAIKU_TOP src tests kits opengl glinfo ;
SubDirSysHdrs $(HAIKU_GLU_HEADERS) ;
SubDirSysHdrs $(HAIKU_MESA_HEADERS) ; SubDirSysHdrs $(HAIKU_MESA_HEADERS) ;
# For GCC2 # For GCC2