Skip to content

Commit 47adcf0

Browse files
committed
fix ffi
1 parent 68843d4 commit 47adcf0

25 files changed

+3565
-117
lines changed

.gitmodules

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[submodule "libffi"]
2-
path = luacocoa/libffi
3-
url = https://github.com/atgreen/libffi
2+
path = libffi
3+
url = https://github.com/SolaWing/libffi

example/example.xcodeproj/project.pbxproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
2108C77D1BD4CFF40013770D /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 2108C77C1BD4CFF40013770D /* AppDelegate.m */; };
1515
2133C6D61BD63B87006580C7 /* liblua.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2102DFF61BD4E54500BE9BBF /* liblua.a */; };
1616
2133C6D71BD63B87006580C7 /* libluaoc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2102DFF71BD4E54500BE9BBF /* libluaoc.a */; };
17-
2133C6DB1BD63B91006580C7 /* libffi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2133C6DA1BD63B91006580C7 /* libffi.a */; };
1817
/* End PBXBuildFile section */
1918

2019
/* Begin PBXFileReference section */
@@ -30,15 +29,13 @@
3029
2108C77B1BD4CFF40013770D /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
3130
2108C77C1BD4CFF40013770D /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
3231
2108C7891BD4CFF40013770D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
33-
2133C6DA1BD63B91006580C7 /* libffi.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libffi.a; path = "../luacocoa/libffi/build/Debug-iphoneos/libffi.a"; sourceTree = "<group>"; };
3432
/* End PBXFileReference section */
3533

3634
/* Begin PBXFrameworksBuildPhase section */
3735
2108C7721BD4CFF40013770D /* Frameworks */ = {
3836
isa = PBXFrameworksBuildPhase;
3937
buildActionMask = 2147483647;
4038
files = (
41-
2133C6DB1BD63B91006580C7 /* libffi.a in Frameworks */,
4239
2133C6D61BD63B87006580C7 /* liblua.a in Frameworks */,
4340
2133C6D71BD63B87006580C7 /* libluaoc.a in Frameworks */,
4441
);
@@ -67,7 +64,6 @@
6764
2108C76C1BD4CFF40013770D = {
6865
isa = PBXGroup;
6966
children = (
70-
2133C6DA1BD63B91006580C7 /* libffi.a */,
7167
2102DFF61BD4E54500BE9BBF /* liblua.a */,
7268
2102DFF71BD4E54500BE9BBF /* libluaoc.a */,
7369
2108C7771BD4CFF40013770D /* example */,

libffi

Submodule libffi added at 069e04a

luacocoa.xcworkspace/contents.xcworkspacedata

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

luacocoa/include/ffi/ffi.h

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
#ifdef __arm64__
2+
3+
#include <ffi_arm64.h>
4+
5+
6+
#endif
7+
#ifdef __i386__
8+
9+
#include <ffi_i386.h>
10+
11+
12+
#endif
13+
#ifdef __arm__
14+
15+
#include <ffi_armv7.h>
16+
17+
18+
#endif
19+
#ifdef __x86_64__
20+
21+
#include <ffi_x86_64.h>
22+
23+
24+
#endif

0 commit comments

Comments
 (0)