Nuked dawnshared

src/CMakeLists.txt

@@ -9,9 +9,6 @@ set(
   CACHE INTERNAL ${DAWN_CACHE_TARGET}
 )
 
-# Include shared libs
-add_subdirectory(dawnshared)
-
 # Change what we are building. Pulled from the cmake/targets dir.
 if(DEFINED DAWN_BUILDING)
   add_subdirectory(${DAWN_BUILDING})

src/dawn/CMakeLists.txt

@@ -24,6 +24,7 @@ target_sources(${DAWN_TARGET_NAME}
 )
 
 # Subdirs
+add_subdirectory(assert)
 add_subdirectory(asset)
 add_subdirectory(display)
 add_subdirectory(game)
@@ -36,6 +37,7 @@ add_subdirectory(save)
 add_subdirectory(scene)
 add_subdirectory(state)
 add_subdirectory(time)
+add_subdirectory(util)
 
 # Definitions
 target_compile_definitions(${DAWN_TARGET_NAME}

src/dawn/assert/assert.hpp

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "dawnsharedlibs.hpp"
+#include "dawnlibs.hpp"
 
 /**
  * Assert a given value to be true.

src/dawn/dawnlibs.hpp

@@ -6,8 +6,32 @@
  */
 
 #pragma once
-#include "dawnsharedlibs.hpp"
-#include "util/memory.hpp"
+// Static Libs
+extern "C" {
+  // Standard Libs
+  #include <stdio.h>
+  #include <stdint.h>
+  #include <stdbool.h>
+  #include <string.h>
+  #include <math.h>
+  #include <stdlib.h>
+  #include <assert.h>
+  #include <float.h>
+
+  typedef bool bool_t;
+  typedef char char_t;
+}
+
+#include <vector>
+#include <iostream>
+#include <thread>
+#include <map>
+#include <array>
+#include <memory>
+#include <algorithm>
+#include <sstream>
+#include <string>
+#include <functional>
 
 #include <ft2build.h>
 #include FT_FREETYPE_H

src/dawn/display/CMakeLists.txt

@@ -9,6 +9,7 @@ target_sources(${DAWN_TARGET_NAME}
     RenderPipeline.cpp
     Transform.cpp
     Tileset.cpp
+    Color.cpp
 )
 
 # Subdirs

src/dawn/display/Color.hpp

@@ -4,7 +4,7 @@
 // https://opensource.org/licenses/MIT
 
 #pragma once
-#include "dawnsharedlibs.hpp"
+#include "dawnlibs.hpp"
 #include "util/string.hpp"
 
 namespace Dawn {

src/dawn/util/CMakeLists.txt

@@ -0,0 +1,12 @@
+# Copyright (c) 2023 Dominic Masters
+# 
+# This software is released under the MIT License.
+# https://opensource.org/licenses/MIT
+
+# Sources
+target_sources(${DAWN_TARGET_NAME}
+  PRIVATE
+    memory.cpp
+    UsageLock.cpp
+    Xml.cpp
+)

src/dawn/util/Xml.hpp

@@ -4,7 +4,7 @@
 // https://opensource.org/licenses/MIT
 
 #pragma once
-#include "dawnsharedlibs.hpp"
+#include "dawnlibs.hpp"
 #include "util/memory.hpp"
 #include "assert/assert.hpp"
 #include "util/array.hpp"

src/dawn/util/array.hpp

@@ -4,7 +4,7 @@
 // https://opensource.org/licenses/MIT
 
 #pragma once
-#include "dawnsharedlibs.hpp"
+#include "dawnlibs.hpp"
 #include "assert/assert.hpp"
 
 namespace Dawn {

src/dawn/util/flag.hpp

@@ -4,7 +4,7 @@
 // https://opensource.org/licenses/MIT
 
 #pragma once
-#include "dawnsharedlibs.hpp"
+#include "dawnlibs.hpp"
 
 typedef uint_fast8_t flag8_t;
 typedef uint_fast16_t flag16_t;

src/dawn/util/mathutils.hpp

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "dawnsharedlibs.hpp"
+#include "dawnlibs.hpp"
 
 #define MATH_PI 3.1415926535897f
 

src/dawn/util/memory.hpp

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "dawnsharedlibs.hpp"
+#include "dawnlibs.hpp"
 
 #define DAWN_MEMORY_TRACKING 1