More minor fixes

spdlog now builds as a library with nasm workaround

CMakeLists.txt

@@ -55,11 +55,11 @@ include_directories(./)
 
 # build spdlog as a shared library to improve compile times
 # adding this as a SYSTEM include suppresses all the terrible warnings in spdlog
-IF (WIN32)
-include_directories(third-party/spdlog/include)
-ELSE()
 include_directories(SYSTEM third-party/spdlog/include)
-ENDIF()
+# this makes spdlog generate a shared library that we can link against
+set(SPDLOG_BUILD_SHARED ON)
+# this makes the spdlog includes not use the header only version, making compiling faster
+add_definitions(-DSPDLOG_COMPILED_LIB)
 
 # build asset packer/unpacker
 add_subdirectory(asset_tool)
@@ -103,4 +103,4 @@ add_subdirectory(third-party/spdlog)
 # windows memory management lib
 IF (WIN32)
     add_subdirectory(third-party/mman)
-ENDIF ()
+ENDIF ()

decompiler/util/LispPrint.cpp

@@ -1,5 +1,3 @@
-#include "LispPrint.h"
-
 #include <cassert>
 #include <iostream>
 #include <vector>
@@ -524,4 +522,4 @@ std::shared_ptr<Form> buildList(std::vector<std::string>& forms) {
     f.push_back(toForm(x));
   }
   return buildList(f.data(), f.size());
-}
+}

game/CMakeLists.txt

@@ -26,7 +26,7 @@ endif(CMAKE_COMPILER_IS_GNUCXX)
 
 enable_language(ASM_NASM)
 set(CMAKE_ASM_NASM_SOURCE_FILE_EXTENSIONS ${CMAKE_ASM_NASM_SOURCE_FILE_EXTENSIONS} asm)
-set(CMAKE_ASM_NASM_COMPILE_OBJECT "<CMAKE_ASM_NASM_COMPILER> <INCLUDES> <FLAGS> -f ${CMAKE_ASM_NASM_OBJECT_FORMAT} -o <OBJECT> <SOURCE>")
+set(CMAKE_ASM_NASM_COMPILE_OBJECT "<CMAKE_ASM_NASM_COMPILER> <INCLUDES> -f ${CMAKE_ASM_NASM_OBJECT_FORMAT} -o <OBJECT> <SOURCE>")
 set_source_files_properties(kernel/asm_funcs.asm PROPERTIES COMPILE_FLAGS "-g")
 set(RUNTIME_SOURCE
         runtime.cpp
@@ -90,4 +90,3 @@ ELSE()
 
 ENDIF()
 
-

game/main.cpp

@@ -16,7 +16,8 @@ int main(int argc, char** argv) {
     spdlog::flush_on(spdlog::level::info);
 
     // run the runtime in a loop so we can reset the game and have it restart cleanly
-    spdlog::info("gk {}.{} OK!", versions::GOAL_VERSION_MAJOR, versions::GOAL_VERSION_MINOR);
+    spdlog::info("OpenGOAL Runtime {}.{}", versions::GOAL_VERSION_MAJOR,
+                 versions::GOAL_VERSION_MINOR);
 
     if (exec_runtime(argc, argv) == 2) {
       return 0;

game/overlord/iso_cd.cpp

@@ -567,7 +567,7 @@ FileRecord* FS_FindIN(const char* iso_name) {
     }
 
     // we didn't get 1 GB of files, you're a pirate.
-    spdlog::info("Pirated!");
+    spdlog::warn("Pirated!");
   }
 }
 

game/overlord/iso_queue.cpp

@@ -183,7 +183,7 @@ u32 QueueMessage(IsoMessage* cmd, int32_t priority, const char* name) {
                   PRI_STACK_LENGTH, gPriStack[priority].names[gPriStack[priority].n - 1].c_str());
     DisplayQueue();
   } else {
-    spdlog::debug("[OVERLORD ISO QUEUE] Failed to queue!");
+    spdlog::warn("[OVERLORD ISO QUEUE] Failed to queue!");
     cmd->status = CMD_STATUS_FAILED_TO_QUEUE;
     ReturnMessage(cmd);
   }
@@ -209,7 +209,7 @@ void UnqueueMessage(IsoMessage* cmd) {
       }
     }
   }
-  printf("[OVERLORD ISO QUEUE] Failed to unqueue!\n");
+  spdlog::warn("[OVERLORD ISO QUEUE] Failed to unqueue!");
 
 found:
   assert(gPriStack[pri].cmds[idx] == cmd);