cmake: Migrate to proper preset template

Author: Desdaemon

CMakeLists.txt

@@ -1288,8 +1288,8 @@ if(PLAYER_BUILD_EXECUTABLE AND ${PLAYER_TARGET_PLATFORM} MATCHES "^SDL.*$" AND N
 
 		target_link_libraries(${EXE_NAME} "idbfs.js")
 		target_link_libraries(${EXE_NAME} "websocket.js")
-		set_property(TARGET ${EXE_NAME} APPEND_STRING PROPERTY LINK_FLAGS " -s EXPORTED_RUNTIME_METHODS='[\"ccall\",\"cwrap\",\"intArrayFromString\",\"ALLOC_NORMAL\",\"allocate\",\"getValue\",\"FS\"]'")
-		set_target_properties(${EXE_NAME} PROPERTIES OUTPUT_NAME "${PLAYER_JS_OUTPUT_NAME}")
+		player_find_githash(HASH_VAR GIT_HASH)
+		set_target_properties(${EXE_NAME} PROPERTIES OUTPUT_NAME "${PLAYER_JS_OUTPUT_NAME}.${GIT_HASH}")
 	endif()
 
 	# installation

CMakePresets.json

@@ -78,7 +78,7 @@
 				"PLAYER_FIND_ROOT_PATH_APPEND": "ON",
 				"PLAYER_JS_BUILD_SHELL": "ON"
 			},
-			"easyrpg_platforms": ["sdl3", "sdl2"]
+			"easyrpg_platforms": ["sdl3", "sdl2", "yno", "yno-simd"]
 		},
 		{
 			"name": "android-armeabi-v7a",

builds/cmake/CMakePresets.json.template

@@ -40,7 +40,9 @@
 			"displayName": "windows base preset",
 			"hidden": true,
 			"toolchainFile": "$env{EASYRPG_BUILDSCRIPTS}/windows/vcpkg/scripts/buildsystems/vcpkg.cmake",
-			"inherits": ["base"],
+			"inherits": [
+				"base"
+			],
 			"condition": {
 				"type": "equals",
 				"lhs": "${hostSystemName}",
@@ -83,6 +85,35 @@
 				"PLAYER_TARGET_PLATFORM": "SDL2"
 			}
 		},
+		{
+			"name": "build-yno",
+			"displayName": "builds for YNO (SDL2)",
+			"hidden": true,
+			"cacheVariables": {
+				"PLAYER_ENABLE_FMMIDI": "OFF",
+				"PLAYER_WITH_MPG123": "OFF",
+				"PLAYER_WITH_LIBSNDFILE": "OFF",
+				"PLAYER_WITH_OGGVORBIS": "OFF",
+				"PLAYER_WITH_WILDMIDI": "OFF",
+				"PLAYER_WITH_FLUIDLITE": "OFF",
+				"PLAYER_WITH_XMP": "OFF",
+				"PLAYER_ENABLE_DRWAV": "OFF",
+				"PLAYER_JS_BUILD_SHELL": "ON",
+				"PLAYER_JS_OUTPUT_NAME": "ynoengine",
+				"PLAYER_JS_GAME_URL": "/data/",
+				"PLAYER_TARGET_PLATFORM": "SDL2"
+			}
+		},
+		{
+			"name": "build-yno-simd",
+			"displayName": "builds for YNO (SDL2, SIMD)",
+			"hidden": true,
+			"inherits": "build-yno",
+			"cacheVariables": {
+				"PLAYER_JS_OUTPUT_NAME": "ynoengine-simd",
+				"CMAKE_CXX_FLAGS": "-msimd128"
+			}
+		},
 		{
 			"name": "build-sdl3",
 			"displayName": "builds using SDL3 backend",
@@ -100,4 +131,4 @@
 			}
 		}
 	]
-}
+}

builds/cmake/CMakePresetsBase.json

@@ -81,3 +81,25 @@ function(player_find_gitversion)
 		set(${FIND_GITVER_MESSAGE_VAR} ${message} PARENT_SCOPE)
 	endif()
 endfunction()
+
+function(player_find_githash)
+	cmake_parse_arguments(FIND_GITHASH "" "HASH_VAR" "" ${ARGN})
+	git_describe(GIT_DESCRIPTION)
+	if(GIT_DESCRIPTION)
+		string(REPLACE "-" ";" GIT_DESCRIPTION ${GIT_DESCRIPTION})
+		list(LENGTH GIT_DESCRIPTION GIT_DESCRIPTION_PARTS)
+		if(GIT_DESCRIPTION_PARTS EQUAL 3)
+			list(GET GIT_DESCRIPTION 0 GIT_TAG)
+			list(GET GIT_DESCRIPTION 1 GIT_COMMITS)
+			list(GET GIT_DESCRIPTION 2 GIT_HASH)
+			string(PREPEND GIT_COMMITS "+")
+			string(SUBSTRING ${GIT_HASH} 1 -1 GIT_HASH) # strip the g prefix
+		else()
+			# no tags found, only hash (checkout without history/detached head)
+			list(GET GIT_DESCRIPTION 0 GIT_HASH)
+		endif()
+		if(FIND_GITHASH_HASH_VAR)
+			set(${FIND_GITHASH_HASH_VAR} ${GIT_HASH} PARENT_SCOPE)
+		endif()
+	endif()
+endfunction()

builds/cmake/Modules/PlayerMisc.cmake

@@ -23,12 +23,14 @@ def append_name(name):
 		item["name"] += "-"
 	item["name"] += name
 
-platform_display = dict(
-	sdl1="SDL1",
-	sdl2="SDL2",
-	sdl3="SDL3",
-	libretro="libretro core"
-)
+platform_display = {
+	"sdl1": "SDL1",
+	"sdl2": "SDL2",
+	"sdl3": "SDL3",
+	"libretro": "libretro core",
+	"yno": "YNO",
+	"yno-simd": "YNO [SIMD]",
+}
 
 # This creates the following configurePresets from the one in the template:
 # - As specified in the template

builds/cmake/gen-cmake-presets.py

@@ -0,0 +1,8 @@
+build-all: (build "emscripten-yno-release") (build "emscripten-yno-simd-release") zip
+
+build preset:
+	cmake --preset={{ preset }}
+	cmake --build --preset={{ preset }}
+
+zip:
+	zip -j ynoengine.zip build/emscripten-yno-simd-release/*.{js,wasm} build/emscripten-yno-release/*.{js,wasm}