--- SConstruct.orig 2021-05-27 12:59:29 UTC +++ SConstruct @@ -19,8 +19,13 @@ AddOption('--fullstatic', action='store_true', # Set libraries used by all configurations and all binaries in rlvm. env = Environment( + ENV=os.environ, tools = ["default", "rlvm"], + **dict((k, v.split()) for k, v in ARGUMENTS.items()) +) +env.Append( + LIBS = ["z"], LOCAL_LIBS = [], @@ -286,6 +291,7 @@ if not config.CheckGuichan(): env.ParseConfig("sdl-config --cflags") env.Append(CFLAGS=["-DFB_USE_FREETYPE"]) env.ParseConfig("pkg-config --cflags --libs freetype2") +config.CheckLibWithHeader('intl', 'libintl.h', "cpp") env = config.Finish() @@ -315,7 +321,6 @@ if GetOption('release'): # Now add release optimizations to the environment env.Append( CPPFLAGS = [ - "-Os", "-DNDEBUG", "-DBOOST_DISABLE_ASSERTS" ] @@ -361,13 +366,7 @@ elif GetOption('pprof'): "profiler"] ) else: - # Add debugging flags to all binaries here - env.Append( - CPPFLAGS = [ - "-g", - "-O0" - ] - ) + pass # Cross platform core of rlvm. Produces librlvm.a and libsystem_sdl.a env.SConscript("SConscript",