Fix modules

.gitmodules

@@ -1,21 +0,0 @@
-[submodule "lib/glfw"]
-	path = lib/glfw
-	url = https://github.com/glfw/glfw.git
-[submodule "lib/glm"]
-	path = lib/glm
-	url = https://github.com/g-truc/glm.git
-[submodule "lib/SDL"]
-	path = lib/SDL
-	url = https://github.com/libsdl-org/SDL.git
-[submodule "lib/openal-soft"]
-	path = lib/openal-soft
-	url = https://github.com/kcat/openal-soft
-[submodule "lib/AudioFile"]
-	path = lib/AudioFile
-	url = https://github.com/adamstark/AudioFile.git
-[submodule "lib/freetype"]
-	path = lib/freetype
-	url = https://gitlab.freedesktop.org/freetype/freetype.git
-[submodule "lib/libarchive"]
-	path = lib/libarchive
-	url = https://github.com/libarchive/libarchive

lib/CMakeLists.txt

@@ -3,51 +3,53 @@
 # This software is released under the MIT License.
 # https://opensource.org/licenses/MIT
 
+include(FetchContent)
+
 # GLFW
 if(DAWN_TARGET_GLFW)
-  if(${CMAKE_SYSTEM_NAME} MATCHES "Emscripten")
+  FetchContent_Declare(glfw URL https://github.com/glfw/glfw/releases/download/3.4/glfw-3.4.zip)
-    set(DAWN_EMSCRIPTEN_FLAGS "${DAWN_EMSCRIPTEN_FLAGS} -s USE_GLFW=3" CACHE INTERNAL ${DAWN_CACHE_TARGET})
+  FetchContent_MakeAvailable(glfw)
-    add_subdirectory(glad)
-  else()
-    add_subdirectory(glad)
-    add_subdirectory(glfw)
-  endif()
-endif()
 
-# SDL
-if(DAWN_TARGET_SDL2)
   add_subdirectory(glad)
-  add_subdirectory(SDL)
 endif()
 
 # GLM
-add_subdirectory(glm)
+FetchContent_Declare(
+  glm
+  GIT_REPOSITORY  https://github.com/g-truc/glm
+  GIT_TAG         0af55ccecd98d4e5a8d1fad7de25ba429d60e863
+)
+FetchContent_MakeAvailable(glm)
 
 # FreeType
-if(${CMAKE_SYSTEM_NAME} MATCHES "Emscripten")
+FetchContent_Declare(
-  set(DAWN_EMSCRIPTEN_FLAGS "${DAWN_EMSCRIPTEN_FLAGS} -s USE_FREETYPE=1" CACHE INTERNAL ${DAWN_CACHE_TARGET})
+  freetype
-else()
+  GIT_REPOSITORY  https://gitlab.freedesktop.org/freetype/freetype
-  add_subdirectory(freetype)
+  GIT_TAG         VER-2-13-3
-endif()
+)
+FetchContent_MakeAvailable(freetype)
 
 #LibArchive
-if(DAWN_TARGET_ARCHIVE)
+FetchContent_Declare(
-  add_subdirectory(libarchive)
+  libarchive
-endif()
+  GIT_REPOSITORY https://github.com/libarchive/libarchive
+  GIT_TAG        v3.7.6
+)
+FetchContent_MakeAvailable(libarchive)
+
+# JSON
+FetchContent_Declare(
+  json
+  URL https://github.com/nlohmann/json/releases/download/v3.11.3/json.tar.xz
+)
+FetchContent_MakeAvailable(json)
 
 # OpenAL
-if(DAWN_TARGET_OPENAL)
+# if(DAWN_TARGET_OPENAL)
-  set(LIBTYPE "STATIC")
+#   set(LIBTYPE "STATIC")
-  add_subdirectory(openal-soft)
+#   add_subdirectory(openal-soft)
 
-  set(BUILD_TESTS OFF CACHE BOOL "Build tests" FORCE)
+#   set(BUILD_TESTS OFF CACHE BOOL "Build tests" FORCE)
-  set(BUILD_EXAMPLES OFF CACHE BOOL "Build examples" FORCE) 
+#   set(BUILD_EXAMPLES OFF CACHE BOOL "Build examples" FORCE) 
-  add_subdirectory(AudioFile)
+#   add_subdirectory(AudioFile)
-endif()
+# endif()
-
-# Emscripten (TESTING ONLY)
-if(DEFINED DAWN_EMSCRIPTEN_FLAGS)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${DAWN_EMSCRIPTEN_FLAGS}" CACHE INTERNAL ${DAWN_CACHE_TARGET})
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${DAWN_EMSCRIPTEN_FLAGS}" CACHE INTERNAL ${DAWN_CACHE_TARGET})
-  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${DAWN_EMSCRIPTEN_FLAGS}" CACHE INTERNAL ${DAWN_CACHE_TARGET})
-endif()