diff options
| author | Ian Romanick <[email protected]> | 2010-08-16 19:08:53 -0700 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2010-08-16 19:08:53 -0700 |
| commit | 6c03c576cc49bbb008de66d374f4302ff0fe0390 (patch) | |
| tree | 7ddeb3ee88532d9aef8728b9aa256edf7c125247 /src/mesa/SConscript | |
| parent | 15a3b42e135a3a2cb463ec3cff80a55dd8528051 (diff) | |
| parent | a433cd286c60eb9d4c2114f042709eda0f3de676 (diff) | |
Merge branch 'glsl2'
Conflicts:
src/mesa/program/prog_optimize.c
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 d31b957234b..5c02abc914f 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 @@ -201,6 +203,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', @@ -249,8 +252,7 @@ if env['platform'] != 'winddk': program_sources + vbo_sources + vf_sources + - statetracker_sources + - slang_sources + statetracker_sources ) # @@ -328,7 +330,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 |