From d63e081b7aa048521e12cdc279e3a822757318b8 Mon Sep 17 00:00:00 2001
From: Alula <6276139+alula@users.noreply.github.com>
Date: Tue, 28 Sep 2021 14:03:06 +0200
Subject: [PATCH] initial wip emscripten port
---
CMakeLists.txt | 32 +-
SpaceCadetPinball/Sound.cpp | 9 +-
SpaceCadetPinball/emscripten_shell.html | 324 +
SpaceCadetPinball/fullscrn.cpp | 2 +
SpaceCadetPinball/gm.sf2 | Bin 0 -> 3208108 bytes
SpaceCadetPinball/gm_sf2.cpp | 267346 +++++++++++++++++++++
SpaceCadetPinball/midi.cpp | 199 +-
SpaceCadetPinball/midi.h | 31 +-
SpaceCadetPinball/options.cpp | 2 +-
SpaceCadetPinball/tml.h | 518 +
SpaceCadetPinball/tsf.cpp | 4 +
SpaceCadetPinball/tsf.h | 1794 +
SpaceCadetPinball/winmain.cpp | 338 +-
13 files changed, 270418 insertions(+), 181 deletions(-)
create mode 100644 SpaceCadetPinball/emscripten_shell.html
create mode 100644 SpaceCadetPinball/gm.sf2
create mode 100644 SpaceCadetPinball/gm_sf2.cpp
create mode 100644 SpaceCadetPinball/tml.h
create mode 100644 SpaceCadetPinball/tsf.cpp
create mode 100644 SpaceCadetPinball/tsf.h
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fd3585c..e7df74c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,8 +14,21 @@ if(WIN32)
set(SDL2_MIXER_PATH "${CMAKE_CURRENT_LIST_DIR}/Libs/SDL2_mixer")
endif()
-find_package(SDL2 REQUIRED)
-FIND_PACKAGE(SDL2_mixer REQUIRED)
+if(${CMAKE_SYSTEM_NAME} MATCHES "Emscripten")
+ set(USE_FLAGS "-s USE_SDL=2 -s USE_SDL_MIXER=2")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${USE_FLAGS}")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${USE_FLAGS}")
+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${USE_FLAGS}")
+ set(CMAKE_EXECUTABLE_SUFFIX .html)
+
+ set(SDL2_FOUND TRUE)
+ set(SDL2_INCLUDE_DIR "${EMSCRIPTEN_ROOT_PATH}/system/include/SDL2/")
+ set(SDL2_MIXER_INCLUDE_DIR "${EMSCRIPTEN_ROOT_PATH}/system/include/SDL2/")
+ set(SDL2_LIBRARIES "nul")
+else()
+ find_package(SDL2 REQUIRED)
+ find_package(SDL2_mixer REQUIRED)
+endif()
include_directories(${SDL2_INCLUDE_DIR} ${SDL2_MIXER_INCLUDE_DIR})
get_property(dirs DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY INCLUDE_DIRECTORIES)
@@ -23,8 +36,6 @@ foreach(dir ${dirs})
message(STATUS "Include dir='${dir}'")
endforeach()
-
-
set(SOURCE_FILES
SpaceCadetPinball/control.cpp
SpaceCadetPinball/control.h
@@ -164,6 +175,10 @@ set(SOURCE_FILES
SpaceCadetPinball/imstb_textedit.h
SpaceCadetPinball/imstb_rectpack.h
SpaceCadetPinball/imstb_truetype.h
+ SpaceCadetPinball/gm_sf2.cpp
+ SpaceCadetPinball/tsf.cpp
+ SpaceCadetPinball/tml.h
+ SpaceCadetPinball/tsf.h
)
add_executable(SpaceCadetPinball ${SOURCE_FILES})
@@ -185,6 +200,15 @@ target_precompile_headers(SpaceCadetPinball
)
target_link_libraries(SpaceCadetPinball ${SDL2_LIBRARY} ${SDL2_MIXER_LIBRARY})
+target_compile_definitions(SpaceCadetPinball PRIVATE -DMUSIC_TSF)
+
+if(${CMAKE_SYSTEM_NAME} MATCHES "Emscripten")
+ target_link_libraries(SpaceCadetPinball idbfs.js)
+ set_target_properties(SpaceCadetPinball PROPERTIES LINK_FLAGS
+ "-s ALLOW_MEMORY_GROWTH=1 -s FORCE_FILESYSTEM=1 -s DEMANGLE_SUPPORT=1 \
+ --shell-file ${CMAKE_CURRENT_SOURCE_DIR}/SpaceCadetPinball/emscripten_shell.html \
+ --preload-file ${CMAKE_CURRENT_SOURCE_DIR}/game_resources@game_resources --bind")
+endif()
# On Windows, copy DLL to output
if(WIN32)
diff --git a/SpaceCadetPinball/Sound.cpp b/SpaceCadetPinball/Sound.cpp
index 15f0ee3..2137889 100644
--- a/SpaceCadetPinball/Sound.cpp
+++ b/SpaceCadetPinball/Sound.cpp
@@ -12,8 +12,13 @@ int Sound::Init(int voices)
channelCount = 8;
num_channels = channelCount;
- auto init = Mix_Init(MIX_INIT_MID);
- return Mix_OpenAudio(MIX_DEFAULT_FREQUENCY, MIX_DEFAULT_FORMAT, 2, 1024);
+ int flags = 0;
+#ifdef MUSIC_SDL
+ flags |= MIX_INIT_MID;
+#endif
+
+ auto init = Mix_Init(flags);
+ return Mix_OpenAudio(MIX_DEFAULT_FREQUENCY, AUDIO_S16LSB, 2, 1024);
}
void Sound::Enable(int channelFrom, int channelTo, int enableFlag)
diff --git a/SpaceCadetPinball/emscripten_shell.html b/SpaceCadetPinball/emscripten_shell.html
new file mode 100644
index 0000000..e76a6a0
--- /dev/null
+++ b/SpaceCadetPinball/emscripten_shell.html
@@ -0,0 +1,324 @@
+
+
+
+
+
+
+ 3D Pinball for Windows - Space Cadet
+
+
+
+
+
+
+
3D Pinball for Windows - Space Cadet
+
+
+
+
Downloading...
+
+
+