diff options
author | Christian König <deathsimple@vodafone.de> | 2011-07-04 15:04:41 +0200 |
---|---|---|
committer | Christian König <deathsimple@vodafone.de> | 2011-07-04 15:04:41 +0200 |
commit | c3b2230b71cb3a00a7f4c0987197d397bada650b (patch) | |
tree | 018f5df0f8b5976ddb56ef4f13e9466587838998 /src/mapi/glapi/SConscript | |
parent | 003401f95c9b59471c22368b7da16fe7a951e490 (diff) | |
parent | 424b1210d951c206e7c2fb8f2778acbd384eb247 (diff) |
Merge remote-tracking branch 'origin/master' into pipe-video
Conflicts:
configure.ac
src/gallium/drivers/r600/r600_state_inlines.h
src/gallium/tests/trivial/Makefile
src/gallium/winsys/g3dvl/dri/XF86dri.c
src/gallium/winsys/g3dvl/dri/driclient.c
src/gallium/winsys/g3dvl/dri/driclient.h
src/gallium/winsys/g3dvl/dri/xf86dri.h
src/gallium/winsys/g3dvl/dri/xf86dristr.h
src/gallium/winsys/r600/drm/r600_bo.c
Diffstat (limited to 'src/mapi/glapi/SConscript')
-rw-r--r-- | src/mapi/glapi/SConscript | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/src/mapi/glapi/SConscript b/src/mapi/glapi/SConscript index 276b2160246..a7764745eda 100644 --- a/src/mapi/glapi/SConscript +++ b/src/mapi/glapi/SConscript @@ -52,30 +52,23 @@ if env['platform'] != 'winddk': if env['gcc'] and env['platform'] != 'windows': if env['machine'] == 'x86': env.Append(CPPDEFINES = [ - 'USE_X86_ASM', - 'USE_MMX_ASM', - 'USE_3DNOW_ASM', - 'USE_SSE_ASM', + 'USE_X86_ASM', ]) glapi_sources += [ 'glapi_x86.S', ] elif env['machine'] == 'x86_64': env.Append(CPPDEFINES = [ - 'USE_X86_64_ASM', + 'USE_X86_64_ASM', ]) glapi_sources += [ 'glapi_x86-64.S' ] - elif env['machine'] == 'ppc': + elif env['machine'] == 'sparc': env.Append(CPPDEFINES = [ - 'USE_PPC_ASM', - 'USE_VMX_ASM', + 'USE_SPARC_ASM', ]) glapi_sources += [ - ] - elif env['machine'] == 'sparc': - glapi_sources += [ 'glapi_sparc.S' ] else: |