support for m1

zhongfq · Jul 30, 2023 · 14755b9 · 14755b9
1 parent 51666a5
commit 14755b9
Show file tree

Hide file tree

Showing 16 changed files with 14 additions and 4 deletions.
diff --git a/frameworks/3rd/png/CMakeLists.txt b/frameworks/3rd/png/CMakeLists.txt
@@ -37,7 +37,7 @@ if(PNG_HARDWARE_OPTIMIZATIONS)
       )
       if(${PNG_ARM_NEON} STREQUAL "on")
         add_definitions(-DPNG_ARM_NEON_OPT=2)
-      elseif(${PNG_ARM_NEON} STREQUAL "check")
+      elseif(${PNG_ARM_NEON} STREQUAL "check" AND NOT APPLE)
         add_definitions(-DPNG_ARM_NEON_CHECK_SUPPORTED)
       endif()
     else()

diff --git a/frameworks/cclua/src/olua/olua.c b/frameworks/cclua/src/olua/olua.c
@@ -415,10 +415,16 @@ OLUA_API void *olua_toobj(lua_State *L, int idx, const char *cls)
 
 OLUA_API void olua_delobj(lua_State *L, void *obj)
 {
-    if (olua_getrawobj(L, obj)) {
+    if (!obj) {
+        return;
+    }
+    olua_pushobjtable(L);
+    if (olua_rawgetp(L, -1, obj) == LUA_TUSERDATA) {
         olua_setrawobj(L, -1, NULL);
-        lua_pop(L, 1);
     }
+    lua_pushnil(L); // L: objtable ud nil
+    olua_rawsetp(L, -3, obj);
+    lua_pop(L, 2);
 }
 
 OLUA_API const char *olua_objstring(lua_State *L, int idx)

diff --git a/frameworks/toolset/CMakeLists.txt b/frameworks/toolset/CMakeLists.txt
@@ -12,6 +12,10 @@ else()
     set(OS "linux")
 endif()
 
+if(APPLE)
+    set(CMAKE_OSX_ARCHITECTURES "x86_64;arm64")
+endif()
+
 if(LUA STREQUAL "lua54")
     add_subdirectory(lua)
     get_filename_component(LUA_INCLUDE "../3rd/lua"

diff --git a/tools/lua-bindings/olua b/tools/lua-bindings/olua
diff --git a/tools/lua/lua53/macos/cjson.so b/tools/lua/lua53/macos/cjson.so
diff --git a/tools/lua/lua53/macos/lfs.so b/tools/lua/lua53/macos/lfs.so
diff --git a/tools/lua/lua53/macos/lua b/tools/lua/lua53/macos/lua
diff --git a/tools/lua/lua53/macos/luac b/tools/lua/lua53/macos/luac
diff --git a/tools/lua/lua53/macos/md5.so b/tools/lua/lua53/macos/md5.so
diff --git a/tools/lua/lua53/macos/xxtea.so b/tools/lua/lua53/macos/xxtea.so
diff --git a/tools/lua/lua54/macos/cjson.so b/tools/lua/lua54/macos/cjson.so
diff --git a/tools/lua/lua54/macos/lfs.so b/tools/lua/lua54/macos/lfs.so
diff --git a/tools/lua/lua54/macos/lua b/tools/lua/lua54/macos/lua
diff --git a/tools/lua/lua54/macos/luac b/tools/lua/lua54/macos/luac
diff --git a/tools/lua/lua54/macos/md5.so b/tools/lua/lua54/macos/md5.so
diff --git a/tools/lua/lua54/macos/xxtea.so b/tools/lua/lua54/macos/xxtea.so