Skip to content

Commit

Permalink
Link artoolkit5 sources for empscripten and update paths.
Browse files Browse the repository at this point in the history
  • Loading branch information
philip-lamb committed Feb 25, 2016
1 parent 2d06c0e commit 3489cb2
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 4 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "emscripten/artoolkit5"]
path = emscripten/artoolkit5
url = https://github.com/artoolkit/artoolkit5
10 changes: 10 additions & 0 deletions emscripten/HOWTO.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
How to update the emscripten build from the ARToolKit sources.
==============================================================

1. artoolkit5 is linked as a git submodule. Do the following:
1. git submodule init
2. git submodule update
2. From the root of the repository, execute the following:
* source PATH_TO_EMSCRIPTEN/emsdk_env.sh && emconfigure ./configure && node tools/makem.js


1 change: 1 addition & 0 deletions emscripten/artoolkit5
Submodule artoolkit5 added at 771856
8 changes: 4 additions & 4 deletions tools/makem.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ var ar_sources = [
// ARMarkerNFT // trackingSub
// 'ARWrapper/ARPattern.cpp'
].map(function(src) {
return path.resolve(__dirname, '../../lib/SRC/', src);
return path.resolve(__dirname, '../emscripten/artoolkit5/lib/SRC/', src);
});

var ar2_sources = [
Expand All @@ -80,7 +80,7 @@ var ar2_sources = [
'coord.c',
'util.c',
].map(function(src) {
return path.resolve(__dirname, '../../lib/SRC/AR2/', src);
return path.resolve(__dirname, '../emscripten/artoolkit5/lib/SRC/AR2/', src);
});

var kpm_sources = [
Expand All @@ -104,7 +104,7 @@ var kpm_sources = [
'FreakMatcher/framework/logger.c*',
'FreakMatcher/framework/timers.c*',
].map(function(src) {
return path.resolve(__dirname, '../..lib/SRC/KPM/', src);
return path.resolve(__dirname, '../emscripten/artoolkit5/lib/SRC/KPM/', src);
});

if (HAVE_NFT) {
Expand Down Expand Up @@ -137,7 +137,7 @@ DEBUG_FLAGS += ' -s ALLOW_MEMORY_GROWTH=1';
DEBUG_FLAGS += ' -s DEMANGLE_SUPPORT=1 ';

var INCLUDES = [
path.resolve(__dirname, '../../include'),
path.resolve(__dirname, '../emscripten/artoolkit5/include'),
OUTPUT_PATH,
SOURCE_PATH,
// 'lib/SRC/KPM/FreakMatcher',
Expand Down

0 comments on commit 3489cb2

Please sign in to comment.