diff --git a/Externals/Lua/Lua.vcproj b/Externals/Lua/Lua.vcproj index ae46465101..0e6ecbe364 100644 --- a/Externals/Lua/Lua.vcproj +++ b/Externals/Lua/Lua.vcproj @@ -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" diff --git a/Source/Core/DolphinWX/Src/LuaWindow.cpp b/Source/Core/DolphinWX/Src/LuaWindow.cpp index 80969ac707..8a2ee24b79 100644 --- a/Source/Core/DolphinWX/Src/LuaWindow.cpp +++ b/Source/Core/DolphinWX/Src/LuaWindow.cpp @@ -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"); }