From 982609f4cf2afc4e0afd450aa24907986bca41ab Mon Sep 17 00:00:00 2001 From: José Fonseca Date: Fri, 11 Feb 2011 17:38:54 +0000 Subject: scons: builtin_glsl_function on windows needs bundled getopt. --- src/glsl/SConscript | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'src/glsl') diff --git a/src/glsl/SConscript b/src/glsl/SConscript index ca17ddd6a2..7c6b6ae8c4 100644 --- a/src/glsl/SConscript +++ b/src/glsl/SConscript @@ -82,7 +82,9 @@ sources = [ ] -if not env['crosscompile'] or env['platform'] == 'embedded': +if env['crosscompile'] and env['platform'] != 'embedded': + Import('builtin_glsl_function') +else: if env['msvc']: env.Prepend(CPPPATH = ['#/src/getopt']) env.PrependUnique(LIBS = [getopt]) @@ -105,6 +107,10 @@ if not env['crosscompile'] or env['platform'] == 'embedded': Export('builtin_glsl_function') + if env['hostonly']: + Return() + + sources += builtin_glsl_function glsl = env.ConvenienceLibrary( -- cgit v1.2.3