Build System Changes
-=-=-=-=-=-=-=-=-=-= Build System: -Big clean up of SCons, changed how builds are done to a much cleaner method (check the Github Wiki for instructions). -Deactivated BlackBerry10 (sorry), if no mantainer found (or BlackBerry does not send us a Passort ;), platform will be removed as we have no longer devices to test. Engine: -Removed deprecated object and scene format (was in there just for compatibility, not in use since a long time). -Added ability to open scenes even if a node type was removed (will try to guess the closest type). -Removed deprecated node types.
This commit is contained in:
@@ -6,8 +6,6 @@ javascript_files = [
|
||||
"javascript_main.cpp"
|
||||
]
|
||||
|
||||
#env.Depends('#core/math/vector3.h', 'vector3_psp.h')
|
||||
|
||||
#obj = env.SharedObject('godot_javascript.cpp')
|
||||
|
||||
env_javascript = env.Clone()
|
||||
@@ -22,4 +20,4 @@ prog = None
|
||||
|
||||
#env_javascript.SharedLibrary("#platform/javascript/libgodot_javascript.so",[javascript_objects])
|
||||
|
||||
env.Program('#bin/godot.html', javascript_objects)
|
||||
env.Program('#bin/godot',javascript_objects,PROGSUFFIX=env["PROGSUFFIX"]+".html")
|
||||
|
||||
@@ -46,11 +46,7 @@ def get_flags():
|
||||
def configure(env):
|
||||
|
||||
|
||||
env.Append(CPPPATH=['#platform/android'])
|
||||
|
||||
env['OBJSUFFIX'] = ".js.o"
|
||||
env['LIBSUFFIX'] = ".js.a"
|
||||
env['PROGSUFFIX'] = ".html"
|
||||
env.Append(CPPPATH=['#platform/javascript'])
|
||||
|
||||
em_path=os.environ["EMSCRIPTEN_ROOT"]
|
||||
|
||||
@@ -68,17 +64,12 @@ def configure(env):
|
||||
if (env["target"]=="release"):
|
||||
|
||||
env.Append(CCFLAGS=['-O2'])
|
||||
env['OBJSUFFIX'] = "_opt"+env['OBJSUFFIX']
|
||||
env['LIBSUFFIX'] = "_opt"+env['LIBSUFFIX']
|
||||
|
||||
elif (env["target"]=="release_debug"):
|
||||
|
||||
env.Append(CCFLAGS=['-O2','-DDEBUG_ENABLED'])
|
||||
env['OBJSUFFIX'] = "_optd"+env['OBJSUFFIX']
|
||||
env['LIBSUFFIX'] = "_optd"+env['LIBSUFFIX']
|
||||
|
||||
elif (env["target"]=="debug"):
|
||||
|
||||
env.Append(CCFLAGS=['-D_DEBUG', '-Wall', '-O2', '-DDEBUG_ENABLED'])
|
||||
env.Append(CPPFLAGS=['-DDEBUG_MEMORY_ALLOC'])
|
||||
|
||||
|
||||
Reference in New Issue
Block a user