Commit 3a3cdb90 authored by José Fonseca's avatar José Fonseca

scons: Build the new glsl2 code.

parent 1ca2945f
......@@ -206,28 +206,6 @@ Export('env')
# TODO: Build several variants at the same time?
# http://www.scons.org/wiki/SimultaneousVariantBuilds
if env['platform'] != common.default_platform:
# GLSL code has to be built twice -- one for the host OS, another for the target OS...
host_env = Environment(
# options are ignored
# default tool is used
tools = ['default', 'custom'],
toolpath = ['#scons'],
ENV = os.environ,
)
host_env['platform'] = common.default_platform
host_env['machine'] = common.default_machine
host_env['debug'] = env['debug']
SConscript(
'src/glsl/SConscript',
variant_dir = os.path.join(env['build'], 'host'),
duplicate = 0, # http://www.scons.org/doc/0.97/HTML/scons-user/x2261.html
exports={'env':host_env},
)
SConscript(
'src/SConscript',
variant_dir = env['build'],
......
......@@ -17,6 +17,7 @@ if env['platform'] == 'windows':
'user32',
'kernel32',
'ws2_32',
talloc,
])
sources = []
......
......@@ -4,23 +4,69 @@ Import('*')
env = env.Clone()
env.Prepend(CPPPATH = [
'#src/mapi',
'#src/mesa',
])
if env['platform'] == 'windows':
env.Prepend(CPPPATH = ['#src/talloc'])
sources = [
'pp/sl_pp_context.c',
'pp/sl_pp_define.c',
'pp/sl_pp_dict.c',
'pp/sl_pp_error.c',
'pp/sl_pp_expression.c',
'pp/sl_pp_extension.c',
'pp/sl_pp_if.c',
'pp/sl_pp_line.c',
'pp/sl_pp_macro.c',
'pp/sl_pp_pragma.c',
'pp/sl_pp_process.c',
'pp/sl_pp_purify.c',
'pp/sl_pp_token.c',
'pp/sl_pp_token_util.c',
'pp/sl_pp_version.c',
'cl/sl_cl_parse.c',
'glcpp/glcpp-lex.c',
'glcpp/glcpp-parse.c',
'glcpp/pp.c',
'ast_expr.cpp',
'ast_function.cpp',
'ast_to_hir.cpp',
'ast_type.cpp',
'builtin_function.cpp',
'glsl_lexer.cpp',
'glsl_parser.cpp',
'glsl_parser_extras.cpp',
'glsl_types.cpp',
'hir_field_selection.cpp',
'ir_algebraic.cpp',
'ir_basic_block.cpp',
'ir_clone.cpp',
'ir_constant_expression.cpp',
'ir_constant_folding.cpp',
'ir_constant_propagation.cpp',
'ir_constant_variable.cpp',
'ir_copy_propagation.cpp',
'ir.cpp',
'ir_dead_code.cpp',
'ir_dead_code_local.cpp',
'ir_dead_functions.cpp',
'ir_div_to_mul_rcp.cpp',
'ir_explog_to_explog2.cpp',
'ir_expression_flattening.cpp',
'ir_function_can_inline.cpp',
'ir_function.cpp',
'ir_function_inlining.cpp',
'ir_hierarchical_visitor.cpp',
'ir_hv_accept.cpp',
'ir_if_return.cpp',
'ir_if_simplification.cpp',
'ir_if_to_cond_assign.cpp',
'ir_import_prototypes.cpp',
'ir_mat_op_to_vec.cpp',
'ir_mod_to_fract.cpp',
'ir_print_visitor.cpp',
'ir_reader.cpp',
'ir_set_program_inouts.cpp',
'ir_structure_splitting.cpp',
'ir_sub_to_add_neg.cpp',
'ir_swizzle_swizzle.cpp',
'ir_tree_grafting.cpp',
'ir_validate.cpp',
'ir_variable.cpp',
'ir_variable_refcount.cpp',
'ir_vec_index_to_cond_assign.cpp',
'ir_vec_index_to_swizzle.cpp',
'linker.cpp',
'link_functions.cpp',
's_expression.cpp',
]
glsl = env.ConvenienceLibrary(
......@@ -30,6 +76,9 @@ glsl = env.ConvenienceLibrary(
Export('glsl')
# FIXME: We can't build the programs because there's a cyclic dependency between tis directory and src/mesa
Return()
env = env.Clone()
if env['platform'] == 'windows':
......@@ -37,33 +86,16 @@ if env['platform'] == 'windows':
'user32',
])
env.Prepend(LIBS = [glsl])
env.Program(
target = 'purify',
source = ['apps/purify.c'],
)
env.Prepend(LIBS = [glsl, talloc])
env.Program(
target = 'tokenise',
source = ['apps/tokenise.c'],
target = 'glsl2',
source = [
'main.cpp',
]
)
env.Program(
target = 'version',
source = ['apps/version.c'],
target = 'glcpp',
source = ['glcpp/glcpp.c'],
)
env.Program(
target = 'process',
source = ['apps/process.c'],
)
glsl_compile = env.Program(
target = 'compile',
source = ['apps/compile.c'],
)
if env['platform'] == common.default_platform:
# Only export the GLSL compiler when building for the host platform
Export('glsl_compile')
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment