Commits

Alex Szpakowski  committed 661908a

iOS: replaced Lua 5.1 library dependency with LuaJIT.

  • Participants
  • Parent commits 54453e3
  • Branches iOS

Comments (0)

Files changed (3)

File platform/ios/liblove.xcodeproj/project.pbxproj

 		FA0490DD19415BC200261551 /* wrap_FileData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FA0490D819415BC200261551 /* wrap_FileData.cpp */; };
 		FA0490DE19415BC200261551 /* wrap_Filesystem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FA0490DA19415BC200261551 /* wrap_Filesystem.cpp */; };
 		FA0C65711948EC4F00375A11 /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA0C65701948EC4F00375A11 /* CoreMotion.framework */; };
+		FA368CBD194D4A3900068EAB /* libluajit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FA368CBC194D4A3900068EAB /* libluajit.a */; };
 		FA4E9DC31885F69700D80373 /* Touch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FA4E9DBE1885F69700D80373 /* Touch.cpp */; };
 		FA4E9DC41885F69700D80373 /* wrap_Touch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FA4E9DC11885F69700D80373 /* wrap_Touch.cpp */; };
 		FA84B1CE18469C5800A0961B /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA84B1CD18469C5800A0961B /* Foundation.framework */; };
 		FA84B3871846A12400A0961B /* wuff_internal.c in Sources */ = {isa = PBXBuildFile; fileRef = FA84B3371846A12400A0961B /* wuff_internal.c */; };
 		FA84B3881846A12400A0961B /* wuff_memory.c in Sources */ = {isa = PBXBuildFile; fileRef = FA84B3391846A12400A0961B /* wuff_memory.c */; };
 		FA84B3A01846BCCB00A0961B /* libFreetype2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FA84B3931846BCCB00A0961B /* libFreetype2.a */; };
-		FA84B3A11846BCCB00A0961B /* liblua.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FA84B3951846BCCB00A0961B /* liblua.a */; };
 		FA84B3A21846BCCB00A0961B /* libogg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FA84B3971846BCCB00A0961B /* libogg.a */; };
 		FA84B3A41846BCCB00A0961B /* libphysfs.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FA84B39A1846BCCB00A0961B /* libphysfs.a */; };
 		FA84B3A51846BCCB00A0961B /* libSDL2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FA84B39C1846BCCB00A0961B /* libSDL2.a */; };
 		FA0490DA19415BC200261551 /* wrap_Filesystem.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = wrap_Filesystem.cpp; sourceTree = "<group>"; };
 		FA0490DB19415BC200261551 /* wrap_Filesystem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = wrap_Filesystem.h; sourceTree = "<group>"; };
 		FA0C65701948EC4F00375A11 /* CoreMotion.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMotion.framework; path = System/Library/Frameworks/CoreMotion.framework; sourceTree = SDKROOT; };
+		FA368CBC194D4A3900068EAB /* libluajit.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libluajit.a; path = luajit/libluajit.a; sourceTree = "<group>"; };
 		FA4E9DBE1885F69700D80373 /* Touch.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Touch.cpp; sourceTree = "<group>"; };
 		FA4E9DBF1885F69700D80373 /* Touch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Touch.h; sourceTree = "<group>"; };
 		FA4E9DC01885F69700D80373 /* Touch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Touch.h; sourceTree = "<group>"; };
 		FA84B38D1846A13300A0961B /* graphics.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = graphics.lua; sourceTree = "<group>"; };
 		FA84B38E1846A13300A0961B /* graphics.lua.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = graphics.lua.h; sourceTree = "<group>"; };
 		FA84B3931846BCCB00A0961B /* libFreetype2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libFreetype2.a; sourceTree = "<group>"; };
-		FA84B3951846BCCB00A0961B /* liblua.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = liblua.a; sourceTree = "<group>"; };
 		FA84B3971846BCCB00A0961B /* libogg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libogg.a; sourceTree = "<group>"; };
 		FA84B39A1846BCCB00A0961B /* libphysfs.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libphysfs.a; sourceTree = "<group>"; };
 		FA84B39C1846BCCB00A0961B /* libSDL2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libSDL2.a; sourceTree = "<group>"; };
 				FA84B1CE18469C5800A0961B /* Foundation.framework in Frameworks */,
 				FA84B5C51846C1DD00A0961B /* OpenAL.framework in Frameworks */,
 				FA84B5C71846C1E300A0961B /* OpenGLES.framework in Frameworks */,
-				FA84B3A11846BCCB00A0961B /* liblua.a in Frameworks */,
+				FA368CBD194D4A3900068EAB /* libluajit.a in Frameworks */,
 				FA84B3A01846BCCB00A0961B /* libFreetype2.a in Frameworks */,
 				FA84B3A51846BCCB00A0961B /* libSDL2.a in Frameworks */,
 				FA84B3A41846BCCB00A0961B /* libphysfs.a in Frameworks */,
 			path = stb;
 			sourceTree = "<group>";
 		};
+		FA368CBE194D4A5300068EAB /* luajit */ = {
+			isa = PBXGroup;
+			children = (
+				FA368CBC194D4A3900068EAB /* libluajit.a */,
+			);
+			name = luajit;
+			sourceTree = "<group>";
+		};
 		FA4E9DBC1885F69700D80373 /* touch */ = {
 			isa = PBXGroup;
 			children = (
 			isa = PBXGroup;
 			children = (
 				FA84B3921846BCCB00A0961B /* freetype */,
-				FA84B3941846BCCB00A0961B /* lua */,
+				FA368CBE194D4A5300068EAB /* luajit */,
 				FA84B3961846BCCB00A0961B /* ogg */,
 				FA84B3991846BCCB00A0961B /* physfs */,
 				FA84B39B1846BCCB00A0961B /* SDL */,
 			path = freetype;
 			sourceTree = "<group>";
 		};
-		FA84B3941846BCCB00A0961B /* lua */ = {
-			isa = PBXGroup;
-			children = (
-				FA84B3951846BCCB00A0961B /* liblua.a */,
-			);
-			path = lua;
-			sourceTree = "<group>";
-		};
 		FA84B3961846BCCB00A0961B /* ogg */ = {
 			isa = PBXGroup;
 			children = (
 					../../src/libraries/enet/libenet/include,
 					include,
 					include/freetype,
-					include/lua,
+					include/luajit,
 					include/ogg,
 					include/SDL,
 					include/physfs,
 					../../src/libraries/enet/libenet/include,
 					include,
 					include/freetype,
-					include/lua,
+					include/luajit,
 					include/ogg,
 					include/SDL,
 					include/physfs,
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					libraries/freetype,
-					libraries/lua,
+					libraries/luajit,
 					libraries/ogg,
 					libraries/physfs,
 					libraries/SDL,
 					libraries/vorbis,
+					"$(PROJECT_DIR)/libraries/luajit",
 				);
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					libraries/freetype,
-					libraries/lua,
+					libraries/luajit,
 					libraries/ogg,
 					libraries/physfs,
 					libraries/SDL,
 					libraries/vorbis,
+					"$(PROJECT_DIR)/libraries/luajit",
 				);
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = "$(TARGET_NAME)";

File platform/ios/love.xcodeproj/project.pbxproj

 /* Begin PBXBuildFile section */
 		FA0490CE19415B7700261551 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = FA0490CD19415B7700261551 /* libz.dylib */; };
 		FA0C65731948EC6000375A11 /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA0C65721948EC6000375A11 /* CoreMotion.framework */; };
+		FA368CC2194D4A9D00068EAB /* libluajit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FA368CC0194D4A9D00068EAB /* libluajit.a */; };
 		FA753A6C19183330000002B3 /* LoveDocument.icns in Resources */ = {isa = PBXBuildFile; fileRef = FA753A6B19183330000002B3 /* LoveDocument.icns */; };
 		FA84B20018469EB900A0961B /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA84B1FF18469EB900A0961B /* Foundation.framework */; };
 		FA84B20218469EB900A0961B /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA84B20118469EB900A0961B /* CoreGraphics.framework */; };
 		FA84B21218469EBA00A0961B /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = FA84B21118469EBA00A0961B /* Images.xcassets */; };
 		FA84B5D21846C75600A0961B /* love.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FA84B5D11846C75600A0961B /* love.cpp */; };
 		FA84B5D71846CDCC00A0961B /* libSDL2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FA84B5D61846CDCC00A0961B /* libSDL2.a */; };
-		FA84B5DA1846CDDA00A0961B /* liblua.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FA84B5D91846CDDA00A0961B /* liblua.a */; };
 		FA84B5DC1846CDEA00A0961B /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA84B5DB1846CDEA00A0961B /* OpenGLES.framework */; };
 		FA84B5DE1846CDF300A0961B /* OpenAL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA84B5DD1846CDF300A0961B /* OpenAL.framework */; };
 		FA84B5DF1846CE0000A0961B /* liblove.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FA84B23718469FBE00A0961B /* liblove.a */; };
 /* Begin PBXFileReference section */
 		FA0490CD19415B7700261551 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
 		FA0C65721948EC6000375A11 /* CoreMotion.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMotion.framework; path = System/Library/Frameworks/CoreMotion.framework; sourceTree = SDKROOT; };
+		FA368CC0194D4A9D00068EAB /* libluajit.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libluajit.a; path = luajit/libluajit.a; sourceTree = "<group>"; };
 		FA753A6B19183330000002B3 /* LoveDocument.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = LoveDocument.icns; sourceTree = "<group>"; };
 		FA84B1FC18469EB900A0961B /* love.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = love.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		FA84B1FF18469EB900A0961B /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
 		FA84B23218469FBE00A0961B /* liblove.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; path = liblove.xcodeproj; sourceTree = "<group>"; };
 		FA84B5D11846C75600A0961B /* love.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = love.cpp; path = ../../src/love.cpp; sourceTree = "<group>"; };
 		FA84B5D61846CDCC00A0961B /* libSDL2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libSDL2.a; sourceTree = "<group>"; };
-		FA84B5D91846CDDA00A0961B /* liblua.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = liblua.a; sourceTree = "<group>"; };
 		FA84B5DB1846CDEA00A0961B /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = System/Library/Frameworks/OpenGLES.framework; sourceTree = SDKROOT; };
 		FA84B5DD1846CDF300A0961B /* OpenAL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenAL.framework; path = System/Library/Frameworks/OpenAL.framework; sourceTree = SDKROOT; };
 		FA84B5E21846CE9700A0961B /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
 				FA84B5DC1846CDEA00A0961B /* OpenGLES.framework in Frameworks */,
 				FA84B20018469EB900A0961B /* Foundation.framework in Frameworks */,
 				FA84B5D71846CDCC00A0961B /* libSDL2.a in Frameworks */,
-				FA84B5DA1846CDDA00A0961B /* liblua.a in Frameworks */,
+				FA368CC2194D4A9D00068EAB /* libluajit.a in Frameworks */,
 				FA84B5DF1846CE0000A0961B /* liblove.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		FA368CC1194D4A9D00068EAB /* luajit */ = {
+			isa = PBXGroup;
+			children = (
+				FA368CC0194D4A9D00068EAB /* libluajit.a */,
+			);
+			name = luajit;
+			path = libraries;
+			sourceTree = "<group>";
+		};
 		FA84B1F318469EB900A0961B = {
 			isa = PBXGroup;
 			children = (
 		FA84B5D41846CDA600A0961B /* Libraries */ = {
 			isa = PBXGroup;
 			children = (
-				FA84B5D81846CDDA00A0961B /* lua */,
+				FA368CC1194D4A9D00068EAB /* luajit */,
 				FA84B5D51846CDCC00A0961B /* SDL */,
 			);
 			name = Libraries;
 			path = libraries/SDL;
 			sourceTree = "<group>";
 		};
-		FA84B5D81846CDDA00A0961B /* lua */ = {
-			isa = PBXGroup;
-			children = (
-				FA84B5D91846CDDA00A0961B /* liblua.a */,
-			);
-			name = lua;
-			path = libraries/lua;
-			sourceTree = "<group>";
-		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
 					../../src,
 					../../src/libraries,
 					../../src/modules,
-					include/lua,
+					include/luajit,
 					include/SDL,
 				);
 				IPHONEOS_DEPLOYMENT_TARGET = 5.1;
 					../../src,
 					../../src/libraries,
 					../../src/modules,
-					include/lua,
+					include/luajit,
 					include/SDL,
 				);
 				IPHONEOS_DEPLOYMENT_TARGET = 5.1;
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					libraries/SDL,
-					libraries/lua,
+					libraries/luajit,
+					"$(PROJECT_DIR)/libraries/luajit",
 				);
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				WRAPPER_EXTENSION = app;
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					libraries/SDL,
-					libraries/lua,
+					libraries/luajit,
+					"$(PROJECT_DIR)/libraries/luajit",
 				);
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				WRAPPER_EXTENSION = app;

File platform/ios/love/love-Info.plist

 	<key>UIRequiredDeviceCapabilities</key>
 	<array>
 		<string>opengles-2</string>
-		<string>armv7</string>
 	</array>
 	<key>UISupportedInterfaceOrientations</key>
 	<array>