Add Mp3 (mixer) and TTF

Author: davidnurdin

Dockerfile

@@ -60,6 +60,14 @@ RUN git clone https://github.com/kea/php-sdl-image.git && \
     mkdir -p /src/php-src/ext/sdl_image && \
 	cp -r php-sdl-image/* /src/php-src/ext/sdl_image
 
+RUN git clone https://github.com/kea/php-sdl-mixer.git && \
+    mkdir -p /src/php-src/ext/sdl_mixer && \
+	cp -r php-sdl-mixer/* /src/php-src/ext/sdl_mixer
+
+RUN git clone https://github.com/kea/php-sdl-ttf.git && \
+    mkdir -p /src/php-src/ext/sdl_ttf && \
+	cp -r php-sdl-ttf/* /src/php-src/ext/sdl_ttf
+
 # todo voir
 #RUN #git clone https://github.com/krakjoe/parallel.git /tmp/php-parallel && \
 #    mkdir -p /src/php-src/ext/parallel && \
@@ -69,6 +77,8 @@ RUN git clone https://github.com/kea/php-sdl-image.git && \
 
 COPY config.sdl /src/php-src/ext/sdl/config.m4
 COPY config-image.sdl /src/php-src/ext/sdl_image/config.m4
+COPY config-mixer.sdl /src/php-src/ext/sdl_mixer/config.m4
+COPY config-ttf.sdl /src/php-src/ext/sdl_ttf/config.m4
 
 
 
@@ -140,6 +150,8 @@ RUN --mount=type=cache,target=/emsdk/upstream/emscripten/cache cd /src/php-src &
 		--with-layout=GNU  \
     	--enable-sdl 	   \
     	--with-sdl_image \
+    	--enable-sdl_ttf \
+    	--with-sdl_mixer \
 #		--with-libxml      \
     	--enable-gd \
     	--with-png \
@@ -197,7 +209,10 @@ RUN --mount=type=cache,target=/emsdk/upstream/emscripten/cache mkdir /build && c
     -s USE_LIBPNG=1 \
 #    -s USE_LIBJPEG=1 \
     -s USE_SDL_IMAGE=2 \
+    -s USE_SDL_MIXER=2 \
+    -s USE_SDL_TTF=2 \
     -s SDL2_IMAGE_FORMATS='["bmp", "png","jpg"]' \
+    -s SDL2_MIXER_FORMATS='["ogg", "wav", "mp3"]' \
 	-s FORCE_FILESYSTEM=1            \
 	-s MAXIMUM_MEMORY=2gb             \
 	-s INITIAL_MEMORY=$INITIAL_MEMORY \

config-mixer.sdl

@@ -0,0 +1,47 @@
+dnl config.m4 for extension sdl_mixer
+
+PHP_ARG_WITH([sdl_mixer],
+  [whether to enable sdl_mixer support],
+  [AS_HELP_STRING([[--with-sdl_mixer[=DIR]]],
+    [Include SDL_mixer support. DIR is the SDL_mixer base include and lib directory])])
+
+if test "$PHP_SDL_MIXER" != "no"; then
+  SEARCH_PATH="/usr/local /usr"
+  SEARCH_FOR="/include/SDL2/SDL_mixer.h"
+  AC_MSG_CHECKING([for SDL_mixer files])
+  if test -r $PHP_SDL_MIXER/$SEARCH_FOR; then # path given as parameter
+    SDL_MIXER_DIR=$PHP_SDL_MIXER
+  else # search default path list
+    for i in $SEARCH_PATH ; do
+      if test -r $i/$SEARCH_FOR; then
+        SDL_MIXER_DIR=$i
+      fi
+    done
+  fi
+
+  if test -z "$SDL_MIXER_DIR"; then
+    AC_MSG_RESULT([not found])
+    AC_MSG_ERROR([Please reinstall the SDL_mixer distribution])
+  fi
+
+  PHP_ADD_INCLUDE($SDL_MIXER_DIR/include)
+  AC_MSG_RESULT(found in $SDL_MIXER_DIR)
+
+  PKG_CHECK_MODULES([_SDL2], [sdl2 < 3.0])
+  PHP_EVAL_INCLINE($_SDL2_CFLAGS)
+
+  dnl === Vérification manuelle avec AC_LINK_IFELSE
+  save_LIBS="$LIBS"
+  LIBS="$LIBS -L$SDL_MIXER_DIR/$PHP_LIBDIR -lSDL2 -lSDL2_mixer"
+
+  PHP_SUBST(SDL_MIXER_SHARED_LIBADD)
+  AC_DEFINE(HAVE_SDL_MIXER, 1, [ Have sdl_mixer support ])
+
+
+	CFLAGS="$CFLAGS -sUSE_SDL=2"
+	CPPFLAGS="$CPPFLAGS -sUSE_SDL=2"
+	LDFLAGS="$LDFLAGS -sUSE_SDL=2"
+
+  PHP_NEW_EXTENSION(sdl_mixer, src/effect_position.c src/effect_stereoreverse.c src/Mix_Music.c src/Mix_Chunk.c src/music.c src/mixer.c php_sdl_mixer.c, $ext_shared, -sUSE_SDL=2 -sUSE_SDL_MIXER=2, -sUSE_SDL=2 -sUSE_SDL_MIXER=2)
+  PHP_ADD_EXTENSION_DEP(sdl_mixer, sdl)
+fi

config-ttf.sdl

@@ -0,0 +1,39 @@
+dnl config.m4 for extension sdl_ttf
+
+PHP_ARG_ENABLE([sdl_ttf],
+  [whether to enable sdl_ttf support],
+  [AS_HELP_STRING([--enable-sdl_ttf],
+    [Enable sdl_ttf support])],
+  [no])
+
+if test "$PHP_SDL_TTF" != "no"; then
+    AC_DEFINE(WITH_SDL_TTF, 1, [Whether you want SDL Mixer])
+    AC_MSG_CHECKING([for SDL_ttf.h])
+    for i in $PHP_SDL_TTF /usr/local /usr; do
+      if test -r $i/include/SDL2/SDL_ttf.h; then
+        SDL_TTF_DIR=$i
+        AC_DEFINE(HAVE_SDL_TTF_H, 1, [Whether you have SDL2/SDL_ttf.h])
+        PHP_ADD_INCLUDE($i/include/SDL2)
+      fi
+    done
+
+    if test -z "$SDL_TTF_DIR"; then
+      AC_MSG_RESULT([not found])
+      AC_MSG_ERROR([Please reinstall the SDL_ttf distribution including development files])
+    else
+      AC_MSG_RESULT([found])
+    fi
+
+
+  dnl === Vérification manuelle avec AC_LINK_IFELSE
+  save_LIBS="$LIBS"
+  LIBS="$LIBS -L$SDL_TTF_DIR/$PHP_LIBDIR -lSDL2 -lSDL2_ttf"
+
+  PHP_SUBST(SDL_TTF_SHARED_LIBADD)
+  AC_DEFINE(HAVE_SDL_TTF, 1, [ Have sdl_ttf support ])
+
+
+
+  PHP_NEW_EXTENSION(sdl_ttf, sdl_ttf.c, $ext_shared, -sUSE_SDL=2 -sUSE_SDL_TTF=2, -sUSE_SDL=2 -sUSE_SDL_TTF=2)
+  PHP_ADD_EXTENSION_DEP(sdl_ttf, sdl)
+fi

demo/public/index.html

@@ -17,6 +17,7 @@
 
 <textarea id="php" style="display: none">
 
+	// TODO : onfocus on wasm ? (pause game)
 	require ('/src/src/vendor/autoload.php');
 
 	// utilise setTimeout

demo/public/out.wasm

@@ -1 +1 @@
-Subproject commit 37a0c2daef9bdc8d6093c9525fb2c277f4d43c2c
+Subproject commit 05b8b12c70ac51f9f7af3f23aee08a85077f2ce4