From 856b72c8c2f604663d5fe287b61ede37c6c213fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benedikt=20R=C3=B6tsch?= Date: Wed, 1 Aug 2018 11:53:27 +0200 Subject: [PATCH 1/3] fix makefile and add more context to readme --- src/projectM-emscripten/Makefile.am | 1 - src/projectM-emscripten/README | 15 ++++++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/projectM-emscripten/Makefile.am b/src/projectM-emscripten/Makefile.am index 6b053c8d84..59be777732 100644 --- a/src/projectM-emscripten/Makefile.am +++ b/src/projectM-emscripten/Makefile.am @@ -4,7 +4,6 @@ ${my_CFLAGS} \ -DSYSCONFDIR=\""$(sysconfdir)"\" \ -I${top_srcdir}/src/libprojectM \ -I${top_srcdir}/src/libprojectM/Renderer \ -USE_SDL=2 \ ${SDL_CFLAGS} REALSRCDIR=${top_srcdir}/src/projectM-sdl diff --git a/src/projectM-emscripten/README b/src/projectM-emscripten/README index 19773c99c2..663a7e667a 100644 --- a/src/projectM-emscripten/README +++ b/src/projectM-emscripten/README @@ -1,15 +1,20 @@ Building w/ emscripten -* Activate the emsdk +* Activate the emsdk (https://github.com/juj/emsdk#installation-instructions) +* make sure you are in the root directory of this project +* `mkdir vendor && cp /usr/local/Cellar/glm/xx/include/glm ./vendor/` +* on fresh repositories: `./autogen.sh` * `emconfigure ./configure --enable-emscripten --enable-gles --enable-sdl` * `emmake make -j4` - - - +emcc -Isrc/libprojectm -Isrc/libprojectM/Renderer -Llib -Ivendor \ + src/libprojectM/KeyHandler.cpp src/projectM-emscripten/projectM_SDL_emscripten.cpp \ + -lRenderer -lprojectM -lMilkdropPresetFactory -lprojectM -lRenderer \ + -s USE_SDL=2 -s LEGACY_GL_EMULATION=1 \ + -o build/projectEM.html emcc -I../libprojectm -I../libprojectM/Renderer -Llib \ ../libprojectM/KeyHandler.cpp projectM_SDL_emscripten.cpp \ -lRenderer -lprojectM -lMilkdropPresetFactory -lprojectM -lRenderer \ -s USE_SDL=2 -s LEGACY_GL_EMULATION=1 \ - -o build/projectEM.html \ No newline at end of file + -o build/projectEM.html From 71d5d9ebb3678b31104bae7fb0ec72a5cf05a920 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benedikt=20R=C3=B6tsch?= Date: Wed, 1 Aug 2018 11:56:09 +0200 Subject: [PATCH 2/3] fixup! fix makefile and add more context to readme --- src/projectM-emscripten/README | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/projectM-emscripten/README b/src/projectM-emscripten/README index 663a7e667a..8ea8d21a94 100644 --- a/src/projectM-emscripten/README +++ b/src/projectM-emscripten/README @@ -2,11 +2,15 @@ Building w/ emscripten * Activate the emsdk (https://github.com/juj/emsdk#installation-instructions) * make sure you are in the root directory of this project -* `mkdir vendor && cp /usr/local/Cellar/glm/xx/include/glm ./vendor/` * on fresh repositories: `./autogen.sh` * `emconfigure ./configure --enable-emscripten --enable-gles --enable-sdl` * `emmake make -j4` +Does not work? Try: + +* `mkdir vendor && cp /usr/local/Cellar/glm/xx/include/glm ./vendor/` +* `emmake make -j4 -lvendor` + emcc -Isrc/libprojectm -Isrc/libprojectM/Renderer -Llib -Ivendor \ src/libprojectM/KeyHandler.cpp src/projectM-emscripten/projectM_SDL_emscripten.cpp \ -lRenderer -lprojectM -lMilkdropPresetFactory -lprojectM -lRenderer \ From 647048fff841d3a8a3674ffde9696b6f80b2c677 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benedikt=20R=C3=B6tsch?= Date: Wed, 1 Aug 2018 12:18:18 +0200 Subject: [PATCH 3/3] fixup! fixup! fix makefile and add more context to readme --- src/projectM-emscripten/Makefile.am | 2 -- src/projectM-emscripten/README | 19 +++++++------------ 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/src/projectM-emscripten/Makefile.am b/src/projectM-emscripten/Makefile.am index 59be777732..75c6d7d24a 100644 --- a/src/projectM-emscripten/Makefile.am +++ b/src/projectM-emscripten/Makefile.am @@ -13,5 +13,3 @@ projectW_bc_SOURCES = $(REALSRCDIR)/pmSDL.cpp $(REALSRCDIR)/projectM_SDL_main.cp projectW_bc_LDADD = ${SDL_LIBS} ${top_srcdir}/src/libprojectM/libprojectM.la projectW_bc_LDFLAGS = -static -s USE_SDL=2 projectW_bc_PROGRAM = projectW.bc - -# emcc -s USE_SDL=2 -s ALLOW_MEMORY_GROWTH=1 projectW.bc -o projectW.html diff --git a/src/projectM-emscripten/README b/src/projectM-emscripten/README index 8ea8d21a94..6a3b87da6e 100644 --- a/src/projectM-emscripten/README +++ b/src/projectM-emscripten/README @@ -1,24 +1,19 @@ Building w/ emscripten +## Crepare * Activate the emsdk (https://github.com/juj/emsdk#installation-instructions) * make sure you are in the root directory of this project * on fresh repositories: `./autogen.sh` + +## Compile * `emconfigure ./configure --enable-emscripten --enable-gles --enable-sdl` * `emmake make -j4` +## Create wasm & html files +* `cd src/projectM-emscripten` +* `emcc -s USE_SDL=2 -s ALLOW_MEMORY_GROWTH=1 projectW.bc -o projectW.html` + Does not work? Try: * `mkdir vendor && cp /usr/local/Cellar/glm/xx/include/glm ./vendor/` * `emmake make -j4 -lvendor` - -emcc -Isrc/libprojectm -Isrc/libprojectM/Renderer -Llib -Ivendor \ - src/libprojectM/KeyHandler.cpp src/projectM-emscripten/projectM_SDL_emscripten.cpp \ - -lRenderer -lprojectM -lMilkdropPresetFactory -lprojectM -lRenderer \ - -s USE_SDL=2 -s LEGACY_GL_EMULATION=1 \ - -o build/projectEM.html - -emcc -I../libprojectm -I../libprojectM/Renderer -Llib \ - ../libprojectM/KeyHandler.cpp projectM_SDL_emscripten.cpp \ - -lRenderer -lprojectM -lMilkdropPresetFactory -lprojectM -lRenderer \ - -s USE_SDL=2 -s LEGACY_GL_EMULATION=1 \ - -o build/projectEM.html