ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Lua is officially supported on Dolphin. (thanks for the linkage fix shuffle2!) 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4512 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
XTra.KrazzY 2009-11-08 00:15:58 +00:00
parent b9794a9533
commit dcb9967e75
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Externals/Lua/Lua.vcproj vendored
View File

@ -229,7 +229,7 @@
Optimization="2" Optimization="2"
EnableIntrinsicFunctions="true" EnableIntrinsicFunctions="true"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE" PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE"
RuntimeLibrary="2" RuntimeLibrary="0"
EnableFunctionLevelLinking="true" EnableFunctionLevelLinking="true"
WarningLevel="3" WarningLevel="3"
DebugInformationFormat="3" DebugInformationFormat="3"

8
Source/Core/DolphinWX/Src/LuaWindow.cpp
View File

@ -57,7 +57,7 @@ wxLuaWindow::wxLuaWindow(wxFrame* parent, const wxPoint& pos, const wxSize& size
{ {
// Create Lua context // Create Lua context
luaID = luaCount; luaID = luaCount;
///Lua::OpenLuaContext(luaID, LuaPrint, NULL, LuaStop); Lua::OpenLuaContext(luaID, LuaPrint, NULL, LuaStop);
g_contextMap[luaID] = this; g_contextMap[luaID] = this;
luaCount++; luaCount++;
bScriptRunning = false; bScriptRunning = false;
@ -76,7 +76,7 @@ wxLuaWindow::wxLuaWindow(wxFrame* parent, const wxPoint& pos, const wxSize& size
wxLuaWindow::~wxLuaWindow() wxLuaWindow::~wxLuaWindow()
{ {
// On Disposal // On Disposal
///Lua::CloseLuaContext(luaID); Lua::CloseLuaContext(luaID);
g_contextMap.erase(luaID); g_contextMap.erase(luaID);
} }
@ -157,12 +157,12 @@ void wxLuaWindow::OnEvent_ScriptRun_Press(wxCommandEvent& WXUNUSED(event))
m_Button_Run->Disable(); m_Button_Run->Disable();
m_Button_Stop->Enable(); m_Button_Stop->Enable();
///Lua::RunLuaScriptFile(luaID, (const char *)currentScript.mb_str()); Lua::RunLuaScriptFile(luaID, (const char *)currentScript.mb_str());
} }
void wxLuaWindow::OnEvent_ScriptStop_Press(wxCommandEvent& WXUNUSED(event)) void wxLuaWindow::OnEvent_ScriptStop_Press(wxCommandEvent& WXUNUSED(event))
{ {
///Lua::StopLuaScript(luaID); Lua::StopLuaScript(luaID);
OnStop(); OnStop();
PrintMessage("Script stopped!\n"); PrintMessage("Script stopped!\n");
} }