Permalink
Browse files

fix build system to use .a and not .so

  • Loading branch information...
1 parent 36200f5 commit ed445013a06fda85949b9a1348b1f72227783162 @kripken committed Sep 10, 2012
Showing with 6 additions and 10 deletions.
  1. +1 −5 README.markdown
  2. +1 −1 builds/ammo.js
  3. +4 −4 make.py
View
6 README.markdown
@@ -34,11 +34,7 @@ You can also build ammo.js yourself, as follows:
python make.py
- which should generate builds/ammo.new.js. Note that this is by default
- an unoptimized safe build which will run very slowly. To generate an optimized
- build (which takes much longer to generate), do
-
- python make.py fast
+ which should generate builds/ammo.js.
* Optionally, run the automatic tests,
View
2 builds/ammo.js
1 addition, 1 deletion not shown because the diff is too large. Please use a local Git client to view these changes.
View
8 make.py
@@ -151,14 +151,14 @@ def stage(text):
stage('Link')
emscripten.Building.link(['bindings.bc',
- os.path.join('src', '.libs', 'libBulletCollision.so'),
- os.path.join('src', '.libs', 'libBulletDynamics.so'),
- os.path.join('src', '.libs', 'libLinearMath.so')],
+ os.path.join('src', '.libs', 'libBulletCollision.a'),
+ os.path.join('src', '.libs', 'libBulletDynamics.a'),
+ os.path.join('src', '.libs', 'libLinearMath.a')],
'libbullet.bc')
assert os.path.exists('libbullet.bc'), 'Failed to create client'
- stage('emcc')
+ stage('emcc: ' + ' '.join(emcc_args))
emscripten.Building.emcc('libbullet.bc', emcc_args + ['--js-transform', 'python %s' % os.path.join('..', '..', 'bundle.py')],
os.path.join('..', '..', 'builds', 'ammo.js'))

0 comments on commit ed44501

Please sign in to comment.