Bundled zlib linking for resources lib, fixed platform types

Author: jonjondev

engine/core/Makefile

@@ -15,13 +15,6 @@ coreSources := $(call rwildcard,$(coreSrcDir)/,*.cpp)
 coreObjects := $(call findobjs,$(coreSrcDir),$(coreBinDir),$(coreSources))
 coreDepends := $(patsubst %.o, %.d, $(call rwildcard,$(coreBinDir)/,*.o))
 
-# Set build vars
-ifeq ($(platform), windows)
-    libGenDir := src
-else ifeq ($(platform), macos)
-    libGenDir := src
-endif
-
 # Build the static library
 $(coreLib): $(coreObjects)
 	$(call MKDIR,$(call platformpth,$(libDir)))

engine/render/Makefile

@@ -15,18 +15,18 @@ renderSources := $(call rwildcard,$(renderSrcDir)/,*.cpp)
 renderObjects := $(call findobjs,$(renderSrcDir),$(renderBinDir),$(renderSources))
 renderDepends := $(patsubst %.o, %.d, $(call rwildcard,$(renderBinDir)/,*.o))
 renderBuildDir := $(renderBinDir)/build
-renderLibs := $(vendorDir)/zlib/build/lib/libz.a $(vendorDir)/libpng/build/libpng.a $(vendorDir)/freetype/build/libfreetype.a
+renderLibs := $(vendorDir)/libpng/build/libpng.a $(vendorDir)/freetype/build/libfreetype.a
 
 # Set shader build vars
 vertSources := $(call rwildcard,assets/shaders,*.vert)
 fragSources := $(call rwildcard,assets/shaders,*.frag)
 vertObjects := $(patsubst %.vert,$(renderBuildDir)/%.vert.spv,$(vertSources))
 fragObjects := $(patsubst %.frag,$(renderBuildDir)/%.frag.spv,$(fragSources))
 
+# Set build vars
 linkFlags += -l utils -l window
-
-compileFlags += -I $(vendorDir)/vulkan/include -I $(vendorDir)/glfw/include -I $(vendorDir)/glm \
-				-I $(vendorDir)/zlib/build/include -I $(vendorDir)/libpng -I $(vendorDir)/include/freetype
+compileFlags += -I $(vendorDir)/vulkan/include -I $(vendorDir)/glfw/include \
+				-I $(vendorDir)/libpng -I $(vendorDir)/include/freetype
 
 .PHONY: all
 

engine/resources/Makefile

@@ -14,14 +14,16 @@ resourcesBinDir := $(binDir)/engine/resources
 resourcesSources := $(call rwildcard,$(resourcesSrcDir)/,*.cpp)
 resourcesObjects := $(call findobjs,$(resourcesSrcDir),$(resourcesBinDir),$(resourcesSources))
 resourcesDepends := $(patsubst %.o, %.d, $(call rwildcard,$(resourcesBinDir)/,*.o))
+resourcesLibs := $(vendorDir)/zlib/build/lib/libz.a
 
-linkFlags += -l utils
+# Set build vars
+linkFlags += -l utils -l z
 compileFlags += -I $(vendorDir)/zlib/build/include
 
 # Build the static library
 $(resourcesLib): $(resourcesObjects)
 	$(call MKDIR,$(call platformpth,$(libDir)))
-	ar -crs $(resourcesLib) $(resourcesObjects)
+	$(call COMBINE_LIBS, $(resourcesLibs), $(resourcesObjects), $(libDir), resources)
 
 # Add all rules from dependency files
 -include $(resourcesDepends)

engine/utils/BinarySerialisation.h

@@ -23,7 +23,7 @@
 namespace Siege::BinarySerialisation
 {
 
-enum SerialisationMode : u_int8_t
+enum SerialisationMode : uint8_t
 {
     SERIALISE,
     DESERIALISE,

engine/window/Makefile

@@ -16,6 +16,7 @@ windowObjects := $(call findobjs,$(windowSrcDir),$(windowBinDir),$(windowSources
 windowDepends := $(patsubst %.o, %.d, $(call rwildcard,$(windowBinDir)/,*.o))
 windowLibs := $(vendorDir)/glfw/build/src/libglfw3.a
 
+# Set build vars
 linkFlags += -l utils
 compileFlags += -I $(vendorDir)/glfw/include
 

packer/Makefile

@@ -17,8 +17,8 @@ packerDepends := $(patsubst %.o, %.d, $(call rwildcard,$(packerBinDir)/,*.o))
 packerBuildDir := $(packerBinDir)/build
 
 # Set build vars
-linkFlags += -l resources -l utils -L $(vendorDir)/zlib/build/lib -L $(vendorDir)/assimp/build/lib -l assimp -l z -l stdc++
-compileFlags += -I $(vendorDir)/stb_image -I $(vendorDir)/assimp/include -I $(vendorDir)/assimp/build/include -I $(vendorDir)/zlib/build/include
+linkFlags += -l resources -l utils -L $(vendorDir)/assimp/build/lib -l assimp -l stdc++
+compileFlags += -I $(vendorDir)/stb_image -I $(vendorDir)/assimp/include -I $(vendorDir)/assimp/build/include
 
 .PHONY: all
 

packer/src/types/SceneDataPacker.cpp

@@ -25,7 +25,10 @@ Siege::PackFileData* PackSceneFile(const Siege::String& filePath)
     auto appendFile = [&sceneData](const std::filesystem::path& path) {
         if (path.extension() != ".entity") return;
         CC_LOG_INFO("Reading entity file {}", path.filename().c_str())
-        sceneData.entities.emplace_back(Siege::FileSystem::Read(path.c_str()));
+
+        Siege::String content = Siege::FileSystem::Read(path.c_str());
+        content = Siege::FileSystem::StripNewLines(content);
+        sceneData.entities.emplace_back(content);
     };
 
     bool result = Siege::FileSystem::ForEachFileInDir(filePath, appendFile);

packer/src/types/Texture2DDataPacker.cpp

@@ -17,6 +17,8 @@
 #include <utils/Defer.h>
 #include <utils/Logging.h>
 
+#include <algorithm>
+
 Siege::PackFileData* PackTexture2DFile(const Siege::String& filePath)
 {
     int32_t texWidth, texHeight, texChannels;

tests/Makefile

@@ -23,7 +23,7 @@ testAssets += $(patsubst ./%,%, $(call rwildcard,$(testSrcDir),*.scene))
 
 # Set build vars
 utestIncludeDir := $(vendorDir)/include/utest
-linkFlags += -l core -l utils -l resources -l z
+linkFlags += -l core -l utils -l resources
 
 .PHONY: all pack-assets
 

tests/src/resources/test_ResourceSystem.cpp

@@ -57,8 +57,8 @@ UTEST_F(test_ResourceSystem, ReadAllPackedEntries)
 
     const PackFile::Header& header = packFile->GetHeader();
     ASSERT_STREQ("pck", header.magic.string);
-    ASSERT_EQ(48711, header.bodySize);
-    ASSERT_EQ(48519, header.tocOffset);
+    ASSERT_EQ(48703, header.bodySize);
+    ASSERT_EQ(48511, header.tocOffset);
 
     std::vector<String> packedFilepaths {"assets/scene2.scene",
                                          "assets/scene1.scene",
@@ -175,18 +175,18 @@ UTEST_F(test_ResourceSystem, LoadSceneData)
     ResourceSystem& resourceSystem = ResourceSystem::GetInstance();
     PackFile* packFile = resourceSystem.GetPackFile();
 
-    std::vector<String> expectedSceneData = {"TYPE:TestEntity;\n"
-                                             "POSITION:0.000000,0.000000,0.000000;\n"
-                                             "ROTATION:0.000000;\n"
-                                             "Z_INDEX:0;\n",
-                                             "TYPE:TestEntity;\n"
-                                             "POSITION:0.000000,0.000000,0.000000;\n"
-                                             "ROTATION:0.000000;\n"
-                                             "Z_INDEX:0;\n",
-                                             "TYPE:TestEntity;\n"
-                                             "POSITION:0.000000,0.000000,0.000000;\n"
-                                             "ROTATION:0.000000;\n"
-                                             "Z_INDEX:0;\n"};
+    std::vector<String> expectedSceneData = {"TYPE:TestEntity;"
+                                             "POSITION:0.000000,0.000000,0.000000;"
+                                             "ROTATION:0.000000;"
+                                             "Z_INDEX:0;",
+                                             "TYPE:TestEntity;"
+                                             "POSITION:0.000000,0.000000,0.000000;"
+                                             "ROTATION:0.000000;"
+                                             "Z_INDEX:0;",
+                                             "TYPE:TestEntity;"
+                                             "POSITION:0.000000,0.000000,0.000000;"
+                                             "ROTATION:0.000000;"
+                                             "Z_INDEX:0;"};
 
     std::shared_ptr<SceneData> data =
         packFile->FindDataDeserialised<SceneData>("assets/scene1.scene");