better cmake for emscripten flags

framework/filesystem/CMakeLists.txt

@@ -14,7 +14,7 @@ add_library(filesystem_service
 
 target_include_directories(filesystem_service PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/src")
 
-target_link_libraries(filesystem_service
+target_link_libraries(filesystem_service PUBLIC
 	engine
 	logger
 	entt
@@ -30,14 +30,20 @@ if(NOT MM_HEADLESS)
 	#endif
 
 	if(EMSCRIPTEN)
-		set_target_properties(filesystem_service PROPERTIES COMPILE_FLAGS "-s USE_SDL=2")
-		set_target_properties(filesystem_service PROPERTIES LINK_FLAGS "-s USE_SDL=2")
+		target_compile_options(filesystem_service PUBLIC -sUSE_SDL=2)
+		target_link_libraries(filesystem_service PUBLIC -sUSE_SDL=2)
 	elseif(VCPKG_TARGET_TRIPLET)
-		target_link_libraries(filesystem_service SDL2::SDL2 SDL2::SDL2main SDL2::SDL2-static)
+		target_link_libraries(filesystem_service
+			PUBLIC
+				SDL2::SDL2
+			PRIVATE
+				SDL2::SDL2main
+				SDL2::SDL2-static
+		)
 	else()
 		#if not android or emscripten
 		target_include_directories(filesystem_service PUBLIC "${SDL2_INCLUDE_DIR}")
-		target_link_libraries(filesystem_service ${SDL2_LIBRARY})
+		target_link_libraries(filesystem_service PUBLIC ${SDL2_LIBRARY})
 		#endif
 	endif()
 endif()

framework/filesystem/src/mm/services/filesystem.cpp

@@ -33,6 +33,7 @@ bool FilesystemService::enable(Engine&, std::vector<UpdateStrategies::TaskInfo>&
 		return false;
 	}
 
+	// TODO: why exclude EMSCRIPTEN here? also wrong macro
 #if !defined(MM_HEADLESS) && !defined(EMSCRIPTEN)
 	char* pref_path = SDL_GetPrefPath("made_of_jelly", _app_name);
 #else

framework/input/CMakeLists.txt

@@ -15,12 +15,9 @@ target_link_libraries(input_service
 	sdl_service
 )
 
-if(EMSCRIPTEN)
-	set_target_properties(input_service PROPERTIES COMPILE_FLAGS "-s USE_SDL=2")
-	set_target_properties(input_service PROPERTIES LINK_FLAGS "-s USE_SDL=2")
-else()
-	target_include_directories(input_service PUBLIC "${SDL2_INCLUDE_DIR}")
-endif()
+#if(NOT EMSCRIPTEN)
+	#target_include_directories(input_service PUBLIC "${SDL2_INCLUDE_DIR}")
+#endif()
 
 if (BUILD_TESTING)
 	add_subdirectory(test)

framework/opengl_primitives/CMakeLists.txt

@@ -2,9 +2,6 @@ cmake_minimum_required(VERSION 3.9 FATAL_ERROR)
 
 project(opengl_primitives CXX)
 
-file(GLOB_RECURSE CPP_FILES src/*.cpp)
-file(GLOB_RECURSE HPP_FILES src/*.hpp)
-
 add_library(opengl_primitives
 	src/mm/opengl/buffer.hpp
 	src/mm/opengl/buffer.cpp
@@ -31,7 +28,7 @@ add_library(opengl_primitives
 
 target_include_directories(opengl_primitives PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/src")
 
-target_link_libraries(opengl_primitives
+target_link_libraries(opengl_primitives PUBLIC
 	glm
 	stb_image
 	#sdl
@@ -43,14 +40,16 @@ target_link_libraries(opengl_primitives
 )
 
 if(MM_OPENGL_3_GLES)
-	target_link_libraries(opengl_primitives "GL") # TODO: make more specific
+	target_link_libraries(opengl_primitives PUBLIC "GL") # TODO: make more specific
 	if(EMSCRIPTEN)
-		set_target_properties(opengl_primitives PROPERTIES COMPILE_FLAGS "-s USE_WEBGL2=1 -s USE_SDL=2")
-		set_target_properties(opengl_primitives PROPERTIES LINK_FLAGS "-s USE_WEBGL2=1 -s USE_SDL=2")
+		# USE_SDL=2 inherited from sdl_service
+		# TODO: USE_WEBGL2 -> MIN_WEBGL_VERSION=2 maybe
+		# technically only FULL_ES3 would be needed
+		target_link_libraries(opengl_primitives PUBLIC -sUSE_WEBGL2=1 -sFULL_ES3=1)
 	endif()
 
 else()
-	target_link_libraries(opengl_primitives glad)
+	target_link_libraries(opengl_primitives PUBLIC glad)
 endif()
 
 if (BUILD_TESTING)

framework/opengl_renderer/CMakeLists.txt

@@ -17,7 +17,6 @@ add_library(opengl_renderer_s
 
 target_include_directories(opengl_renderer_s PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/src")
 
-add_definitions(-DGLM_ENABLE_EXPERIMENTAL)
 target_link_libraries(opengl_renderer_s
 	engine
 	logger
@@ -26,11 +25,6 @@ target_link_libraries(opengl_renderer_s
 	sdl_service
 )
 
-if(EMSCRIPTEN)
-	set_target_properties(opengl_renderer_s PROPERTIES COMPILE_FLAGS "-s USE_SDL=2")
-	set_target_properties(opengl_renderer_s PROPERTIES LINK_FLAGS "-s USE_SDL=2")
-endif()
-
 ############# imgui opengl renderer tools ###########
 
 add_library(imgui_opengl_renderer_tools

framework/sdl_service/CMakeLists.txt

@@ -12,7 +12,7 @@ add_library(sdl_service
 target_include_directories(sdl_service PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/src")
 target_include_directories(sdl_service PUBLIC "${SDL2_INCLUDE_DIR}")
 
-target_link_libraries(sdl_service
+target_link_libraries(sdl_service PUBLIC
 	entt
 	logger
 	#glm
@@ -25,23 +25,29 @@ target_link_libraries(sdl_service
 #endif
 
 if(EMSCRIPTEN)
-	set_target_properties(sdl_service PROPERTIES COMPILE_FLAGS "-s USE_SDL=2")
-	set_target_properties(sdl_service PROPERTIES LINK_FLAGS "-s USE_SDL=2")
+	target_compile_options(sdl_service PUBLIC -sUSE_SDL=2)
+	target_link_libraries(sdl_service PUBLIC -sUSE_SDL=2)
 else()
 	#if not android or emscripten
 	target_include_directories(sdl_service PUBLIC "${SDL2_INCLUDE_DIR}")
-	target_link_libraries(sdl_service ${SDL2_LIBRARY})
+	target_link_libraries(sdl_service PUBLIC ${SDL2_LIBRARY})
 	#endif
 endif()
 
 if(MM_OPENGL_3_GLES)
-	target_link_libraries(sdl_service "GL") # TODO: make more specific
+	target_link_libraries(sdl_service PRIVATE "GL") # TODO: make more specific
 else()
-	target_link_libraries(sdl_service glad)
+	target_link_libraries(sdl_service PRIVATE glad)
 endif()
 
 if(VCPKG_TARGET_TRIPLET)
-	target_link_libraries(sdl_service SDL2::SDL2 SDL2::SDL2main SDL2::SDL2-static)
+	target_link_libraries(sdl_service
+		PUBLIC
+			SDL2::SDL2
+		PRIVATE
+			SDL2::SDL2main
+			SDL2::SDL2-static
+	)
 endif()
 
 if(BUILD_TESTING)

framework/simple_sdl_renderer/CMakeLists.txt

@@ -18,11 +18,6 @@ target_link_libraries(simple_sdl_renderer_service
 	sdl_service
 )
 
-if(EMSCRIPTEN)
-	set_target_properties(simple_sdl_renderer_service PROPERTIES COMPILE_FLAGS "-s USE_SDL=2")
-	set_target_properties(simple_sdl_renderer_service PROPERTIES LINK_FLAGS "-s USE_SDL=2")
-endif()
-
 if (BUILD_TESTING)
 	add_subdirectory(test)
 endif()