makefile stuff for emscripten

Author: revmischa

configure.ac

@@ -25,11 +25,13 @@ dnl emscripten
 AC_ARG_ENABLE([emscripten],
 AS_HELP_STRING([--enable-emscripten], [Build for web with emscripten]),
 [], [enable_emscripten=no])
-AS_IF([test "x$enable_emscripten" = "xyes"], [
+AS_IF([test "x$enable_emscripten" = "xyes" || test "x$EMSCRIPTEN"], [
   dnl Set up emscripten
   m4_include([m4/emscripten.m4])
   AC_DEFINE([EMSCRIPTEN], [1], [Define EMSCRIPTEN])
   enable_threading=no
+  enable_gles=yes
+  enable_sdl=yes
 ], [
   dnl Running in a normal OS (not emscripten)
   AX_CHECK_GL

src/projectM-emscripten/Makefile.am

@@ -8,8 +8,18 @@ ${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_LDADD = ${SDL_LIBS}	${top_srcdir}/src/libprojectM/libprojectM.la
-projectW_bc_LDFLAGS = -static -s USE_SDL=2
+projectW_bc_LDFLAGS = $(EMSCRIPTEN_FLAGS)
 projectW_bc_PROGRAM = projectW.bc
+
+projectW.html: generate-html
+
+generate-html:
+	emcc $(EMSCRIPTEN_FLAGS) projectW.bc
+
+run: projectW.html
+	emrun projectW.html

src/projectM-sdl/SDLprojectM.xcodeproj/project.pbxproj

@@ -357,7 +357,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "ls \"$CONFIGURATION_BUILD_DIR\"\n\nmkdir -p \"$DSTROOT/usr/local/share/projectM\"\nmkdir -p \"$DSTROOT/Applications/projectM\"\ncp -p \"$CONFIGURATION_BUILD_DIR/SDLprojectM\" \"$DSTROOT/Applications/projectM/SDL\"\ncp -rp \"$CONFIGURATION_BUILD_DIR/SDL2.framework\" \"$DSTROOT/Applications/projectM/\"\ncp -r \"$CONFIGURATION_BUILD_DIR\"/presets \"$DSTROOT/usr/local/share/projectM/\"\ncp -r \"$CONFIGURATION_BUILD_DIR\"/fonts \"$DSTROOT/usr/local/share/projectM/\"\ncp -f \"$CONFIGURATION_BUILD_DIR\"/config.inp \"$DSTROOT/usr/local/share/projectM/\"\n\n#install_name_tool -change @executable_path/../Frameworks/Cg.framework/Cg @loader_path/../Frameworks/SDL2.framework/SDL2 \"$DSTROOT/Library/iTunes/iTunes Plug-ins/iProjectM.bundle/Contents/MacOS/iProjectM\"\n#cp -r $CONFIGURATION_BUILD_DIR/share/* \"$DSTROOT/usr/local/share/projectM\"\npkgbuild --component-plist \"$SRCROOT/projectMSDL-pkg.plist\" --root \"$DSTROOT\" \"$SRCROOT/projectM.pkg\"\n";
+			shellScript = "ls \"$CONFIGURATION_BUILD_DIR\"\n\nmkdir -p \"$DSTROOT/usr/local/share/projectM\"\nmkdir -p \"$DSTROOT/Applications/projectM\"\ncp -p \"$CONFIGURATION_BUILD_DIR/SDLprojectM\" \"$DSTROOT/Applications/projectM/SDL\"\ncp -rp \"$CONFIGURATION_BUILD_DIR/SDL2.framework\" \"$DSTROOT/Applications/projectM/\"\ncp -r \"$CONFIGURATION_BUILD_DIR\"/presets \"$DSTROOT/usr/local/share/projectM/\"\ncp -r \"$CONFIGURATION_BUILD_DIR\"/fonts \"$DSTROOT/usr/local/share/projectM/\"\ncp -f \"$CONFIGURATION_BUILD_DIR\"/config.inp \"$DSTROOT/usr/local/share/projectM/\"\n\n#install_name_tool -change @executable_path/../Frameworks/Cg.framework/Cg @loader_path/../Frameworks/SDL2.framework/SDL2 \"$DSTROOT/Library/iTunes/iTunes Plug-ins/iProjectM.bundle/Contents/MacOS/iProjectM\"\n#cp -r $CONFIGURATION_BUILD_DIR/share/* \"$DSTROOT/usr/local/share/projectM\"\n#pkgbuild --component-plist \"$SRCROOT/projectMSDL-pkg.plist\" --root \"$DSTROOT\" \"$SRCROOT/projectM.pkg\"\n";
 		};
 /* End PBXShellScriptBuildPhase section */