From 320fa688f15054d7ebb110c4435eeb7021707946 Mon Sep 17 00:00:00 2001 From: riccardom Date: Mon, 5 Apr 2010 15:16:37 +0000 Subject: [PATCH] Make our stub code for not shipping lua a bit less lame. --- desmume/src/wx/Makefile.am | 1 - desmume/src/wx/wxMain.cpp | 18 ++---------------- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/desmume/src/wx/Makefile.am b/desmume/src/wx/Makefile.am index 121ff3e9b..51bf9315d 100644 --- a/desmume/src/wx/Makefile.am +++ b/desmume/src/wx/Makefile.am @@ -19,7 +19,6 @@ wxdesmume_SOURCES = \ InputCommon/EventHandler.cpp \ InputCommon/Configuration.cpp \ InputCommon/SDL.cpp \ - LuaWindow.cpp \ StringUtil.cpp \ wxMain.cpp wxdesmume_LDADD = ../libdesmume.a \ diff --git a/desmume/src/wx/wxMain.cpp b/desmume/src/wx/wxMain.cpp index 72ba38ca1..9d0a3e459 100644 --- a/desmume/src/wx/wxMain.cpp +++ b/desmume/src/wx/wxMain.cpp @@ -63,22 +63,6 @@ GPU3DInterface *core3DList[] = { NULL }; -/* lua stuff stubs */ -#ifndef WIN32 -void OpenLuaContext(int, void (*)(int, char const*), void (*)(int), void (*)(int, bool)) -{ -} -void RunLuaScriptFile(int, char const*) -{ -} -void StopLuaScript(int) -{ -} -void CloseLuaContext(int) -{ -} -#endif - volatile bool execute = false; class Desmume: public wxApp @@ -399,7 +383,9 @@ loop: void OnOpenLuaWindow(wxCommandEvent& WXUNUSED (event)) { +#ifdef WIN32 new wxLuaWindow(this, wxDefaultPosition, wxSize(600, 390)); +#endif } void OnOpenControllerConfiguration(wxCommandEvent& WXUNUSED (event))