X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fglsl%2FSConscript;h=847e962468541f54961377c4abb8eaaee9659b4f;hb=153b8b35257fb5d68735b5e43e48b0cdb8b15170;hp=8e18626c4049d2b4ced0a0b31b2f7ef0a1cb9360;hpb=9b22427911ad27efc1f36faee9462c6082d0417c;p=mesa.git

diff --git a/src/glsl/SConscript b/src/glsl/SConscript
index 8e18626c404..847e9624685 100644
--- a/src/glsl/SConscript
+++ b/src/glsl/SConscript
@@ -2,34 +2,94 @@ import common
 
 Import('*')
 
+from sys import executable as python_cmd
+
 env = env.Clone()
 
-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',
-]
+env.Prepend(CPPPATH = [
+    '#include',
+    '#src',
+    '#src/mapi',
+    '#src/mesa',
+    '#src/glsl',
+    '#src/glsl/glcpp',
+])
+
+env.Prepend(LIBS = [mesautil])
+
+# Make glcpp-parse.h and glsl_parser.h reachable from the include path.
+env.Append(CPPPATH = [Dir('.').abspath, Dir('glcpp').abspath])
+
+env.Append(YACCFLAGS = '-d -p "glcpp_parser_"')
+
+parser_env = env.Clone()
+parser_env.Append(YACCFLAGS = [
+    '--defines=%s' % File('glsl_parser.h').abspath,
+    '-p', '_mesa_glsl_',
+])
+
+# without this line scons will expect "glsl_parser.hpp" instead of
+# "glsl_parser.h", causing glsl_parser.cpp to be regenerated every time
+parser_env['YACCHXXFILESUFFIX'] = '.h'
+
+glcpp_lexer = env.CFile('glcpp/glcpp-lex.c', 'glcpp/glcpp-lex.l')
+glcpp_parser = env.CFile('glcpp/glcpp-parse.c', 'glcpp/glcpp-parse.y')
+glsl_lexer = parser_env.CXXFile('glsl_lexer.cpp', 'glsl_lexer.ll')
+glsl_parser = parser_env.CXXFile('glsl_parser.cpp', 'glsl_parser.yy')
+
+# common generated sources
+glsl_sources = [
+    glcpp_lexer,
+    glcpp_parser[0],
+    glsl_lexer,
+    glsl_parser[0],
+] 
+
+# parse Makefile.sources
+source_lists = env.ParseSourceList('Makefile.sources')
+
+# add non-generated sources
+for l in ('LIBGLCPP_FILES', 'LIBGLSL_FILES'):
+    glsl_sources += source_lists[l]
+
+if env['msvc']:
+    env.Prepend(CPPPATH = ['#/src/getopt'])
+    env.PrependUnique(LIBS = [getopt])
+
+# Copy these files to avoid generation object files into src/mesa/program
+env.Prepend(CPPPATH = ['#src/mesa/main'])
+env.Command('imports.c', '#src/mesa/main/imports.c', Copy('$TARGET', '$SOURCE'))
+# Copy these files to avoid generation object files into src/mesa/program
+env.Prepend(CPPPATH = ['#src/mesa/program'])
+env.Command('prog_hash_table.c', '#src/mesa/program/prog_hash_table.c', Copy('$TARGET', '$SOURCE'))
+env.Command('symbol_table.c', '#src/mesa/program/symbol_table.c', Copy('$TARGET', '$SOURCE'))
+
+compiler_objs = env.StaticObject(source_lists['GLSL_COMPILER_CXX_FILES'])
+
+mesa_objs = env.StaticObject([
+    'imports.c',
+    'prog_hash_table.c',
+    'symbol_table.c',
+])
+
+compiler_objs += mesa_objs
 
 glsl = env.ConvenienceLibrary(
     target = 'glsl',
-    source = sources,
+    source = glsl_sources,
 )
 
+# SCons builtin dependency scanner doesn't detect that glsl_lexer.ll depends on
+# glsl_parser.h
+env.Depends(glsl, glsl_parser)
+
 Export('glsl')
 
+# Skip building these programs as they will cause SCons error "Two environments
+# with different actions were specified for the same target"
+if env['crosscompile'] or env['embedded']:
+    Return()
+
 env = env.Clone()
 
 if env['platform'] == 'windows':
@@ -39,31 +99,14 @@ if env['platform'] == 'windows':
 
 env.Prepend(LIBS = [glsl])
 
-env.Program(
-    target = 'purify',
-    source = ['apps/purify.c'],
-)
-
-env.Program(
-    target = 'tokenise',
-    source = ['apps/tokenise.c'],
-)
-
-env.Program(
-    target = 'version',
-    source = ['apps/version.c'],
+glsl_compiler = env.Program(
+    target = 'glsl_compiler',
+    source = compiler_objs,
 )
+env.Alias('glsl_compiler', glsl_compiler)
 
-env.Program(
-    target = 'process',
-    source = ['apps/process.c'],
+glcpp = env.Program(
+    target = 'glcpp/glcpp',
+    source = ['glcpp/glcpp.c', 'tests/common.c'] + mesa_objs,
 )
-
-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')
+env.Alias('glcpp', glcpp)