diff options
| author | José Fonseca <jfonseca@vmware.com> | 2010-08-13 13:55:34 +0100 |
|---|---|---|
| committer | José Fonseca <jfonseca@vmware.com> | 2010-08-13 13:55:34 +0100 |
| commit | 3a3cdb909da5b02edf921fcb5a009dfc2868d23d (patch) | |
| tree | 484f86b3cd2ebbda56a27228f1bf5801e92d97a0 /src/mesa/SConscript | |
| parent | 1ca2945f84e9cb298a7d4ad4ec9a0578097c146d (diff) | |
scons: Build the new glsl2 code.
Diffstat (limited to 'src/mesa/SConscript')
| -rw-r--r-- | src/mesa/SConscript | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/mesa/SConscript b/src/mesa/SConscript index 79e9b4553b..5200a244f2 100644 --- a/src/mesa/SConscript +++ b/src/mesa/SConscript @@ -10,6 +10,7 @@ if env['platform'] != 'winddk': env.Append(CPPPATH = [ '#/src/mapi', + '#/src/glsl', '#/src/mesa', ]) @@ -19,6 +20,7 @@ if env['platform'] != 'winddk': 'BUILD_GL32', # declare gl* as __declspec(dllexport) in Mesa headers 'WIN32_THREADS', # use Win32 thread API ]) + env.Prepend(CPPPATH = ['#src/talloc']) # # Source files @@ -200,6 +202,7 @@ if env['platform'] != 'winddk': program_sources = [ 'program/arbprogparse.c', 'program/hash_table.c', + 'program/ir_to_mesa.cpp', 'program/lex.yy.c', 'program/nvfragparse.c', 'program/nvvertparse.c', @@ -248,8 +251,7 @@ if env['platform'] != 'winddk': program_sources + vbo_sources + vf_sources + - statetracker_sources + - slang_sources + statetracker_sources ) # @@ -327,7 +329,7 @@ if env['platform'] != 'winddk': # build dir) to the include path env.Append(CPPPATH = [matypes[0].dir]) - SConscript('slang/library/SConscript') + #SConscript('slang/library/SConscript') # # Libraries |