emscripten.diff

diff --git a/src/projectM-emscripten/Makefile.am b/src/projectM-emscripten/Makefile.am
index 2c280540..2dc9a6c2 100644
--- a/src/projectM-emscripten/Makefile.am
+++ b/src/projectM-emscripten/Makefile.am
@@ -1,17 +1,16 @@
 AM_CPPFLAGS = \
 ${my_CFLAGS} \
 -include $(top_builddir)/config.h \
--l$(top_builddir)/vendor \
+-I$(top_builddir)/vendor \
 -DSYSCONFDIR=\""$(sysconfdir)"\" \
 -I${top_srcdir}/src/libprojectM \
 -I${top_srcdir}/src/libprojectM/Renderer \
 ${SDL_CFLAGS}
 
-REALSRCDIR=${top_srcdir}/src/projectM-sdl
 EMSCRIPTEN_FLAGS =  -s USE_SDL=2 -s USE_WEBGL2=1 -s WASM=0
 
 bin_PROGRAMS = projectW.bc
-projectW_bc_SOURCES = $(REALSRCDIR)/pmSDL.cpp $(REALSRCDIR)/projectM_SDL_main.cpp $(REALSRCDIR)/pmSDL.hpp
+projectW_bc_SOURCES = ../libprojectM/KeyHandler.cpp projectM_SDL_emscripten.cpp
 projectW_bc_LDADD = ${SDL_LIBS}	${top_srcdir}/src/libprojectM/libprojectM.la
 projectW_bc_LDFLAGS = $(EMSCRIPTEN_FLAGS) -static
 projectW_bc_PROGRAM = projectW.bc
diff --git a/src/projectM-emscripten/projectM_SDL_emscripten.cpp b/src/projectM-emscripten/projectM_SDL_emscripten.cpp
index 754403d6..a18bac33 100755
--- a/src/projectM-emscripten/projectM_SDL_emscripten.cpp
+++ b/src/projectM-emscripten/projectM_SDL_emscripten.cpp
@@ -27,6 +27,9 @@ typedef struct {
     SDL_AudioDeviceID audioInputDevice;
 } projectMApp;
 
+projectMApp app;
+
+
 int selectAudioInput(projectMApp *app) {
     int i, count = SDL_GetNumAudioDevices(0);  // param=isCapture (not yet functional)
     
@@ -43,7 +46,7 @@ int selectAudioInput(projectMApp *app) {
     return 1;
 }
 
-void renderFrame(projectMApp *app) {
+void renderFrame() {
     int i;
     short pcm_data[2][512];
     SDL_Event evt;
@@ -54,7 +57,7 @@ void renderFrame(projectMApp *app) {
             // ...
             break;
         case SDL_QUIT:
-            app->done = true;
+            app.done = true;
             break;
     }
 
@@ -91,23 +94,22 @@ void renderFrame(projectMApp *app) {
     }
 
     /** Add the waveform data */
-    app->pm->pcm()->addPCM16(pcm_data);
+    app.pm->pcm()->addPCM16(pcm_data);
 
     glClearColor( 0.0, 0.5, 0.0, 0.0 );
 	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
-    app->pm->renderFrame();
+    app.pm->renderFrame();
     glFlush();
 
     #if SDL_MAJOR_VERSION==2
-        SDL_RenderPresent(app->rend);
+        SDL_RenderPresent(app.rend);
     #elif SDL_MAJOR_VERSION==1
         SDL_GL_SwapBuffers();
     #endif
 }
 
 int main( int argc, char *argv[] ) {
-    projectMApp app;
     app.done = 0;
 
     int width = 784,
@@ -159,8 +161,8 @@ int main( int argc, char *argv[] ) {
     }
     #endif
 
-    app.settings.meshX = 1;
-    app.settings.meshY = 1;
+    app.settings.meshX = 48;
+    app.settings.meshY = 32;
     app.settings.fps   = FPS;
     app.settings.textureSize = 2048;  // idk?
     app.settings.windowWidth = width;
@@ -173,7 +175,7 @@ int main( int argc, char *argv[] ) {
     app.settings.shuffleEnabled = 1;
     app.settings.softCutRatingsEnabled = 1; // ???
 #ifdef EMSCRIPTEN
-    app.settings.presetURL = "/build/presets";
+    app.settings.presetURL = "presets";
 #else
     app.settings.presetURL = "presets_tryptonaut";
     app.settings.menuFontURL = "fonts/Vera.ttf";