diff options
| author | Keith Whitwell <keithw@vmware.com> | 2009-01-09 10:08:06 +0000 |
|---|---|---|
| committer | Keith Whitwell <keithw@vmware.com> | 2009-01-09 10:08:06 +0000 |
| commit | e3734593aea202e99e77febea7b86c904080939f (patch) | |
| tree | 69856674e2062c55ec5eec95eb0e31225a943084 /src/glut/glx/SConscript | |
| parent | 221352bbd79a0ea92ce31cffb65537f62ee5668e (diff) | |
| parent | 5cad143e545775acacee294049345c6a3868c51d (diff) | |
Merge commit 'origin/gallium-0.2' into gallium-xlib-rework
Conflicts:
progs/glsl/Makefile
Diffstat (limited to 'src/glut/glx/SConscript')
| -rw-r--r-- | src/glut/glx/SConscript | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/glut/glx/SConscript b/src/glut/glx/SConscript index 99b3bb7df6..cb442ba027 100644 --- a/src/glut/glx/SConscript +++ b/src/glut/glx/SConscript @@ -11,7 +11,6 @@ env.Replace(CPPDEFINES = [ 'BUILD_GLUT32', 'GLUT_BUILDING_LIB', 'MESA', - '_DLL', 'NDEBUG', 'GLUT_NO_WARNING_DISABLE', ]) @@ -38,7 +37,6 @@ sources = [ 'glut_dstr.c', 'glut_event.c', 'glut_ext.c', - 'glut_fcb.c', 'glut_fullscrn.c', 'glut_gamemode.c', 'glut_get.c', @@ -51,6 +49,7 @@ sources = [ 'glut_mesa.c', 'glut_modifier.c', 'glut_overlay.c', + 'glut_ppm.c', 'glut_shapes.c', 'glut_space.c', 'glut_stroke.c', |