diff options
| author | José Fonseca <jrfonseca@tungstengraphics.com> | 2008-04-26 01:14:32 +0900 |
|---|---|---|
| committer | José Fonseca <jrfonseca@tungstengraphics.com> | 2008-04-26 01:14:52 +0900 |
| commit | 658f5e721316f1983ae39b6b94b992baca0e2bc2 (patch) | |
| tree | 9e12a0836d6573e47c1f0dbf9c592f279a6eea46 | |
| parent | 1aedbf9efe4d1cf45be3c27fc3a0eb4a69a1b1b9 (diff) | |
scons: A few fixes for building mesa on windows.
| -rw-r--r-- | SConstruct | 6 | ||||
| -rw-r--r-- | src/mesa/SConscript | 18 |
2 files changed, 14 insertions, 10 deletions
diff --git a/SConstruct b/SConstruct index ea624b13a7..e7c10fcf52 100644 --- 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 80fbdb41f0..6b99dacf2a 100644 --- 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: |