fileserver support linux

ejoy · Jan 19, 2024 · 0b7735b · 0b7735b
1 parent 267ab12
commit 0b7735b
Show file tree

Hide file tree

Showing 14 changed files with 66 additions and 8 deletions.
diff --git a/clibs/imgui/make.lua b/clibs/imgui/make.lua
@@ -28,6 +28,11 @@ lm:source_set "imgui" {
             "UNICODE",
         }
     },
+    linux = {
+        sources = {
+            "platform/linux/imgui_platform.cpp",
+        }
+    },
     macos = {
         sources = {
             "platform/macos/imgui_platform.mm",

diff --git a/clibs/imgui/platform/linux/imgui_platform.cpp b/clibs/imgui/platform/linux/imgui_platform.cpp
@@ -0,0 +1,15 @@
+#include <imgui.h>
+#include "imgui_platform.h"
+
+void platformInit(void* window) {
+}
+
+void platformShutdown() {
+}
+
+void platformNewFrame() {
+}
+
+void* platformGetHandle(ImGuiViewport* viewport) {
+	return nullptr;
+}
diff --git a/clibs/ltask/make.lua b/clibs/ltask/make.lua
@@ -29,6 +29,11 @@ lm:lua_source "ltask" {
             "winmm",
         }
     },
+    linux = {
+        defines = {
+            "_GNU_SOURCE",
+        },
+    },
     msvc = {
         flags = {
             "/experimental:c11atomics"

diff --git a/clibs/lua/make.lua b/clibs/lua/make.lua
@@ -13,6 +13,9 @@ lm:source_set "lua_source" {
     windows = {
         defines = "LUA_BUILD_AS_DLL",
     },
+    linux = {
+        defines = "LUA_USE_POSIX",
+    },
     macos = {
         visibility = "default",
         defines = "LUA_USE_MACOSX",

diff --git a/clibs/ozz/ozz-animation.lua b/clibs/ozz/ozz-animation.lua
@@ -58,5 +58,10 @@ lm:exe "gltf2ozz" {
     },
     windows = {
         sources = lm.AntDir .. "/3rd/bgfx.luamake/utf8/utf8.rc"
+    },
+    linux = {
+        links = {
+            "m"
+        }
     }
 }
diff --git a/clibs/ozz/ozz.cpp b/clibs/ozz/ozz.cpp
@@ -1,4 +1,5 @@
 #include <lua.hpp>
+#include <cstring>
 #include "fastio.h"
 
 #include <ozz/base/memory/allocator.h>
@@ -69,8 +70,8 @@ class MemoryPtrStream : public ozz::io::Stream {
 			default:								return -1;
 		}
 
-		int r = (int)origin + _offset;
-		if (r < 0 || r > ms.size()){
+		int r = origin + _offset;
+		if (r < 0 || r > (int)ms.size()){
 			return -1;
 		}
 		moffset = r;

diff --git a/clibs/ozz/ozz.h b/clibs/ozz/ozz.h
@@ -10,6 +10,8 @@
 #include <ozz/animation/runtime/skeleton.h>
 #include <ozz/animation/offline/raw_animation.h>
 
+#include <cstring>
+
 struct ozzUint16Verctor: public ozz::vector<uint16_t> {
 	ozzUint16Verctor()
 		: ozz::vector<uint16_t>()

diff --git a/clibs/zip/make.lua b/clibs/zip/make.lua
@@ -128,6 +128,9 @@ lm:source_set "zlib-ng" {
     windows = {
         deps = "zlib-ng-x86",
     },
+    linux = {
+        deps = "zlib-ng-x86",
+    },
     macos = {
         deps = "zlib-ng-arm",
     },
@@ -186,6 +189,15 @@ lm:source_set "minizip-ng" {
             MINIZIPDIR.."/mz_strm_os_win32.c",
         },
     },
+    linux = {
+        defines = {
+            "_GNU_SOURCE",
+        },
+        sources = {
+            MINIZIPDIR.."/mz_os_posix.c",
+            MINIZIPDIR.."/mz_strm_os_posix.c",
+        },
+    },
     macos = {
         sources = {
             MINIZIPDIR.."/mz_os_posix.c",

diff --git a/pkg/ant.audio/make.lua b/pkg/ant.audio/make.lua
@@ -45,6 +45,9 @@ lm:lua_source "audio" {
     macos = {
         sources = "src/empty_luafmod.c",
     },
+    linux = {
+        sources = "src/empty_luafmod.c",
+    },
     ios = {
         sources = "src/luafmod.cpp",
         includes = {

diff --git a/pkg/ant.compile_resource/tool_exe_path.lua b/pkg/ant.compile_resource/tool_exe_path.lua
@@ -5,7 +5,7 @@ local BASETOOLS<const> = {
     "shaderc", "texturec", "gltf2ozz"
 }
 
-local TOOLSUFFIX<const> = platform.os == "macos" and "" or ".exe"
+local TOOLSUFFIX<const> = platform.os == "windows" and ".exe" or ""
 
 local function check_tool_path_valid(path)
     if not lfs.exists(path) then

diff --git a/pkg/ant.rmlui/src/css/PropertyBinary.h b/pkg/ant.rmlui/src/css/PropertyBinary.h
@@ -2,6 +2,7 @@
 
 #include <array>
 #include <cstddef>
+#include <cstring>
 #include <deque>
 #include <functional>
 #include <memory>

diff --git a/runtime/common/modules.c b/runtime/common/modules.c
@@ -90,7 +90,6 @@ void ant_loadmodules(lua_State* L) {
         { "font", luaopen_font },
         { "font.manager", luaopen_font_manager },
         { "font.truetype", luaopen_font_truetype },
-        { "font.util", luaopen_font_util },
         { "datalist", luaopen_datalist },
         { "ozz", luaopen_ozz },
         { "math3d", luaopen_math3d },
@@ -104,7 +103,6 @@ void ant_loadmodules(lua_State* L) {
         { "luadebug.stdio", luaopen_luadebug_stdio },
         { "luadebug.visitor", luaopen_luadebug_visitor },
         { "rmlui", luaopen_rmlui },
-        { "window", luaopen_window },
         { "noise", luaopen_noise },
         { "textureman.client", luaopen_textureman_client },
         { "textureman.server", luaopen_textureman_server },
@@ -142,13 +140,19 @@ void ant_loadmodules(lua_State* L) {
 #else
         { "bee.filewatch", luaopen_bee_filewatch },
         { "bee.subprocess", luaopen_bee_subprocess },
-        { "filedialog", luaopen_filedialog },
         { "imgui.widgets", luaopen_imgui_widgets },
+#if !BX_PLATFORM_LINUX
+        { "filedialog", luaopen_filedialog },
+#endif
 #endif
         { "system.scene", luaopen_system_scene },
         { "cull.core", luaopen_system_cull},
         { "zip", luaopen_zip },
+#if !BX_PLATFORM_LINUX
+        { "window", luaopen_window },
         { "httpc", luaopen_httpc },
+        { "font.util", luaopen_font_util },
+#endif
         { NULL, NULL },
     };
 

diff --git a/runtime/make.lua b/runtime/make.lua
@@ -76,11 +76,13 @@ lm:lua_source "ant_common" {
     windows = {
         sources = "windows/main.cpp",
     },
+    linux = {
+        sources = "posix/main.cpp",
+    },
     macos = {
-        sources = "osx/main.cpp",
+        sources = "posix/main.cpp",
     },
     ios = {
-        includes = "../../clibs/window/ios",
         sources = {
             "common/ios/main.mm",
             "common/ios/ios_error.mm",

diff --git a/runtime/osx/main.cpp → runtime/posix/main.cpp b/runtime/osx/main.cpp → runtime/posix/main.cpp