Cosmetic fixes to SCons buildsystem

- Removed trailing spaces
- Made sure all indentation is done using tabs (fixes #39)
- Potentially fixed an identation issue for openssl check
This commit is contained in:
Rémi Verschelde
2015-11-01 20:53:26 +01:00
parent ae3d4ac193
commit 399b1b0474
65 changed files with 46 additions and 159 deletions

View File

@ -59,7 +59,7 @@ platform_arg = ARGUMENTS.get("platform", False)
if (os.name=="posix"): if (os.name=="posix"):
pass pass
elif (os.name=="nt"): elif (os.name=="nt"):
if (os.getenv("VSINSTALLDIR")==None or platform_arg=="android"): if (os.getenv("VSINSTALLDIR")==None or platform_arg=="android"):
custom_tools=['mingw'] custom_tools=['mingw']
env_base=Environment(tools=custom_tools,ENV = {'PATH' : os.environ['PATH']}); env_base=Environment(tools=custom_tools,ENV = {'PATH' : os.environ['PATH']});
@ -229,7 +229,7 @@ if selected_platform in platform_list:
#must happen after the flags, so when flags are used by configure, stuff happens (ie, ssl on x11) #must happen after the flags, so when flags are used by configure, stuff happens (ie, ssl on x11)
detect.configure(env) detect.configure(env)
#env['platform_libsuffix'] = env['LIBSUFFIX'] #env['platform_libsuffix'] = env['LIBSUFFIX']
suffix="."+selected_platform suffix="."+selected_platform
@ -284,10 +284,11 @@ if selected_platform in platform_list:
if (env['musepack']=='yes'): if (env['musepack']=='yes'):
env.Append(CPPFLAGS=['-DMUSEPACK_ENABLED']); env.Append(CPPFLAGS=['-DMUSEPACK_ENABLED']);
if (env['openssl']!='no'):
env.Append(CPPFLAGS=['-DOPENSSL_ENABLED']); if (env['openssl']!='no'):
if (env['openssl']=="builtin"): env.Append(CPPFLAGS=['-DOPENSSL_ENABLED']);
env.Append(CPPPATH=['#drivers/builtin_openssl2']) if (env['openssl']=="builtin"):
env.Append(CPPPATH=['#drivers/builtin_openssl2'])
if (env["builtin_zlib"]=='yes'): if (env["builtin_zlib"]=='yes'):
env.Append(CPPPATH=['#drivers/builtin_zlib/zlib']) env.Append(CPPPATH=['#drivers/builtin_zlib/zlib'])

View File

@ -10,5 +10,3 @@ Export('env')
lib = env.Library("tests",env.tests_sources) lib = env.Library("tests",env.tests_sources)
env.Prepend(LIBS=[lib]) env.Prepend(LIBS=[lib])

View File

@ -63,5 +63,3 @@ SConscript('bind/SCsub');
lib = env.Library("core",env.core_sources) lib = env.Library("core",env.core_sources)
env.Prepend(LIBS=[lib]) env.Prepend(LIBS=[lib])

View File

@ -3,5 +3,3 @@ Import('env')
env.add_source_files(env.core_sources,"*.cpp") env.add_source_files(env.core_sources,"*.cpp")
Export('env') Export('env')

View File

@ -5,5 +5,3 @@ env.add_source_files(env.core_sources,"*.c")
#env.core_sources.append("io/fastlz.c") #env.core_sources.append("io/fastlz.c")
Export('env') Export('env')

View File

@ -3,5 +3,3 @@ Import('env')
env.add_source_files(env.core_sources,"*.cpp") env.add_source_files(env.core_sources,"*.cpp")
Export('env') Export('env')

View File

@ -3,5 +3,3 @@ Import('env')
env.add_source_files(env.core_sources,"*.cpp") env.add_source_files(env.core_sources,"*.cpp")
Export('env') Export('env')

View File

@ -93,4 +93,3 @@ env.Prepend(LIBS=lib_list)
#lib = env.Library("drivers",env.drivers_sources) #lib = env.Library("drivers",env.drivers_sources)
#env.Prepend(LIBS=[lib]) #env.Prepend(LIBS=[lib])

View File

@ -3,5 +3,3 @@ Import('env')
env.add_source_files(env.drivers_sources,"*.cpp") env.add_source_files(env.drivers_sources,"*.cpp")
Export('env') Export('env')

View File

@ -3,5 +3,3 @@ Import('env')
env.add_source_files(env.drivers_sources,"*.cpp") env.add_source_files(env.drivers_sources,"*.cpp")
Export('env') Export('env')

View File

@ -8,4 +8,3 @@ dds_sources = [
env.drivers_sources+=dds_sources env.drivers_sources+=dds_sources
#env.add_source_files(env.drivers_sources, dds_sources) #env.add_source_files(env.drivers_sources, dds_sources)

View File

@ -12,4 +12,3 @@ if (env["etc1"] != "no"):
#env.add_source_files(env.drivers_sources, etc_sources) #env.add_source_files(env.drivers_sources, etc_sources)
Export('env') Export('env')

View File

@ -3,4 +3,3 @@ Export('env');
env.add_source_files(env.drivers_sources,"*.cpp") env.add_source_files(env.drivers_sources,"*.cpp")
env.add_source_files(env.drivers_sources,"*.c") env.add_source_files(env.drivers_sources,"*.c")

View File

@ -6,5 +6,3 @@ if env['BUILDERS'].has_key('GLSL120GLES'):
env.GLSL120GLES('canvas_shadow.glsl'); env.GLSL120GLES('canvas_shadow.glsl');
env.GLSL120GLES('blur.glsl'); env.GLSL120GLES('blur.glsl');
env.GLSL120GLES('copy.glsl'); env.GLSL120GLES('copy.glsl');

View File

@ -10,4 +10,3 @@ jpg_sources = [
env.drivers_sources+=jpg_sources env.drivers_sources+=jpg_sources
#env.add_source_files(env.drivers_sources, jpg_sources) #env.add_source_files(env.drivers_sources, jpg_sources)

View File

@ -19,4 +19,3 @@ env.add_source_files(env.drivers_sources,"*.cpp")
#env.add_source_files(env.drivers_sources, mpc_sources) #env.add_source_files(env.drivers_sources, mpc_sources)
Export('env') Export('env')

View File

@ -3,4 +3,3 @@ Export('env');
env.add_source_files(env.drivers_sources,"*.cpp") env.add_source_files(env.drivers_sources,"*.cpp")
#env.add_source_files(env.drivers_sources,"*.c") #env.add_source_files(env.drivers_sources,"*.c")

View File

@ -1,4 +1,3 @@
Import('env') Import('env')
sources = [ sources = [
@ -6,4 +5,3 @@ sources = [
'regex.cpp', 'regex.cpp',
] ]
env.add_source_files(env.drivers_sources, sources) env.add_source_files(env.drivers_sources, sources)

View File

@ -8,4 +8,3 @@ ogg_sources = [
if env['theora'] != "yes" or env['use_theoraplayer_binary'] != "yes": if env['theora'] != "yes" or env['use_theoraplayer_binary'] != "yes":
env.drivers_sources+=ogg_sources env.drivers_sources+=ogg_sources

View File

@ -4,5 +4,3 @@ env.add_source_files(env.drivers_sources,"*.cpp")
env.add_source_files(env.drivers_sources,"*.c") env.add_source_files(env.drivers_sources,"*.c")
Export('env') Export('env')

View File

@ -38,4 +38,3 @@ env.drivers_sources+=png_sources
#env.add_source_files(env.drivers_sources, png_sources) #env.add_source_files(env.drivers_sources, png_sources)
Export('env') Export('env')

View File

@ -21,4 +21,3 @@ if (env["tools"]=="yes"):
#env.add_source_files(env.drivers_sources, squish_sources) #env.add_source_files(env.drivers_sources, squish_sources)
Export('env') Export('env')

View File

@ -1,4 +1,3 @@
Import('env') Import('env')
sources = [ sources = [
@ -34,5 +33,3 @@ sources = [
if env['use_theoraplayer_binary'] != "yes": if env['use_theoraplayer_binary'] != "yes":
env.drivers_sources += sources env.drivers_sources += sources

View File

@ -3,5 +3,3 @@ Import('env')
env.add_source_files(env.drivers_sources,"*.cpp") env.add_source_files(env.drivers_sources,"*.cpp")
Export('env') Export('env')

View File

@ -1,4 +1,3 @@
Import('env') Import('env')
sources = [ sources = [
@ -37,4 +36,3 @@ env.drivers_sources += sources
if env['theora'] != "yes" or env['use_theoraplayer_binary'] != "yes": if env['theora'] != "yes" or env['use_theoraplayer_binary'] != "yes":
env.drivers_sources += sources_lib env.drivers_sources += sources_lib

View File

@ -61,4 +61,3 @@ env.drivers_sources+=webp_sources
#env.add_source_files(env.drivers_sources, webp_sources) #env.add_source_files(env.drivers_sources, webp_sources)
Export('env') Export('env')

View File

@ -3,5 +3,3 @@ Import('env')
env.add_source_files(env.drivers_sources,"*.cpp") env.add_source_files(env.drivers_sources,"*.cpp")
Export('env') Export('env')

View File

@ -8,5 +8,3 @@ Export('env')
lib = env.Library("main",env.main_sources) lib = env.Library("main",env.main_sources)
env.Prepend(LIBS=[lib]) env.Prepend(LIBS=[lib])

View File

@ -19,5 +19,3 @@ for x in env.module_list:
lib = env_modules.Library("modules",env.modules_sources) lib = env_modules.Library("modules",env.modules_sources)
env.Prepend(LIBS=[lib]) env.Prepend(LIBS=[lib])

View File

@ -3,5 +3,3 @@ Import('env')
env.add_source_files(env.modules_sources,"*.cpp") env.add_source_files(env.modules_sources,"*.cpp")
Export('env') Export('env')

View File

@ -1,6 +1,3 @@
Import('env') Import('env')
env.add_source_files(env.modules_sources,"*.cpp") env.add_source_files(env.modules_sources,"*.cpp")

View File

@ -19,4 +19,3 @@ if env['bb10_lgles_override'] == "yes":
prog = None prog = None
prog = env_bps.Program('#bin/godot', bb10_lib) prog = env_bps.Program('#bin/godot', bb10_lib)

View File

@ -36,5 +36,3 @@ java -jar $ALCHEMY/usr/lib/asc2.jar -md -strict -optimize -AS3 \
-import ../platform/flash/lib/libGL.abc \ -import ../platform/flash/lib/libGL.abc \
../platform/flash/Console.as ../platform/flash/Console.as
""" """

View File

@ -3,5 +3,3 @@ Import('env')
env.add_source_files(env.scene_sources,"*.cpp") env.add_source_files(env.scene_sources,"*.cpp")
Export('env') Export('env')

View File

@ -9,5 +9,3 @@ else:
env.add_source_files(env.scene_sources,"*.cpp") env.add_source_files(env.scene_sources,"*.cpp")
Export('env') Export('env')

View File

@ -18,5 +18,3 @@ SConscript('io/SCsub');
lib = env.Library("scene",env.scene_sources) lib = env.Library("scene",env.scene_sources)
env.Prepend(LIBS=[lib]) env.Prepend(LIBS=[lib])

View File

@ -3,5 +3,3 @@ Import('env')
env.add_source_files(env.scene_sources,"*.cpp") env.add_source_files(env.scene_sources,"*.cpp")
Export('env') Export('env')

View File

@ -3,5 +3,3 @@ Import('env')
env.add_source_files(env.scene_sources,"*.cpp") env.add_source_files(env.scene_sources,"*.cpp")
Export('env') Export('env')

View File

@ -3,5 +3,3 @@ Import('env')
env.add_source_files(env.scene_sources,"*.cpp") env.add_source_files(env.scene_sources,"*.cpp")
Export('env') Export('env')

View File

@ -3,5 +3,3 @@ Import('env')
env.add_source_files(env.scene_sources,"*.cpp") env.add_source_files(env.scene_sources,"*.cpp")
Export('env') Export('env')

View File

@ -3,5 +3,3 @@ Import('env')
env.add_source_files(env.scene_sources,"*.cpp") env.add_source_files(env.scene_sources,"*.cpp")
Export('env') Export('env')

View File

@ -6,4 +6,3 @@ env.add_source_files(env.scene_sources,"*.c")
Export('env') Export('env')
SConscript("default_theme/SCsub"); SConscript("default_theme/SCsub");

View File

@ -3,5 +3,3 @@ Import('env')
env.add_source_files(env.scene_sources,"*.cpp") env.add_source_files(env.scene_sources,"*.cpp")
Export('env') Export('env')

View File

@ -15,5 +15,3 @@ SConscript('spatial_sound_2d/SCsub');
lib = env.Library("servers",env.servers_sources) lib = env.Library("servers",env.servers_sources)
env.Prepend(LIBS=[lib]) env.Prepend(LIBS=[lib])

View File

@ -3,5 +3,3 @@ Import('env')
env.add_source_files(env.servers_sources,"*.cpp") env.add_source_files(env.servers_sources,"*.cpp")
Export('env') Export('env')

View File

@ -5,5 +5,3 @@ env.add_source_files(env.servers_sources,"*.cpp")
Export('env') Export('env')
SConscript("joints/SCsub") SConscript("joints/SCsub")

View File

@ -3,6 +3,3 @@ Import('env')
env.add_source_files(env.servers_sources,"*.cpp") env.add_source_files(env.servers_sources,"*.cpp")
Export('env') Export('env')

View File

@ -1,4 +1,3 @@
Import('env') Import('env')
env.add_source_files(env.servers_sources,"*.cpp") env.add_source_files(env.servers_sources,"*.cpp")

View File

@ -3,5 +3,3 @@ Import('env')
env.add_source_files(env.servers_sources,"*.cpp") env.add_source_files(env.servers_sources,"*.cpp")
Export('env') Export('env')

View File

@ -3,5 +3,3 @@ Import('env')
env.add_source_files(env.servers_sources,"*.cpp") env.add_source_files(env.servers_sources,"*.cpp")
Export('env') Export('env')

View File

@ -3,5 +3,3 @@ Import('env')
env.add_source_files(env.servers_sources,"*.cpp") env.add_source_files(env.servers_sources,"*.cpp")
Export('env') Export('env')

View File

@ -17,5 +17,3 @@ if (env["tools"]!="no"):
lib = env.Library("tool",env.tool_sources) lib = env.Library("tool",env.tool_sources)
env.Prepend(LIBS=[lib]) env.Prepend(LIBS=[lib])

View File

@ -3,5 +3,3 @@ Import('env')
env.add_source_files(env.tool_sources,"*.cpp") env.add_source_files(env.tool_sources,"*.cpp")
Export('env') Export('env')

View File

@ -3,5 +3,3 @@ Import('env')
env.add_source_files(env.tool_sources,"*.cpp") env.add_source_files(env.tool_sources,"*.cpp")
Export('env') Export('env')

View File

@ -3,5 +3,3 @@ Import('env')
env.add_source_files(env.tool_sources,"*.cpp") env.add_source_files(env.tool_sources,"*.cpp")
Export('env') Export('env')

View File

@ -56,4 +56,3 @@ if (env["tools"]=="yes"):
SConscript('plugins/SCsub'); SConscript('plugins/SCsub');
SConscript('fileserver/SCsub'); SConscript('fileserver/SCsub');
SConscript('io_plugins/SCsub'); SConscript('io_plugins/SCsub');

View File

@ -1,7 +1,3 @@
Import('env') Import('env')
Export('env') Export('env')
env.add_source_files(env.tool_sources,"*.cpp") env.add_source_files(env.tool_sources,"*.cpp")

View File

@ -63,4 +63,3 @@ env.Alias('editor_icons',[env.MakeEditorIconsBuilder('#tools/editor/editor_icons
env.tool_sources.append("#tools/editor/editor_icons.cpp") env.tool_sources.append("#tools/editor/editor_icons.cpp")
Export('env') Export('env')

View File

@ -1,7 +1,3 @@
Import('env') Import('env')
Export('env') Export('env')
env.add_source_files(env.tool_sources,"*.cpp") env.add_source_files(env.tool_sources,"*.cpp")

View File

@ -1,7 +1,3 @@
Import('env') Import('env')
Export('env') Export('env')
env.add_source_files(env.tool_sources,"*.cpp") env.add_source_files(env.tool_sources,"*.cpp")

View File

@ -67,5 +67,3 @@ if (env["freetype"]=="builtin"):
# env.Prepend(LIBS=[lib]) # env.Prepend(LIBS=[lib])
Export('env') Export('env')

View File

@ -2,4 +2,3 @@ Import('env')
if env["tools"] == "yes": if env["tools"] == "yes":
env.add_source_files(env.tool_sources, "*.cpp") env.add_source_files(env.tool_sources, "*.cpp")