aboutsummaryrefslogtreecommitdiff
path: root/tools/shared.py
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2011-12-16 19:08:30 -0800
committerAlon Zakai <alonzakai@gmail.com>2011-12-16 19:08:30 -0800
commit7ae17d41b81474e2a7dce3281195bb5c9c5e7bb2 (patch)
tree507ad89a424eadd6e407b43a74d8880dc9212147 /tools/shared.py
parentd157b2049d07d3396cfa6d646d56705100ef412f (diff)
improve linking in emcc, can now build zlib, openjpeg, freetype
Diffstat (limited to 'tools/shared.py')
-rw-r--r--tools/shared.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/tools/shared.py b/tools/shared.py
index 97e953be..a480faa9 100644
--- a/tools/shared.py
+++ b/tools/shared.py
@@ -222,11 +222,11 @@ class Building:
@staticmethod
def get_building_env():
env = os.environ.copy()
- env['CC'] = EMMAKEN #EMCC
- env['CXX'] = EMMAKEN #EMXX
- env['AR'] = EMMAKEN #EMAR
- env['RANLIB'] = EMMAKEN #EMRANLIB
- env['LIBTOOL'] = EMMAKEN #EMLIBTOOL
+ env['CC'] = EMCC
+ env['CXX'] = EMXX
+ env['AR'] = EMAR
+ env['RANLIB'] = EMRANLIB
+ env['LIBTOOL'] = EMLIBTOOL
env['EMMAKEN_COMPILER'] = Building.COMPILER
env['EMSCRIPTEN_TOOLS'] = path_from_root('tools')
env['CFLAGS'] = env['EMMAKEN_CFLAGS'] = ' '.join(COMPILER_OPTS + Building.COMPILER_TEST_OPTS) # Normal CFLAGS is ignored by some configure's.