spdlog for emscripten

OopsOverflow · Sep 15, 2022 · 7c21319 · 7c21319
1 parent 0a96b34
commit 7c21319
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 12 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "Dependencies/libdatachannel"]
 	path = Dependencies/libdatachannel
 	url = https://github.com/paullouisageneau/libdatachannel
+[submodule "Dependencies/spdlog"]
+	path = Dependencies/spdlog
+	url = https://github.com/gabime/spdlog
diff --git a/Dependencies/spdlog b/Dependencies/spdlog
diff --git a/OpenGL/CMakeLists.txt b/OpenGL/CMakeLists.txt
@@ -163,8 +163,15 @@ target_include_directories(${PROJECT_NAME} PRIVATE "${CMAKE_SOURCE_DIR}/OpenGL/s
 # glm
 target_include_directories(${PROJECT_NAME} SYSTEM PRIVATE "${CMAKE_SOURCE_DIR}/Dependencies/glm")
 
-find_package(spdlog REQUIRED)
-target_link_libraries(${PROJECT_NAME} spdlog::spdlog)
+# spdlog
+if(${BUILD_PLATFORM} STREQUAL wasm)
+	add_subdirectory("${CMAKE_SOURCE_DIR}/Dependencies/spdlog" "spdlog" EXCLUDE_FROM_ALL)
+	target_compile_options(spdlog PUBLIC -pthread)
+	target_link_libraries(${PROJECT_NAME} spdlog::spdlog)
+else ()
+	find_package(spdlog REQUIRED)
+	target_link_libraries(${PROJECT_NAME} spdlog::spdlog)
+endif ()
 
 # libdatachannel
 if(${BUILD_PLATFORM} STREQUAL wasm)

diff --git a/OpenGL/data/wasm/sw.js b/OpenGL/data/wasm/sw.js
@@ -1,8 +1,8 @@
 // credit: https://googlechrome.github.io/samples/service-worker/basic/
 
-const version = 6
+const version = 7
 const PRECACHE = 'precache-v' + version;
-const RUNTIME = 'runtime';
+const RUNTIME = 'runtime-v' + version;
 
 const PRECACHE_URLS = [
   '/MonCraft.data',

diff --git a/OpenGL/src/debug/Debug.hpp b/OpenGL/src/debug/Debug.hpp
@@ -4,9 +4,9 @@
 #include <chrono>
 #include <iomanip>
 #include <iostream>
+#include <sstream>
 #include <spdlog/spdlog.h>
 #include <spdlog/fmt/ostr.h>
-#include <fmt/ostream.h>
 
 class DebugTimer {
 
@@ -67,12 +67,5 @@ namespace glm {
       }
       return os;
   }
-
-  #if FMT_VERSION >= 90000 // fmt version >= 9 requires explicit formatter definitions.
-    template<typename T, length_t N>
-    struct fmt::formatter<vec<N, T>> : ostream_formatter{};
-    template<typename T>
-    struct fmt::formatter<tmat4x4<T>> : ostream_formatter{};
-  #endif 
 }
 
diff --git a/OpenGL/src/multiplayer/server/WebSocketServer.cpp b/OpenGL/src/multiplayer/server/WebSocketServer.cpp
@@ -10,6 +10,7 @@
 #include <functional>
 #include <iostream>
 #include <spdlog/spdlog.h>
+#include <spdlog/fmt/ostr.h>
 #include <utility>
 #include "multiplayer/server/Server.hpp"
 #include "save/ServerConfig.hpp"