Commit 66ddd1c

authored

Merge pull request #91 from axe312ger/glsl-emscripten

[WIP] GLSL via emscripten

2 parents e96a604 + fc83c6f commit 66ddd1cCopy full SHA for 66ddd1c

File tree

+12

-11

lines changed

+12

-11

lines changed

Lines changed: 0 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@ ${my_CFLAGS} \`
`4`	`4`	`-DSYSCONFDIR=\""$(sysconfdir)"\" \`
`5`	`5`	`-I${top_srcdir}/src/libprojectM \`
`6`	`6`	`-I${top_srcdir}/src/libprojectM/Renderer \`
`7`		`-USE_SDL=2 \`
`8`	`7`	`${SDL_CFLAGS}`
`9`	`8`
`10`	`9`	`REALSRCDIR=${top_srcdir}/src/projectM-sdl`
`@@ -14,5 +13,3 @@ projectW_bc_SOURCES = $(REALSRCDIR)/pmSDL.cpp $(REALSRCDIR)/projectM_SDL_main.cp`
`14`	`13`	`projectW_bc_LDADD = ${SDL_LIBS} ${top_srcdir}/src/libprojectM/libprojectM.la`
`15`	`14`	`projectW_bc_LDFLAGS = -static -s USE_SDL=2`
`16`	`15`	`projectW_bc_PROGRAM = projectW.bc`
`17`		`-`
`18`		`-# emcc -s USE_SDL=2 -s ALLOW_MEMORY_GROWTH=1 projectW.bc -o projectW.html`

Lines changed: 12 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,15 +1,19 @@`
`1`	`1`	`Building w/ emscripten`
`2`	`2`
`3`		`-* Activate the emsdk`
	`3`	`+## Crepare`
	`4`	`+* Activate the emsdk (https://github.com/juj/emsdk#installation-instructions)`
	`5`	`+* make sure you are in the root directory of this project`
	`6`	+* on fresh repositories: `./autogen.sh`
	`7`	`+`
	`8`	`+## Compile`
`4`	`9`	* `emconfigure ./configure --enable-emscripten --enable-gles --enable-sdl`
`5`	`10`	* `emmake make -j4`
`6`	`11`
	`12`	`+## Create wasm & html files`
	`13`	+* `cd src/projectM-emscripten`
	`14`	+* `emcc -s USE_SDL=2 -s ALLOW_MEMORY_GROWTH=1 projectW.bc -o projectW.html`
`7`	`15`
	`16`	`+Does not work? Try:`
`8`	`17`
`9`		`-`
`10`		`-`
`11`		`-emcc -I../libprojectm -I../libprojectM/Renderer -Llib \`
`12`		`- ../libprojectM/KeyHandler.cpp projectM_SDL_emscripten.cpp \`
`13`		`- -lRenderer -lprojectM -lMilkdropPresetFactory -lprojectM -lRenderer \`
`14`		`- -s USE_SDL=2 -s LEGACY_GL_EMULATION=1 \`
`15`		`- -o build/projectEM.html`
	`18`	+* `mkdir vendor && cp /usr/local/Cellar/glm/xx/include/glm ./vendor/`
	`19`	+* `emmake make -j4 -lvendor`

Comments

(0)