Merge pull request #29 from yuchanns/fix/build

fix(build): add zlib

Author: cloudwu

clibs/soluna/make.lua

@@ -33,6 +33,7 @@ lm:source_set "soluna_src" {
     "3rd/lua",
     "3rd",
     "3rd/yoga",
+    "3rd/zlib",
   },
   macos = {
     frameworks = {
@@ -49,6 +50,11 @@ lm:source_set "soluna_src" {
       "-x objective-c",
     },
   },
+  windows = {
+    includes = {
+      "3rd/zlib/contrib/minizip",
+    }
+  },
   linux = {
     links = {
       "pthread",

clibs/zlib/make.lua

@@ -0,0 +1,30 @@
+local lm = require "luamake"
+
+lm.rootdir = lm.basedir .. "/3rd/zlib"
+
+lm:source_set "minizip" {
+  sources = {
+    "contrib/minizip/ioapi.c",
+		"contrib/minizip/unzip.c",
+		"contrib/minizip/zip.c",
+  },
+  windows = {
+    sources = {
+      "contrib/minizip/iowin32.c",
+    },
+    includes = {
+      "contrib/minizip",
+    },
+  },
+  includes = {
+    lm.rootdir,
+  },
+
+}
+
+lm:source_set "zlib" {
+  sources = {
+    "*.c",
+    "!gz*.c",
+  },
+}

make.lua

@@ -72,23 +72,25 @@ lm:import "clibs/yoga/make.lua"
 lm:import "clibs/datalist/make.lua"
 lm:import "clibs/sokol/make.lua"
 lm:import "clibs/ltask/make.lua"
+lm:import "clibs/zlib/make.lua"
 lm:import "clibs/soluna/make.lua"
 
+lm:phony "precompile" {
+  deps = {
+    "compile_shaders",
+    "compile_lua_code",
+  },
+}
+
 lm:exe "soluna" {
   deps = {
     "lua_src",
     "soluna_src",
     "ltask_src",
     "yoga_src",
-    "compile_lua_code",
-    "compile_shaders",
+    "precompile",
     "datalist_src",
-  },
-}
-
-lm:phony "precompile" {
-  deps = {
-    "compile_shaders",
-    "compile_lua_code",
+    "zlib",
+    "minizip",
   },
 }