scons: A few fixes for building mesa on windows.

diff --git a/SConstruct b/SConstruct
index ea624b13a70a5a45784d14cf8b152eae0828fc9c..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')

diff --git a/src/mesa/SConscript b/src/mesa/SConscript
index 80fbdb41f05d5f622934b72a97cdba9fd0727da5..6b99dacf2a6e1b6f30711d2b1335959304e3b089 100644 (file)
--- a/src/mesa/SConscript
+++ b/src/mesa/SConscript
@@ -12,9 +12,19 @@ env.Append(CPPPATH = [
        '#/src/mesa/main',
 ])
 
-env.Append(CFLAGS = [
-       '-std=c99',
-])
+if gcc:
+       env.Append(CFLAGS = [
+               '-std=c99',
+       ])
+
+# x86 assembly
+if x86 and gcc:
+       env.Append(CPPDEFINES = [
+               'USE_X86_ASM', 
+               'USE_MMX_ASM',
+               'USE_3DNOW_ASM',
+               'USE_SSE_ASM',
+       ])
 
 
 #######################################################################
@@ -269,7 +279,7 @@ SPARC_API = [
        'sparc/glapi_sparc.S',
 ]
 
-if x86:
+if x86 and gcc:
        ASM_SOURCES = ASM_C_SOURCES + X86_SOURCES 
        API_SOURCES = X86_API
 else: