Merge branch 'gallium-vertex-linear' into gallium-tex-surfaces

[mesa.git] / SConstruct

diff --git a/SConstruct b/SConstruct
index 9b46e6ade2b7fe6489475ccbca5c82f520d98eb2..e7c10fcf527f680c1cadcb57416b0c236ba40e97 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -108,12 +108,6 @@ env.Append(CPPPATH = [
 
 # x86 assembly
 if x86:
-       env.Append(CPPDEFINES = [
-               'USE_X86_ASM', 
-               'USE_MMX_ASM',
-               'USE_3DNOW_ASM',
-               'USE_SSE_ASM',
-       ])
        if gcc: 
                env.Append(CFLAGS = '-m32')
                env.Append(CXXFLAGS = '-m32')
@@ -160,7 +154,7 @@ if llvm:
        env['LINK'] = env['CXX']
 
 # libGL
-if platform not in ('winddk',):
+if platform in ('linux', 'freebsd', 'darwin'):
        env.Append(LIBS = [
                'X11',
                'Xext',