diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-04-07 20:22:58 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-04-07 20:22:58 -0300 |
| commit | b135cdbf05312211a81ad3405f154082d1c059e3 (patch) | |
| tree | 39fb2b99b64e2dfc7d9403c61bb33eff418bf4ee /platform | |
| parent | e336306e9176bb3e9e459a63344ef54c1e57c9cd (diff) | |
| parent | 4fa71a6ee0ea72289d9e647eb0aeea59cf8a7192 (diff) | |
Merge pull request #1531 from vkbsb/h5_canvas_polygon_fix
H5 canvas polygon fix
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/javascript/detect.py | 37 |
1 files changed, 21 insertions, 16 deletions
diff --git a/platform/javascript/detect.py b/platform/javascript/detect.py index 845b2e3395..947a637fb9 100644 --- a/platform/javascript/detect.py +++ b/platform/javascript/detect.py @@ -10,9 +10,9 @@ def get_name(): def can_build(): - import os - if (not os.environ.has_key("EMSCRIPTEN_ROOT")): - return False + import os + if (not os.environ.has_key("EMSCRIPTEN_ROOT")): + return False return True def get_opts(): @@ -36,6 +36,7 @@ def get_flags(): ('squish', 'no'), ('speex', 'no'), ('old_scenes', 'no'), + ('etc1', 'no'), # ('default_gui_theme', 'no'), #('builtin_zlib', 'no'), @@ -44,33 +45,36 @@ def get_flags(): def configure(env): - - env.Append(CPPPATH=['#platform/javascript']) - + 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['RANLIB'] = em_path+"/emranlib" + #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["LINKFLAGS"]= string.split(" -g --sysroot="+ld_sysroot+" -Wl,--no-undefined -Wl,-z,noexecstack ") if (env["target"]=="release"): - env.Append(CCFLAGS=['-O2']) - elif (env["target"]=="release_debug"): - env.Append(CCFLAGS=['-O2','-DDEBUG_ENABLED']) - elif (env["target"]=="debug"): env.Append(CCFLAGS=['-D_DEBUG', '-Wall', '-O2', '-DDEBUG_ENABLED']) + #env.Append(CCFLAGS=['-D_DEBUG', '-Wall', '-g4', '-DDEBUG_ENABLED']) env.Append(CPPFLAGS=['-DDEBUG_MEMORY_ALLOC']) env.Append(CPPFLAGS=["-fno-exceptions",'-DNO_SAFE_CAST','-fno-rtti']) @@ -84,10 +88,11 @@ def configure(env): lzma_binpath = em_path+"/third_party/lzma.js/lzma-native" lzma_decoder = em_path+"/third_party/lzma.js/lzma-decoder.js" lzma_dec = "LZMA.decompress" - env.Append(LINKFLAGS=['--compression',lzma_binpath+","+lzma_decoder+","+lzma_dec]) env.Append(LINKFLAGS=['-s','ASM_JS=1']) env.Append(LINKFLAGS=['-O2']) - - + #env.Append(LINKFLAGS=['-g4']) + + #print "CCCOM is:", env.subst('$CCCOM') + #print "P: ", env['p'], " Platofrm: ", env['platform'] |