i915: Remove superfluous MI_NOOP from vertex emission

[mesa.git] / configs / beos

diff --git a/configs/beos b/configs/beos
index 1e777e47dd1465e258391a1d32f2abeaf4a3ac95..69a8fd4269100aa25e893cdae524726d0104956f 100644 (file)
--- a/configs/beos
+++ b/configs/beos
@@ -26,7 +26,8 @@ ifeq ($(CPU), x86)
                -DUSE_3DNOW_ASM \
                -DUSE_SSE_ASM
        
-       ASM_SOURCES = $(X86_SOURCES) $(X86_API)
+       MESA_ASM_SOURCES = $(X86_SOURCES)
+       GLAPI_ASM_SOURCES = $(X86_API)
 
        CC = gcc
        CXX = g++
@@ -38,6 +39,10 @@ ifeq ($(CPU), x86)
 
        CXXFLAGS = $(CFLAGS)
 
+       # Work around aliasing bugs - developers should comment this out
+       CFLAGS += -fno-strict-aliasing
+       CXXFLAGS += -fno-strict-aliasing
+
        LDFLAGS += -Xlinker
 
        ifdef DEBUG
@@ -85,15 +90,15 @@ else
 endif
 
 # Directories
-SRC_DIRS = mesa glu glut/beos
+SRC_DIRS = gallium mesa glu glut/beos glew
 GLU_DIRS = sgi
 DRIVER_DIRS = beos
 PROGRAM_DIRS = beos samples redbook demos tests
 
 # Library/program dependencies
 GL_LIB_DEPS = 
-OSMESA_LIB_DEPS = -L$(LIB_DIR) -lGL
+OSMESA_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB)
 GLU_LIB_DEPS =  
-GLUT_LIB_DEPS = -lgame -L$(LIB_DIR) -lGL
-APP_LIB_DEPS = -lbe -L$(LIB_DIR) -lGL -lglut
+GLUT_LIB_DEPS = -lgame -L$(TOP)/$(LIB_DIR) -l$(GL_LIB)
+APP_LIB_DEPS = -lbe -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -l$(GLUT_LIB)