From a0d9d214d20c236682b20f18e4250c5f5f4e654d Mon Sep 17 00:00:00 2001
From: Andrew Opalach <andrew@akon.city>
Date: Thu, 15 Oct 2020 17:43:23 -0400
Subject: fix windows build

---
 src/assets.cc                            |   2 ++
 src/context_null.h                       |   1 -
 src/mauri.cc                             |   2 +-
 src/objects/effect.cc                    |   2 +-
 src/objects/pass.cc                      |   5 ++---
 src/objects/pass.h                       |   4 ++--
 src/shader.h                             |   4 +++-
 subprojects/lz4/meson.build              |   2 +-
 subprojects/lz4/static/liblz4_static.lib | Bin 206504 -> 0 bytes
 subprojects/lz4/static/lz4.lib           | Bin 0 -> 200650 bytes
 10 files changed, 12 insertions(+), 10 deletions(-)
 delete mode 100644 subprojects/lz4/static/liblz4_static.lib
 create mode 100644 subprojects/lz4/static/lz4.lib

diff --git a/src/assets.cc b/src/assets.cc
index 9e233f3..9c47c61 100644
--- a/src/assets.cc
+++ b/src/assets.cc
@@ -67,6 +67,8 @@ Asset::Asset(const std::string &path)
 
     pos = 0;
     type = ASSET_FILE;
+
+    lasset = nullptr;
 }
 
 Asset::~Asset()
diff --git a/src/context_null.h b/src/context_null.h
index 71c40cc..6267c04 100644
--- a/src/context_null.h
+++ b/src/context_null.h
@@ -2,7 +2,6 @@
 #define _CONTEXT_NULL
 
 #include "context.h"
-#include <stop_token>
 
 namespace Mauri
 {
diff --git a/src/mauri.cc b/src/mauri.cc
index 3ff975a..a3f7aa3 100644
--- a/src/mauri.cc
+++ b/src/mauri.cc
@@ -25,7 +25,7 @@ static std::string scene_path = "scene.json";
 
 s32 main(s32 argc, char *argv[])
 {
-    srand(time(NULL));
+    //srand(time(NULL));
 
 #ifdef BUILD_AUDIO
     gst_init(&argc, &argv);
diff --git a/src/objects/effect.cc b/src/objects/effect.cc
index 854ec2d..fe3fbbe 100644
--- a/src/objects/effect.cc
+++ b/src/objects/effect.cc
@@ -58,7 +58,7 @@ void Effect::load(Engine *engine, Object *object, bool last)
     
     for (u32 i = 0; i < passes1.size(); i++)
     {
-        Pass pass; 
+        Pass pass;
 
         pass.object = object;
         pass.effect = this;
diff --git a/src/objects/pass.cc b/src/objects/pass.cc
index b193234..96a349a 100644
--- a/src/objects/pass.cc
+++ b/src/objects/pass.cc
@@ -31,8 +31,7 @@ Pass::Pass(Parser &p, json &root, PassStage stage)
         for (auto &value : _uniforms.items())
         {
             uniforms.emplace_back(
-                new UniformOverride({ vec4(0.f), value.key() })
-            );
+                new UniformOverride({vec4(0.f), value.key()}));
             p.get_value<vec4>(_uniforms, value.key(), &uniforms.back()->value, vec4(0.f));
         }
 
@@ -71,7 +70,7 @@ Pass::Pass(Parser &p, json &root, PassStage stage)
         break;
     }
     case MATERIAL_ONLY_PASS:
-    case MATERIAL_PASS: 
+    case MATERIAL_PASS:
         shader = root["shader"];
         break;
     }
diff --git a/src/objects/pass.h b/src/objects/pass.h
index c5318fb..6b8f2a9 100644
--- a/src/objects/pass.h
+++ b/src/objects/pass.h
@@ -57,8 +57,8 @@ class Pass
 
     std::string shader;
 
-    std::array<std::string, MAX_TEXTURES> textures;
-    std::array<std::string, MAX_TEXTURES> binds;
+    std::array<std::string, MAX_TEXTURES> textures = {""};
+    std::array<std::string, MAX_TEXTURES> binds = {""};
 
     bool combine;
 
diff --git a/src/shader.h b/src/shader.h
index eed4f80..63bd868 100644
--- a/src/shader.h
+++ b/src/shader.h
@@ -7,6 +7,8 @@
 #include "texture.h"
 #include "json.h"
 
+#define MAX_TEXTURES 8
+
 using namespace glm;
 
 namespace Mauri
@@ -41,7 +43,7 @@ class Shader
     std::vector<Uniform *> uniforms;
     std::vector<Combo> combos;
 
-    std::array<std::string, 8> textures;
+    std::array<std::string, MAX_TEXTURES> textures = {""};
 
     u32 texture_count = 0;
 
diff --git a/subprojects/lz4/meson.build b/subprojects/lz4/meson.build
index 510ea73..ec6f579 100644
--- a/subprojects/lz4/meson.build
+++ b/subprojects/lz4/meson.build
@@ -3,7 +3,7 @@ project('lz4', 'c')
 compiler = meson.get_compiler('c')
 
 lz4_inc = include_directories('include')
-lz4_lib = compiler.find_library('lz4_static', 
+lz4_lib = compiler.find_library('lz4', 
   dirs: [join_paths(meson.current_source_dir(), 'static')])
 
 lz4 = declare_dependency(dependencies: lz4_lib, include_directories: lz4_inc)
diff --git a/subprojects/lz4/static/liblz4_static.lib b/subprojects/lz4/static/liblz4_static.lib
deleted file mode 100644
index fa7ab44..0000000
Binary files a/subprojects/lz4/static/liblz4_static.lib and /dev/null differ
diff --git a/subprojects/lz4/static/lz4.lib b/subprojects/lz4/static/lz4.lib
new file mode 100644
index 0000000..a684377
Binary files /dev/null and b/subprojects/lz4/static/lz4.lib differ
-- 
cgit v1.2.3-101-g0448