diff --git a/trunk/src/lua-engine.cpp b/trunk/src/lua-engine.cpp index 417e810f..8630c554 100644 --- a/trunk/src/lua-engine.cpp +++ b/trunk/src/lua-engine.cpp @@ -48,13 +48,12 @@ extern TASEDITOR_LUA taseditor_lua; #endif -bool DemandLua() +bool CheckLua() { #ifdef WIN32 HMODULE mod = LoadLibrary("lua51.dll"); if(!mod) { - MessageBox(NULL, "lua51.dll was not found. Please get it into your PATH or in the same directory as fceux.exe", "FCEUX", MB_OK | MB_ICONERROR); return false; } FreeLibrary(mod); @@ -64,6 +63,20 @@ bool DemandLua() #endif } +bool DemandLua() +{ +#ifdef WIN32 + if(!CheckLua()) + { + MessageBox(NULL, "lua51.dll was not found. Please get it into your PATH or in the same directory as fceux.exe", "FCEUX", MB_OK | MB_ICONERROR); + return false; + } + return true; +#else + return true; +#endif +} + extern "C" { #include @@ -5674,7 +5687,7 @@ void FCEU_ReloadLuaCode() */ void FCEU_LuaStop() { - if (!DemandLua()) + if (!CheckLua()) return; //already killed diff --git a/trunk/vc/.gitignore b/trunk/vc/.gitignore index 4e51055a..a2c54f42 100644 --- a/trunk/vc/.gitignore +++ b/trunk/vc/.gitignore @@ -17,3 +17,5 @@ /vc8_bin_debug /vc8_fceux.ncb /vc8_obj_Debug +/vc8_fceux.suo +/*.user