Merge commit 'origin/master' into gallium-0.2

[mesa.git] / configs / beos

diff --git a/configs/beos b/configs/beos
index 2b74af739d0bb6edae31ddbb33ade90fb25d4fe0..897c36868feb69d237c92664b817d69452b0f19f 100644 (file)
--- a/configs/beos
+++ b/configs/beos
@@ -26,8 +26,8 @@ ifeq ($(CPU), x86)
                -DUSE_3DNOW_ASM \
                -DUSE_SSE_ASM
        
-       ASM_SOURCES = $(X86_SOURCES)
-       ASM_API = $(X86_API)
+       MESA_ASM_SOURCES = $(X86_SOURCES)
+       GLAPI_ASM_SOURCES = $(X86_API)
 
        CC = gcc
        CXX = g++
@@ -39,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