Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions librtt/Rtt_HTTPClientCommon.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ namespace Rtt {
int luaload_json(lua_State *L);
int luaload_dkjson(lua_State *L);
int luaload_BuilderPluginDownloader(lua_State *L);
int luaload_CoronaIconComposerSupport(lua_State *L);
int luaload_CoronaPListSupport(lua_State *L);
int luaload_CoronaBuilderPluginCollector(lua_State *L);
int luaload_dkjson(lua_State* L);
Expand Down
6 changes: 6 additions & 0 deletions platform/mac/CoronaBuilder.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,8 @@
C29CB61219525CD800D1F011 /* re.lua in Sources */ = {isa = PBXBuildFile; fileRef = C29CB60219525BFA00D1F011 /* re.lua */; };
C2A2E8031EC2637300900729 /* Rtt_LuaLibBuilder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C2A2E8011EC2637300900729 /* Rtt_LuaLibBuilder.cpp */; };
C2AD19CE1C40391300217E3E /* CoronaLog.c in Sources */ = {isa = PBXBuildFile; fileRef = C2AD19CD1C40391300217E3E /* CoronaLog.c */; };
DBBD8F902EA9A8AA00E890BB /* CoronaIconComposerSupport.lua in Resources */ = {isa = PBXBuildFile; fileRef = DBBD8F8F2EA9A8AA00E890BB /* CoronaIconComposerSupport.lua */; };
DBBD8FA92EA9B35700E890BB /* CoronaIconComposerSupport.lua in Sources */ = {isa = PBXBuildFile; fileRef = DBBD8F8F2EA9A8AA00E890BB /* CoronaIconComposerSupport.lua */; };
F53C329F2404E30900BC2BED /* CoronaBuilderPluginCollector.lua in Sources */ = {isa = PBXBuildFile; fileRef = F53C328E2404E2C000BC2BED /* CoronaBuilderPluginCollector.lua */; };
F547C7F61ED28A2700C4ED92 /* Rtt_DownloadPluginsMain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F547C7F41ED28A2700C4ED92 /* Rtt_DownloadPluginsMain.cpp */; };
F547C7F71ED28BA600C4ED92 /* BuilderPluginDownloader.lua in Sources */ = {isa = PBXBuildFile; fileRef = F547C7ED1ED289EA00C4ED92 /* BuilderPluginDownloader.lua */; };
Expand Down Expand Up @@ -527,6 +529,7 @@
C2AD19CD1C40391300217E3E /* CoronaLog.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = CoronaLog.c; path = ../../librtt/Corona/CoronaLog.c; sourceTree = "<group>"; };
C2F1BAF71EF48EF500D77BD7 /* CoronaShell.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = CoronaShell.xcodeproj; path = CoronaShell/CoronaShell.xcodeproj; sourceTree = "<group>"; };
C2F1BAFD1EF48F2F00D77BD7 /* ratatouille.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; path = ratatouille.xcodeproj; sourceTree = "<group>"; };
DBBD8F8F2EA9A8AA00E890BB /* CoronaIconComposerSupport.lua */ = {isa = PBXFileReference; lastKnownFileType = text; name = CoronaIconComposerSupport.lua; path = ../resources/CoronaIconComposerSupport.lua; sourceTree = SOURCE_ROOT; };
F53C328E2404E2C000BC2BED /* CoronaBuilderPluginCollector.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CoronaBuilderPluginCollector.lua; path = ../resources/CoronaBuilderPluginCollector.lua; sourceTree = "<group>"; };
F547C7ED1ED289EA00C4ED92 /* BuilderPluginDownloader.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = BuilderPluginDownloader.lua; path = ../../tools/CoronaBuilder/BuilderPluginDownloader.lua; sourceTree = "<group>"; };
F547C7F41ED28A2700C4ED92 /* Rtt_DownloadPluginsMain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Rtt_DownloadPluginsMain.cpp; path = ../../tools/CoronaBuilder/Rtt_DownloadPluginsMain.cpp; sourceTree = "<group>"; };
Expand Down Expand Up @@ -929,6 +932,7 @@
C2947E151EB29AC5007AFD48 /* Lua */ = {
isa = PBXGroup;
children = (
DBBD8F8F2EA9A8AA00E890BB /* CoronaIconComposerSupport.lua */,
F5DB5B202113701300EC5CBC /* linuxPackageApp.lua */,
C205D56E1C7D2204000A8EE1 /* CoronaBuilder.lua */,
F547C7ED1ED289EA00C4ED92 /* BuilderPluginDownloader.lua */,
Expand Down Expand Up @@ -1231,6 +1235,7 @@
buildActionMask = 2147483647;
files = (
C2471D7819882B260076CA1F /* CoronaSimulator.icns in Resources */,
DBBD8F902EA9A8AA00E890BB /* CoronaIconComposerSupport.lua in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -1264,6 +1269,7 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
DBBD8FA92EA9B35700E890BB /* CoronaIconComposerSupport.lua in Sources */,
F53C329F2404E30900BC2BED /* CoronaBuilderPluginCollector.lua in Sources */,
F5BEA4B823FFE98200206A6A /* CoronaOfflineiOSPackager.lua in Sources */,
F5DB5B312113702800EC5CBC /* linuxPackageApp.lua in Sources */,
Expand Down
2 changes: 2 additions & 0 deletions platform/mac/Rtt_IOSAppPackager.mm
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
// following function which loads the bytecodes via luaL_loadbuffer.
int luaload_iPhonePackageApp(lua_State* L);
int luaload_CoronaPListSupport(lua_State* L);
int luaload_CoronaIconComposerSupport(lua_State* L);
int luaload_CoronaOfflineiOSPackager(lua_State* L);

// ----------------------------------------------------------------------------
Expand Down Expand Up @@ -98,6 +99,7 @@
#endif

Lua::RegisterModuleLoader( L, "CoronaPListSupport", Lua::Open< luaload_CoronaPListSupport > );
Lua::RegisterModuleLoader( L, "CoronaIconComposerSupport", Lua::Open< luaload_CoronaIconComposerSupport > );
HTTPClient::registerFetcherModuleLoaders(L);

Lua::DoBuffer( fVM, & luaload_iPhonePackageApp, NULL);
Expand Down
3 changes: 3 additions & 0 deletions platform/mac/Rtt_OSXAppPackager.mm
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@
// following function which loads the bytecodes via luaL_loadbuffer.
int luaload_OSXPackageApp(lua_State* L);
int luaload_CoronaPListSupport(lua_State* L);
int luaload_CoronaIconComposerSupport(lua_State* L);


// ----------------------------------------------------------------------------

Expand Down Expand Up @@ -88,6 +90,7 @@
#endif

Lua::RegisterModuleLoader( L, "CoronaPListSupport", Lua::Open< luaload_CoronaPListSupport > );
Lua::RegisterModuleLoader( L, "CoronaIconComposerSupport", Lua::Open< luaload_CoronaIconComposerSupport> );
Lua::RegisterModuleLoader( L, "dkjson", Lua::Open< luaload_dkjson > );
Lua::RegisterModuleLoader( L, "json", Lua::Open< luaload_json > );
Lua::RegisterModuleLoader( L, "lpeg", luaopen_lpeg );
Expand Down
3 changes: 3 additions & 0 deletions platform/mac/Rtt_TVOSAppPackager.mm
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@
// following function which loads the bytecodes via luaL_loadbuffer.
int luaload_tvosPackageApp(lua_State* L);
int luaload_CoronaPListSupport(lua_State* L);
int luaload_CoronaIconComposerSupport(lua_State* L);
int luaload_CoronaOfflineiOSPackager(lua_State* L);

// ----------------------------------------------------------------------------
Expand Down Expand Up @@ -99,6 +100,8 @@
#endif

Lua::RegisterModuleLoader( L, "CoronaPListSupport", Lua::Open< luaload_CoronaPListSupport > );
Lua::RegisterModuleLoader( L, "CoronaIconComposerSupport", Lua::Open< luaload_CoronaIconComposerSupport> );

HTTPClient::registerFetcherModuleLoaders(L);

Lua::DoBuffer( fVM, & luaload_tvosPackageApp, NULL);
Expand Down
8 changes: 8 additions & 0 deletions platform/mac/ratatouille.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -1612,6 +1612,8 @@
DB56B4CA284C2E7D00EC8B14 /* Rtt_AppleKeyServices.h in Headers */ = {isa = PBXBuildFile; fileRef = DB56B4C8284C2E7C00EC8B14 /* Rtt_AppleKeyServices.h */; };
DB56B4CB284C2E7D00EC8B14 /* Rtt_AppleKeyServices.mm in Sources */ = {isa = PBXBuildFile; fileRef = DB56B4C9284C2E7D00EC8B14 /* Rtt_AppleKeyServices.mm */; };
DB56B4CC284C2E7D00EC8B14 /* Rtt_AppleKeyServices.mm in Sources */ = {isa = PBXBuildFile; fileRef = DB56B4C9284C2E7D00EC8B14 /* Rtt_AppleKeyServices.mm */; };
DBBD8FAB2EA9B4AE00E890BB /* CoronaIconComposerSupport.lua in Sources */ = {isa = PBXBuildFile; fileRef = DBBD8FA02EA9A90F00E890BB /* CoronaIconComposerSupport.lua */; };
DBBD8FAC2EA9B4BD00E890BB /* CoronaIconComposerSupport.lua in Sources */ = {isa = PBXBuildFile; fileRef = DBBD8FA02EA9A90F00E890BB /* CoronaIconComposerSupport.lua */; };
E23CD30D147C725200BC9038 /* BuildSessionState.mm in Sources */ = {isa = PBXBuildFile; fileRef = E23CD30C147C725200BC9038 /* BuildSessionState.mm */; };
F500FB401FED5CE20050B28B /* webtemplate.zip in Resources */ = {isa = PBXBuildFile; fileRef = F500FB3F1FED5CE20050B28B /* webtemplate.zip */; };
F50F51B81B700C04006FEF92 /* Rtt_TextureResourceBitmap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F50F51B61B700C04006FEF92 /* Rtt_TextureResourceBitmap.cpp */; };
Expand Down Expand Up @@ -3362,6 +3364,8 @@
C2FCEBA51B701A1800587F1E /* gameoverlayrenderer.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = gameoverlayrenderer.dylib; path = /Applications/Steam.app/Contents/MacOS/gameoverlayrenderer.dylib; sourceTree = "<group>"; };
DB56B4C8284C2E7C00EC8B14 /* Rtt_AppleKeyServices.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Rtt_AppleKeyServices.h; path = ../apple/Rtt_AppleKeyServices.h; sourceTree = "<group>"; };
DB56B4C9284C2E7D00EC8B14 /* Rtt_AppleKeyServices.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = Rtt_AppleKeyServices.mm; path = ../apple/Rtt_AppleKeyServices.mm; sourceTree = "<group>"; };
DBBD8FA02EA9A90F00E890BB /* CoronaIconComposerSupport.lua */ = {isa = PBXFileReference; lastKnownFileType = text; name = CoronaIconComposerSupport.lua; path = ../resources/CoronaIconComposerSupport.lua; sourceTree = SOURCE_ROOT; };
DBBD8FAA2EA9B48400E890BB /* CoronaIconComposerSupport.lua */ = {isa = PBXFileReference; lastKnownFileType = text; name = CoronaIconComposerSupport.lua; path = ../resources/CoronaIconComposerSupport.lua; sourceTree = "<group>"; };
E23CD30B147C725200BC9038 /* BuildSessionState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BuildSessionState.h; sourceTree = "<group>"; };
E23CD30C147C725200BC9038 /* BuildSessionState.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = BuildSessionState.mm; sourceTree = "<group>"; };
F500FB3F1FED5CE20050B28B /* webtemplate.zip */ = {isa = PBXFileReference; lastKnownFileType = archive.zip; name = webtemplate.zip; path = ../resources/webtemplate.zip; sourceTree = "<group>"; };
Expand Down Expand Up @@ -4136,6 +4140,7 @@
00B73BAF12B71BDA0057F594 /* Resources */ = {
isa = PBXGroup;
children = (
DBBD8FA02EA9A90F00E890BB /* CoronaIconComposerSupport.lua */,
1F46A96521136B51009CC875 /* linuxPackageApp.lua */,
C2AF1E531DA6F0ED00907A65 /* valid_build_settings.lua */,
C2AF1E541DA6F0ED00907A65 /* valid_config_lua.lua */,
Expand Down Expand Up @@ -4495,6 +4500,7 @@
29B97314FDCFA39411CA2CEA /* ratatouille */ = {
isa = PBXGroup;
children = (
DBBD8FAA2EA9B48400E890BB /* CoronaIconComposerSupport.lua */,
C21995A81C189E0100E88FD0 /* ios-syslog-helper.xcodeproj */,
C26DD10A1BD9508800EC4F44 /* CoronaConsole.xcodeproj */,
C2EF85011B336B6300731A45 /* CoronaShell.xcodeproj */,
Expand Down Expand Up @@ -6916,6 +6922,7 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
DBBD8FAB2EA9B4AE00E890BB /* CoronaIconComposerSupport.lua in Sources */,
F53C328C2404E2A300BC2BED /* CoronaBuilderPluginCollector.lua in Sources */,
F5FFADBC23FFC7DB004E61A9 /* CoronaOfflineiOSPackager.lua in Sources */,
C2AF1E571DA6F24500907A65 /* valid_build_settings.lua in Sources */,
Expand Down Expand Up @@ -7524,6 +7531,7 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
DBBD8FAC2EA9B4BD00E890BB /* CoronaIconComposerSupport.lua in Sources */,
F53C328D2404E2AB00BC2BED /* CoronaBuilderPluginCollector.lua in Sources */,
F5FFADBE23FFC80E004E61A9 /* CoronaOfflineiOSPackager.lua in Sources */,
F5DB5B1A21136F9D00EC5CBC /* linuxPackageApp.lua in Sources */,
Expand Down
Loading