mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-24 15:01:16 +01:00
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:
parent
b9794a9533
commit
dcb9967e75
2
Externals/Lua/Lua.vcproj
vendored
2
Externals/Lua/Lua.vcproj
vendored
@ -229,7 +229,7 @@
|
||||
Optimization="2"
|
||||
EnableIntrinsicFunctions="true"
|
||||
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE"
|
||||
RuntimeLibrary="2"
|
||||
RuntimeLibrary="0"
|
||||
EnableFunctionLevelLinking="true"
|
||||
WarningLevel="3"
|
||||
DebugInformationFormat="3"
|
||||
|
@ -57,7 +57,7 @@ wxLuaWindow::wxLuaWindow(wxFrame* parent, const wxPoint& pos, const wxSize& size
|
||||
{
|
||||
// Create Lua context
|
||||
luaID = luaCount;
|
||||
///Lua::OpenLuaContext(luaID, LuaPrint, NULL, LuaStop);
|
||||
Lua::OpenLuaContext(luaID, LuaPrint, NULL, LuaStop);
|
||||
g_contextMap[luaID] = this;
|
||||
luaCount++;
|
||||
bScriptRunning = false;
|
||||
@ -76,7 +76,7 @@ wxLuaWindow::wxLuaWindow(wxFrame* parent, const wxPoint& pos, const wxSize& size
|
||||
wxLuaWindow::~wxLuaWindow()
|
||||
{
|
||||
// On Disposal
|
||||
///Lua::CloseLuaContext(luaID);
|
||||
Lua::CloseLuaContext(luaID);
|
||||
g_contextMap.erase(luaID);
|
||||
}
|
||||
|
||||
@ -157,12 +157,12 @@ void wxLuaWindow::OnEvent_ScriptRun_Press(wxCommandEvent& WXUNUSED(event))
|
||||
m_Button_Run->Disable();
|
||||
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))
|
||||
{
|
||||
///Lua::StopLuaScript(luaID);
|
||||
Lua::StopLuaScript(luaID);
|
||||
OnStop();
|
||||
PrintMessage("Script stopped!\n");
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user