a

.gitignore

@@ -1,6 +1,7 @@
 /bin/
-Makefile
-easyrpg-player
+/Makefile
+/easyrpg-player
+/Player.app
 *.a
 *.elf
 *.o
@@ -18,7 +19,6 @@ aclocal.m4
 config.h
 config.h.in
 config.status
-configure
 libtool
 /builds/autoconf/aux/
 /builds/autoconf/m4/*.m4
@@ -30,9 +30,11 @@ stamp-h1
 /output
 /utils
 /directorytree
+configure
 
 # cmake
 CMakeFiles/
+CMakeScripts/
 CMakeCache.txt
 CMakeDoxyfile.in
 CMakeDoxygenDefaults.cmake
@@ -88,10 +90,22 @@ easyrpg-player-*.tar.*
 __MACOSX
 .DS_Store
 
+# Xcode
+/*.xcodeproj
+/*.xcworkspace
+/Debug/
+/Release/
+/MinSizeRel/
+/RelWithDebInfo/
+/*.build/
+
 # legacy
 /lib/liblcf/
 liblcf.pc
 .buildconfig
 
 # Android
 *.iml
+
+# libretro
+easyrpg_libretro.*

AUTHORS.md

@@ -16,6 +16,7 @@ EasyRPG Player authors
 * Matthew Fioravante (fmatthew5876)
 * Patrick Müssig (Tondorian)
 * Paulo "Zhek" Vizcaino (paulo_v)
+* rueter37
 * scurest
 * Shin-NiL
 * Takeshi Watanabe (takecheeze)

CMakeLists.txt

@@ -1,6 +1,7 @@
 cmake_minimum_required(VERSION 3.7)
+cmake_policy(SET CMP0091 NEW) # Support MSVC_RUNTIME_LIBRARY
 
-project(EasyRPG_Player VERSION 0.6.2 LANGUAGES CXX)
+project(EasyRPG_Player VERSION 0.6.2.3 LANGUAGES CXX)
 
 # Extra CMake Module files
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/builds/cmake/Modules")
@@ -12,8 +13,11 @@ set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
+# Must be at global scope, otherwise breaks -DPLAYER_BUILD_LIBLCF (see CMP0077)
+option(BUILD_SHARED_LIBS "Build shared easyrpg_libretro core" ON)
+
 # Source Files
-add_library(${PROJECT_NAME}
+add_library(${PROJECT_NAME} STATIC
 	src/async_handler.cpp
 	src/async_handler.h
 	src/async_op.h
@@ -365,6 +369,8 @@ add_library(${PROJECT_NAME}
 # These are actually unused when building in CMake
 #	src/sdl_ui.cpp
 #	src/sdl_ui.h
+#	src/platform/wii/wii_clock.cpp
+#	src/platform/wii/wii_clock.h
 #	src/platform/wii/wii_input_buttons.cpp
 #	src/platform/opendingux/opendingux_input_buttons.cpp
 #	src/platform/psp/psp_input_buttons.cpp
@@ -390,20 +396,11 @@ if(${PLAYER_TARGET_PLATFORM} STREQUAL "SDL2")
 		src/sdl2_ui.h)
 	target_compile_definitions(${PROJECT_NAME} PUBLIC USE_SDL=2)
 
-	find_package(SDL2 REQUIRED)
+	find_package(SDL2 2.0.5 REQUIRED)
 	target_link_libraries(${PROJECT_NAME} SDL2::SDL2main)
 elseif(${PLAYER_TARGET_PLATFORM} STREQUAL "libretro")
-	target_sources(${PROJECT_NAME} PRIVATE
-		src/platform/libretro/libretro_audio.cpp
-		src/platform/libretro/libretro_audio.h
-		src/platform/libretro/libretro_input_buttons.cpp
-		src/platform/libretro/libretro_ui.cpp
-		src/platform/libretro/libretro_ui.h)
 	target_compile_definitions(${PROJECT_NAME} PUBLIC USE_LIBRETRO=1)
 	set(PLAYER_BUILD_EXECUTABLE OFF)
-	set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "")
-	set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME "easyrpg_libretro")
-
 	add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/builds/libretro)
 	target_link_libraries(${PROJECT_NAME} retro_common)
 elseif(${PLAYER_TARGET_PLATFORM} STREQUAL "3ds")
@@ -437,13 +434,35 @@ else()
 	message(FATAL_ERROR "Invalid target platform")
 endif()
 
+if(NOT PLAYER_BUILD_EXECUTABLE AND BUILD_SHARED_LIBS)
+	# Need fPIC when compiling a shared library (e.g. libretro.so)
+	set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+	set_property(TARGET ${PROJECT_NAME} PROPERTY POSITION_INDEPENDENT_CODE ON)
+endif()
+
 if(WIN32)
 	target_sources(${PROJECT_NAME} PRIVATE
 		src/registry.cpp
 		src/platform/windows/utils.cpp
 		src/platform/windows/utils.h)
 endif()
 
+if(APPLE)
+	target_sources(${PROJECT_NAME} PRIVATE
+		src/platform/macos/utils.mm
+		src/platform/macos/utils.h)
+
+	find_library(MACOSFOUNDATION Foundation)
+	target_link_libraries(${PROJECT_NAME} ${MACOSFOUNDATION})
+endif()
+
+if(CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
+	option(PLAYER_JS_BUILD_SHELL "Build the Player executable as a shell file (.html) instead of a standalone javascript file (.js)" OFF)
+	set(PLAYER_JS_GAME_URL "games/" CACHE STRING "Game URL/directory where the web player searches for games")
+	set(PLAYER_JS_OUTPUT_NAME "easyrpg-player" CACHE STRING "Output name of the js, html and wasm files")
+	set_property(SOURCE src/async_handler.cpp APPEND PROPERTY COMPILE_DEFINITIONS "EM_GAME_URL=\"${PLAYER_JS_GAME_URL}\"")
+endif()
+
 if(CMAKE_BUILD_TYPE STREQUAL "Debug")
 	target_compile_definitions(${PROJECT_NAME} PUBLIC _DEBUG=1)
 endif()
@@ -457,6 +476,14 @@ if(NOT DEFINED CMAKE_TOOLCHAIN_FILE)
 	endif()
 endif()
 
+# App Icon (for macOS)
+set(${PROJECT_NAME}_BUNDLE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/resources/osx/Player.icns")
+
+# Do not code sign on Macs
+set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "NO")
+set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "")
+set(CMAKE_XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER "org.easyrpg.player")
+
 # liblcf
 option(PLAYER_BUILD_LIBLCF "Instead of detecting liblcf the liblcf repository is cloned into lib/liblcf and built together with the Player. This is convenient for development" OFF)
 set(PLAYER_BUILD_LIBLCF_GIT "https://github.com/EasyRPG/liblcf.git" CACHE STRING "Git repository of liblcf to clone when building liblcf. Requires PLAYER_BUILD_LIBLCF=ON.")
@@ -470,10 +497,14 @@ if(PLAYER_BUILD_LIBLCF)
 			"${PLAYER_BUILD_LIBLCF_GIT}"
 			"${LIBLCF_PATH}")
 	endif()
-	SET(BUILD_SHARED_LIBS OFF CACHE BOOL "Build liblcf shared library")
 	list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/lib/liblcf/builds/cmake/Modules")
 
-	add_subdirectory(${LIBLCF_PATH})
+	# Always build static liblcf
+	function(add_liblcf)
+		set(BUILD_SHARED_LIBS OFF)
+		add_subdirectory(${LIBLCF_PATH})
+	endfunction()
+	add_liblcf()
 	target_link_libraries(${PROJECT_NAME} lcf)
 else()
 	# Use system package
@@ -686,30 +717,82 @@ endif()
 
 # Executable
 if (${PLAYER_BUILD_EXECUTABLE})
-	add_executable(${PROJECT_NAME}_exe WIN32 "src/main.cpp")
-	set_target_properties(${PROJECT_NAME}_exe PROPERTIES OUTPUT_NAME "easyrpg-player")
+	if(APPLE)
+		set(EXE_NAME "EasyRPG-Player.app")
+		set_source_files_properties(${${PROJECT_NAME}_BUNDLE_ICON} PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")
+		add_executable("${EXE_NAME}" MACOSX_BUNDLE "src/main.cpp" ${${PROJECT_NAME}_BUNDLE_ICON})
+		set_target_properties("${EXE_NAME}" PROPERTIES MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/resources/osx/Info.plist")
+		set_target_properties("${EXE_NAME}" PROPERTIES OUTPUT_NAME "EasyRPG Player")
+	else()
+		set(EXE_NAME ${PROJECT_NAME}_exe)
+		add_executable(${EXE_NAME} WIN32 "src/main.cpp")
+		set_target_properties(${EXE_NAME} PROPERTIES OUTPUT_NAME "easyrpg-player")
+	endif()
 
 	if(WIN32)
 		# Open console for Debug builds
 		if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-			set_target_properties(${PROJECT_NAME}_exe PROPERTIES WIN32_EXECUTABLE FALSE)
+			set_target_properties(${EXE_NAME} PROPERTIES WIN32_EXECUTABLE FALSE)
 		endif()
 
 		# Add resources
-		target_sources(${PROJECT_NAME}_exe PRIVATE "resources/player.rc")
+		target_sources(${EXE_NAME} PRIVATE "resources/player.rc")
 
 		# Change executable name
-		set_target_properties(${PROJECT_NAME}_exe PROPERTIES OUTPUT_NAME "Player")
+		set_target_properties(${EXE_NAME} PROPERTIES OUTPUT_NAME "Player")
 	endif()
 
-	target_link_libraries(${PROJECT_NAME}_exe ${PROJECT_NAME})
+	target_link_libraries(${EXE_NAME} ${PROJECT_NAME})
+
+	if(CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
+		set(PLAYER_JS_PREJS "${CMAKE_CURRENT_SOURCE_DIR}/resources/emscripten/emscripten-pre.js")
+		set(PLAYER_JS_POSTJS "${CMAKE_CURRENT_SOURCE_DIR}/resources/emscripten/emscripten-post.js")
+		set(PLAYER_JS_SHELL "${CMAKE_CURRENT_SOURCE_DIR}/resources/emscripten/emscripten-shell.html")
+
+		set_property(TARGET ${EXE_NAME} PROPERTY LINK_FLAGS "-s ALLOW_MEMORY_GROWTH=1 -s ASYNCIFY -s ASYNCIFY_IGNORE_INDIRECT --pre-js ${PLAYER_JS_PREJS} --post-js ${PLAYER_JS_POSTJS} -sDEFAULT_LIBRARY_FUNCS_TO_INCLUDE=['$autoResumeAudioContext']")
+		set_source_files_properties("src/main.cpp" PROPERTIES OBJECT_DEPENDS "${PLAYER_JS_PREJS};${PLAYER_JS_POSTJS};${PLAYER_JS_SHELL}")
+
+		if(PLAYER_JS_BUILD_SHELL)
+			set_target_properties(${EXE_NAME} PROPERTIES SUFFIX ".html")
+			set_property(TARGET ${EXE_NAME} APPEND_STRING PROPERTY LINK_FLAGS " --shell-file ${PLAYER_JS_SHELL}")
+		endif()
+
+		target_link_libraries(${EXE_NAME} "idbfs.js")
+
+		set_target_properties(${EXE_NAME} PROPERTIES OUTPUT_NAME "${PLAYER_JS_OUTPUT_NAME}")
+	endif()
 
 	# installation
 	include(GNUInstallDirs)
-	install(TARGETS ${PROJECT_NAME}_exe RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+	if(APPLE)
+		install(TARGETS ${EXE_NAME} RUNTIME DESTINATION BUNDLE DESTINATION "${CMAKE_BINARY_DIR}/Package")
+	else()
+		install(TARGETS ${EXE_NAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+	endif()
 
 	if(MSVC)
-		install(FILES $<TARGET_PDB_FILE:${PROJECT_NAME}_exe> DESTINATION ${CMAKE_INSTALL_BINDIR} OPTIONAL)
+		install(FILES $<TARGET_PDB_FILE:${EXE_NAME}> DESTINATION ${CMAKE_INSTALL_BINDIR} OPTIONAL)
+	endif()
+
+	if(CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
+		# Emscripten does not install the wasm file (or the js file when building a shell)
+		if(PLAYER_JS_BUILD_SHELL)
+			install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PLAYER_JS_OUTPUT_NAME}.js DESTINATION ${CMAKE_INSTALL_BINDIR})
+		endif()
+		install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PLAYER_JS_OUTPUT_NAME}.wasm DESTINATION ${CMAKE_INSTALL_BINDIR})
+	endif()
+else()
+	if(${PLAYER_TARGET_PLATFORM} STREQUAL "libretro")
+		add_library(easyrpg_libretro
+			src/platform/libretro/libretro_audio.cpp
+			src/platform/libretro/libretro_audio.h
+			src/platform/libretro/libretro_input_buttons.cpp
+			src/platform/libretro/libretro_ui.cpp
+			src/platform/libretro/libretro_ui.h)
+		target_link_libraries(easyrpg_libretro ${PROJECT_NAME})
+		set_target_properties(easyrpg_libretro PROPERTIES PREFIX "")
+	else()
+		message(FATAL_ERROR "Unsupported library target platform ${PLAYER_TARGET_PLATFORM}")
 	endif()
 endif()
 
@@ -719,13 +802,14 @@ set(MAN_NAME easyrpg-player.6)
 find_program(A2X_EXECUTABLE NAMES a2x a2x.py)
 if(NOT A2X_EXECUTABLE STREQUAL "A2X_EXECUTABLE-NOTFOUND")
 	add_custom_command(OUTPUT resources/${MAN_NAME}
+		COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/resources
 		COMMAND ${A2X_EXECUTABLE} -a player_version="${PROJECT_VERSION}" -f manpage -D ${CMAKE_CURRENT_BINARY_DIR}/resources ${CMAKE_CURRENT_SOURCE_DIR}/resources/${MAN_NAME}.adoc
 		DEPENDS resources/${MAN_NAME}.adoc
 		COMMENT "(Re-)building manpage ${MAN_NAME}"
 		VERBATIM)
 	if(UNIX)
 		add_custom_target(man ALL DEPENDS resources/${MAN_NAME})
-		install(FILES resources/${MAN_NAME} DESTINATION ${CMAKE_INSTALL_MANDIR}/man6)
+		install(FILES ${CMAKE_CURRENT_BINARY_DIR}/resources/${MAN_NAME} DESTINATION ${CMAKE_INSTALL_MANDIR}/man6)
 	else()
 		add_custom_target(man DEPENDS resources/${MAN_NAME})
 	endif()
@@ -763,21 +847,6 @@ endif()
 option(PLAYER_ENABLE_TESTS "Execute unit tests after compilation finishes" ON)
 
 if(PLAYER_ENABLE_TESTS)
-	set(TEST_GAME_REPOSITORY_PATH "${CMAKE_CURRENT_SOURCE_DIR}/lib/TestGame")
-	if(NOT EXISTS ${TEST_GAME_REPOSITORY_PATH})
-		execute_process(COMMAND ${GIT_EXECUTABLE} clone "--depth=1"
-			"https://github.com/EasyRPG/TestGame.git"
-			"${TEST_GAME_REPOSITORY_PATH}")
-	endif()
-	set(TEST_GAME_PATH "${TEST_GAME_REPOSITORY_PATH}/TestGame-2000")
-
-	set(TEST_ENVS "RPG_TEST_GAME_PATH=${TEST_GAME_PATH}")
-	if(EXISTS $ENV{RPG_RTP_PATH})
-		get_filename_component(RPG_RTP_PATH "$ENV{RPG_RTP_PATH}" ABSOLUTE)
-		message(STATUS "using rtp path ${RPG_RTP_PATH}")
-		list(APPEND TEST_ENVS "RPG_RTP_PATH=${RPG_RTP_PATH}")
-	endif()
-
 	file(GLOB TEST_FILES ${CMAKE_CURRENT_SOURCE_DIR}/tests/*.cpp)
 	add_executable(test_runner_player EXCLUDE_FROM_ALL ${TEST_FILES})
 	set_target_properties(test_runner_player PROPERTIES OUTPUT_NAME "test_runner")
@@ -789,6 +858,10 @@ if(PLAYER_ENABLE_TESTS)
 	endif()
 	add_dependencies(check_player test_runner_player)
 	add_dependencies(check check_player)
+
+	if(CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
+		set_property(TARGET test_runner_player APPEND_STRING PROPERTY LINK_FLAGS "-s ALLOW_MEMORY_GROWTH")
+	endif()
 endif()
 
 # Instrumentation framework