diff options
| author | eska <eska@eska.me> | 2017-02-20 13:36:54 +0100 |
|---|---|---|
| committer | eska <eska@eska.me> | 2017-02-20 06:59:19 +0100 |
| commit | 6e2bf31e5a8f3dbe18e31b1aff9c26ee184ad8c8 (patch) | |
| tree | 9c01f8227b338b7539c50d27e1af1b34573c5852 /platform/javascript/detect.py | |
| parent | 335fdea581f677fea55d20f0e23b4c7d7c75664b (diff) | |
| download | redot-engine-6e2bf31e5a8f3dbe18e31b1aff9c26ee184ad8c8.tar.gz | |
Automatically zip web export templates
Also fix web builds on Windows and clean up
Diffstat (limited to 'platform/javascript/detect.py')
| -rw-r--r-- | platform/javascript/detect.py | 25 |
1 files changed, 7 insertions, 18 deletions
diff --git a/platform/javascript/detect.py b/platform/javascript/detect.py index 648880cb45..7237298169 100644 --- a/platform/javascript/detect.py +++ b/platform/javascript/detect.py @@ -44,22 +44,14 @@ def configure(env): em_path = os.environ["EMSCRIPTEN_ROOT"] env['ENV']['PATH'] = em_path + ":" + env['ENV']['PATH'] - env['CC'] = em_path + '/emcc' - env['CXX'] = em_path + '/emcc' - #env['AR'] = em_path+"/emar" - env['AR'] = em_path + "/emcc" - env['ARFLAGS'] = "-o" - -# env['RANLIB'] = em_path+"/emranlib" - env['RANLIB'] = em_path + "/emcc" - env['OBJSUFFIX'] = '.bc' - env['LIBSUFFIX'] = '.bc' - env['CCCOM'] = "$CC -o $TARGET $CFLAGS $CCFLAGS $_CCCOMCOM $SOURCES" - env['CXXCOM'] = "$CC -o $TARGET $CFLAGS $CCFLAGS $_CCCOMCOM $SOURCES" - -# env.Append(LIBS=['c','m','stdc++','log','GLESv1_CM','GLESv2']) + env['CC'] = em_path + '/emcc' + env['CXX'] = em_path + '/em++' + env['LINK'] = em_path + '/emcc' + env['AR'] = em_path + '/emar' + env['RANLIB'] = em_path + '/emranlib' -# env["LINKFLAGS"]= string.split(" -g --sysroot="+ld_sysroot+" -Wl,--no-undefined -Wl,-z,noexecstack ") + env['OBJSUFFIX'] = '.bc' + env['LIBSUFFIX'] = '.a' if (env["target"] == "release"): env.Append(CCFLAGS=['-O2']) @@ -101,7 +93,4 @@ def configure(env): env.Append(LINKFLAGS=['-s', 'USE_WEBGL2=1']) # env.Append(LINKFLAGS=['-g4']) - # print "CCCOM is:", env.subst('$CCCOM') - # print "P: ", env['p'], " Platofrm: ", env['platform'] - import methods |