Emscripten web app cleanup

johnhues · Jan 29, 2024 · a2488cc · a2488cc
1 parent 8a2d96f
commit a2488cc
Show file tree

Hide file tree

Showing 7 changed files with 2,550 additions and 110 deletions.
diff --git a/AddBundle.cmake b/AddBundle.cmake
@@ -190,9 +190,17 @@ function(ae_add_bundle)
 			list(APPEND _AE_EM_LINKER_FLAGS
 				"--closure=1" # Enable Closure compiler for aggressive JS size minification
 				"-O3"
+				# "-Wl,-u,htonl" # Workaround for -flto issue
+				# "-flto"
+				# "-fno-exceptions"
 			)
+			# list(APPEND _AE_EM_COMPILER_FLAGS
+			# 	"-flto"
+			# 	"-fno-exceptions"
+			# )
 		endif()
 		string (REPLACE ";" " " _AE_EM_LINKER_FLAGS "${_AE_EM_LINKER_FLAGS}")
+		string (REPLACE ";" " " _AE_EM_COMPILER_FLAGS "${_AE_EM_COMPILER_FLAGS}")
 
 		set_target_properties(${ADD_BUNDLE_EXECUTABLE_NAME} PROPERTIES
 			ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${ADD_BUNDLE_EXECUTABLE_NAME}"
@@ -208,6 +216,7 @@ function(ae_add_bundle)
 
 		set_target_properties(${ADD_BUNDLE_EXECUTABLE_NAME} PROPERTIES
 			LINK_FLAGS "${_AE_EM_LINKER_FLAGS}"
+			COMPILE_FLAGS "${_AE_EM_COMPILER_FLAGS}"
 			OUTPUT_NAME "index"
 			SUFFIX ${_AE_EM_OUT_SUFFIX}
 		)

diff --git a/docs/examples/22_read_me/index.js b/docs/examples/22_read_me/index.js
diff --git a/docs/examples/22_read_me/index.wasm b/docs/examples/22_read_me/index.wasm
diff --git a/docs/examples/22_read_me/index.webmanifest b/docs/examples/22_read_me/index.webmanifest
@@ -4,7 +4,7 @@
 	"display": "fullscreen",
 	"icons": [
 		{
-			"src": "https://raw.githubusercontent.com/johnhues/aether-game-utils/master/examples/data/Icon.png",
+			"src": "https://raw.githubusercontent.com/johnhues/aether-game-utils/master/examples/data/WebIcon.png",
 			"type": "image/png",
 			"sizes": "512x512"
 		}

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -37,7 +37,7 @@ if(EMSCRIPTEN)
 	add_compile_definitions(DATA_DIR="https://raw.githubusercontent.com/johnhues/aether-game-utils/master/examples/data")
 endif()
 if(EMSCRIPTEN)
-	set(AE_EXAMPLE_RESOURCES "index.html;index.webmanifest;data/Icon.png")
+	set(AE_EXAMPLE_RESOURCES "index.html;index.webmanifest;data/WebIcon.png")
 elseif(APPLE)
 	set(AE_EXAMPLE_RESOURCES "data/Icon.icns")
 endif()

diff --git a/examples/data/WebIcon.png b/examples/data/WebIcon.png
diff --git a/examples/index.webmanifest b/examples/index.webmanifest
@@ -1,10 +1,10 @@
 {
 	"name": "Example",
-	"start_url": "http://localhost:8000/examples",
+	"start_url": "http://localhost:8000/em/examples",
 	"display": "fullscreen",
 	"icons": [
 		{
-			"src": "http://localhost:8000/examples/data/Icon.png",
+			"src": "http://localhost:8000/examples/data/WebIcon.png",
 			"type": "image/png",
 			"sizes": "512x512"
 		}