Merge branch 'unstable' into obsidian-unstable

obsidian-level-maker · Jul 19, 2021 · c175422 · c175422
2 parents e169d44 + 5e45c33
commit c175422
Show file tree

Hide file tree

Showing 855 changed files with 307,324 additions and 237,100 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -162,6 +162,7 @@ target_include_directories(obsidian PRIVATE source_files/zdbsp_src)
 target_include_directories(obsidian PRIVATE source_files/lua_src)
 target_include_directories(obsidian PRIVATE source_files/slump_src)
 target_include_directories(obsidian PRIVATE source_files/zlib_src)
+target_include_directories(obsidian PRIVATE source_files/fmt_src/include)
 
 if(MINGW OR WIN32)
   target_compile_definitions(obsidian PRIVATE WIN32)