Release

.editorconfig

@@ -11,7 +11,7 @@ insert_final_newline = true
 indent_style = space
 indent_size = 4
 
-[*.{sh,rb,js,yml,adoc}]
+[*.{sh,rb,js,yml,yaml,adoc}]
 indent_style = space
 indent_size = 2
 

.github/labeler.yml

@@ -24,7 +24,7 @@ Documentation:
 
 Tests:
 - changed-files:
-  - any-glob-to-any-file: [ tests/** ]
+  - any-glob-to-any-file: [ games/** ]
 
 Window/Scenes:
 - changed-files:

.github/workflows/stable-compilation.yml

@@ -19,8 +19,8 @@ defaults:
 
 jobs:
   docker:
-    name: ${{ matrix.image }}
-    runs-on: ubuntu-latest
+    name: ${{ matrix.image }} (${{ matrix.os.arch }})
+    runs-on: ${{ matrix.os.name }}
     container:
       image: ${{ matrix.image }}
 
@@ -30,10 +30,22 @@ jobs:
         image:
           #   version of: # CMake  | g++    | SDL    |     support end  #
           # -------------------------------------------------------------
-          - ubuntu:20.04  # 3.16.3 |  9.3.0 | 2.0.10 | LTS       (4/25) #
           - debian:11     # 3.18.4 | 10.2.1 | 2.0.14 | oldstable (8/24) #
-          - ubuntu:22.04  # 3.22.1 | 11.2.0 | 2.0.20 | LTS       (6/27) #
+          - ubuntu:22.04  # 3.22.1 | 11.2.0 | 2.0.20 | LTS       (4/27) #
           - debian:12     # 3.25.1 | 12.2.0 | 2.26.5 | stable    (6/26) #
+          - ubuntu:24.04  # 3.28.3 | 13.2.0 | 2.30.0 | LTS       (4/29) #
+        os:
+          - arch: x86_64
+            name: ubuntu-latest
+          - arch: arm64
+            name: ubuntu-24.04-arm
+        exclude:
+          - os:
+              arch: arm64
+            image: debian:11
+          - os:
+              arch: arm64
+            image: ubuntu:22.04
 
     steps:
       - name: Install dependencies
@@ -45,7 +57,7 @@ jobs:
             libicu-dev libexpat1-dev libinih-dev nlohmann-json3-dev \
             libsdl2-dev libpng-dev libpixman-1-dev libfmt-dev \
             libfreetype6-dev libharfbuzz-dev libmpg123-dev libsndfile-dev \
-            libvorbis-dev libopusfile-dev libspeexdsp-dev \
+            libvorbis-dev libopusfile-dev libspeexdsp-dev liblhasa-dev \
             libdrm-dev libgbm-dev # only needed for sdl2 on debian 11
 
       - name: Clone Repository

.gitignore

@@ -146,3 +146,18 @@ eboot.bin
 *.pem
 *.keystore
 *.jks
+
+# idk guys
+games/
+EasyRPG Player.app/
+./leasy.user.lua
+# and doc thingies
+docs/html/
+docs/latex/
+doxygen-awesome-css/
+__pycache__/
+# tools/
+dump/
+dump.json
+dump.lua
+assembly/

CMakeLists.txt

@@ -1,9 +1,37 @@
-cmake_minimum_required(VERSION 3.16...3.31 FATAL_ERROR)
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+cmake_minimum_required(VERSION 3.18...3.31 FATAL_ERROR)
 
-project(EasyRPG_Player VERSION 0.8.1
+project(EasyRPG_Player VERSION 0.8.1.1
 	DESCRIPTION "Interpreter for RPG Maker 2000/2003 games"
 	HOMEPAGE_URL "https://easyrpg.org"
-	LANGUAGES CXX)
+	LANGUAGES C CXX)
+
+if (CMAKE_CXX_COMPILER_ID MATCHES "Clang|AppleClang")
+	set(DEBUG_FLAGS
+		-g3
+		-O0
+		-fno-omit-frame-pointer
+		-fno-inline
+		-fno-optimize-sibling-calls
+
+	)
+
+	set(WARNING_FLAGS
+		-Wall
+		-Wextra
+		-Wpedantic
+		-Wshadow
+		-Wconversion
+		-Wsign-conversion
+		-Wnull-dereference
+		-Wdouble-promotion
+		-Wformat=2
+	)
+
+	set(SANITIZER_FLAGS
+		-fsanitize=address,undefined
+	)
+endif()
 
 # Extra CMake Module files
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/builds/cmake/Modules")
@@ -23,6 +51,7 @@ endif()
 
 # C++17 is required
 set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_C_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS ON)
 
@@ -31,6 +60,17 @@ option(BUILD_SHARED_LIBS "Build shared easyrpg_libretro core" ON)
 
 option(CMAKE_FIND_PACKAGE_PREFER_CONFIG "Prefer config files over bundled FindXXX files. Set this to OFF when configuration fails and report a bug." ON)
 
+file(GLOB_RECURSE LEASY_SRC CONFIGURE_DEPENDS
+	src/leasy/**/*.cpp
+	src/leasy/**/*.c
+	src/leasy/**/*.h
+	src/leasy/**/*.hpp
+	src/leasy/*.cpp
+	src/leasy/*.c
+	src/leasy/*.h
+	src/leasy/*.hpp
+)
+
 # Source Files
 add_library(${PROJECT_NAME} OBJECT
 	src/lcf_data.cpp
@@ -68,8 +108,6 @@ add_library(${PROJECT_NAME} OBJECT
 	src/baseui.h
 	src/battle_animation.cpp
 	src/battle_animation.h
-	src/battle_message.cpp
-	src/battle_message.h
 	src/bitmap.cpp
 	src/bitmapfont.h
 	src/bitmapfont_glyph.h
@@ -192,6 +230,8 @@ add_library(${PROJECT_NAME} OBJECT
 	src/game_map.h
 	src/game_message.cpp
 	src/game_message.h
+	src/game_message_terms.cpp
+	src/game_message_terms.h
 	src/game_party_base.cpp
 	src/game_party_base.h
 	src/game_party.cpp
@@ -476,6 +516,38 @@ add_library(${PROJECT_NAME} OBJECT
 	src/window_teleport.h
 	src/window_varlist.cpp
 	src/window_varlist.h
+	${LEASY_SRC}
+	src/platform/export.cpp
+	src/leasy/inspections.hpp
+	src/leasy/meta/node/node.hpp
+	src/leasy/cli/cli.hpp
+	src/leasy/cli/cli.cpp
+	src/leasy/metadata/dumper.cpp
+		src/leasy/metadata/structs/option.hpp
+	src/leasy/settings/settings.hpp
+		src/leasy/meta/node/visual2D/node2d.hpp
+		src/leasy/meta/node/types.hpp
+		src/leasy/meta/node/visual2D/sprite2d.hpp
+		src/leasy/meta/node/node.cpp
+		src/leasy/meta/node/visual2D/node2d.cpp
+		src/leasy/metadata/Assembly.hpp
+		src/leasy/metadata/Domain.hpp
+		src/leasy/iky7/nameof.cpp
+		src/leasy/metadata/Domain.cpp
+		src/leasy/metadata/builtins/arithmetics.cpp
+		src/leasy/metadata/glues/lua_glues.cpp
+		src/leasy/metadata/glues/lua_glues.hpp
+		src/leasy/metadata/glues/glues.cpp
+		src/leasy/metadata/glues/luatypeparser.hpp
+		src/leasy/types/string.hpp
+		src/leasy/types/iterable.hpp
+		src/leasy/types/string.cpp
+		src/leasy/meta/node/visual2D/sprite2d.cpp
+		src/leasy/metadata/builtins/reflection.cpp
+		src/leasy/kits/support.hpp
+		src/leasy/kits/cppsupport/functionnal.hpp
+		src/leasy/metadata/fields.hpp
+		src/leasy/events.cpp
 )
 
 # These are actually unused when building in CMake
@@ -607,7 +679,7 @@ elseif(PLAYER_TARGET_PLATFORM STREQUAL "SDL2")
 	# SDL2 depends on some systems on SDL2::SDL2main but SDL2::SDL2 is not always a dependency of it
 	# Manually add the dependencies
 	player_find_package(NAME SDL2
-		VERSION 2.0.5
+		VERSION 2.0.14
 		TARGET SDL2::SDL2
 		REQUIRED)
 
@@ -779,6 +851,10 @@ endif()
 # Shared by homebrew platforms
 if(NINTENDO_3DS OR NINTENDO_WII OR NINTENDO_WIIU OR NINTENDO_WIIU OR NINTENDO_SWITCH OR VITA)
 	target_compile_options(${PROJECT_NAME} PUBLIC -fno-exceptions -fno-rtti)
+	if(VITA)
+		# This optimisation is unstable on Vita (crashes at the end of MainLoop)
+		target_compile_options(${PROJECT_NAME} PUBLIC -fno-optimize-sibling-calls)
+	endif()
 	set(CMAKE_DL_LIBS "") # hack4icu!
 	set(PLAYER_ENABLE_TESTS OFF)
 	option(PLAYER_VERSIONED_PACKAGES "Create zip packages with versioned name (for internal use)" ON)
@@ -1157,15 +1233,21 @@ if(PLAYER_HAS_AUDIO)
 	endif()
 endif()
 
+option(PLAYER_MACOS_BUNDLE "Build macOS app bundle" ON)
 # Executable
 if(PLAYER_BUILD_EXECUTABLE AND ${PLAYER_TARGET_PLATFORM} MATCHES "^SDL.*$" AND NOT PLAYER_CONSOLE_PORT)
-	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/platform/sdl/main.cpp" ${${PROJECT_NAME}_BUNDLE_ICON})
-		configure_file(resources/macos/Info.plist.in resources/macos/Info.plist @ONLY)
-		set_target_properties(${EXE_NAME} PROPERTIES MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_BINARY_DIR}/resources/macos/Info.plist")
-		set_target_properties(${EXE_NAME} PROPERTIES OUTPUT_NAME "EasyRPG Player")
+	if (APPLE) 
+		if(APPLE AND PLAYER_MACOS_BUNDLE)
+			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/platform/sdl/main.cpp" ${${PROJECT_NAME}_BUNDLE_ICON})
+			configure_file(resources/macos/Info.plist.in resources/macos/Info.plist @ONLY)
+			set_target_properties(${EXE_NAME} PROPERTIES MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_BINARY_DIR}/resources/macos/Info.plist")
+			set_target_properties(${EXE_NAME} PROPERTIES OUTPUT_NAME "EasyRPG Player")
+		else()
+			set(EXE_NAME easyrpg-player)
+			add_executable(${EXE_NAME} "src/platform/sdl/main.cpp")
+		endif()
 	else()
 		set(EXE_NAME ${PROJECT_NAME}_exe)
 		if(CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
@@ -1493,26 +1575,26 @@ if(DOXYGEN_FOUND)
 	add_dependencies(doc player_doc)
 endif()
 
-# Unit tests
-option(PLAYER_ENABLE_TESTS "Execute unit tests after compilation finishes" ON)
+# Unit games
+option(PLAYER_ENABLE_TESTS "Execute unit games after compilation finishes" ON)
 
 if(PLAYER_ENABLE_TESTS)
-	file(GLOB TEST_FILES ${CMAKE_CURRENT_SOURCE_DIR}/tests/*.cpp)
+	file(GLOB TEST_FILES ${CMAKE_CURRENT_SOURCE_DIR}/games/*.cpp)
 	add_executable(test_runner_player EXCLUDE_FROM_ALL ${TEST_FILES})
 	set_target_properties(test_runner_player PROPERTIES
 		OUTPUT_NAME "test_runner"
 		WIN32_EXECUTABLE FALSE
 	)
 
 	if(CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
-		target_compile_definitions(test_runner_player PUBLIC EP_NATIVE_TEST_PATH=\"${CMAKE_CURRENT_SOURCE_DIR}/tests/assets\")
+		target_compile_definitions(test_runner_player PUBLIC EP_NATIVE_TEST_PATH=\"${CMAKE_CURRENT_SOURCE_DIR}/games/assets\")
 		target_compile_definitions(test_runner_player PUBLIC EP_TEST_PATH=\"/assets\")
 		target_compile_definitions(test_runner_player PUBLIC DOCTEST_CONFIG_NO_EXCEPTIONS_BUT_WITH_ALL_ASSERTS=1)
 
 		target_link_libraries(test_runner_player "nodefs.js")
 		set_property(TARGET test_runner_player PROPERTY LINK_FLAGS "-sALLOW_MEMORY_GROWTH --bind")
 	else()
-		target_compile_definitions(test_runner_player PUBLIC EP_TEST_PATH=\"${CMAKE_CURRENT_SOURCE_DIR}/tests/assets\")
+		target_compile_definitions(test_runner_player PUBLIC EP_TEST_PATH=\"${CMAKE_CURRENT_SOURCE_DIR}/games/assets\")
 	endif()
 	target_link_libraries(test_runner_player ${PLAYER_TEST_LIBRARIES})
 	if(CMAKE_COLOR_DIAGNOSTICS)
@@ -1680,3 +1762,9 @@ if (${PLAYER_TARGET_PLATFORM} STREQUAL "SDL1")
 	message(WARNING "SDL1 is deprecated!")
 	message(WARNING "Please migrate to SDL2 or SDL3!")
 endif()
+
+source_group(
+    TREE "${CMAKE_SOURCE_DIR}/src"
+    PREFIX "src"
+    FILES ${PLAYER_SOURCES}
+)