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

Win32 - Reverted acmlm's /dll folder fix.

This commit is contained in:
adelikat 2009-03-29 12:43:51 +00:00
parent 48a9428abc
commit 6c001a81cb
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.txt
View File

@ -1,4 +1,5 @@
---version 2.0.4 yet to be released--- ---version 2.0.4 yet to be released---
29-mar-2009 - adelikat - Win32 - reverted acmlm's /dll folder change
28-mar-2009 - shinydoofy - sdl - added hotkey Del to toggle mute avi capturing 28-mar-2009 - shinydoofy - sdl - added hotkey Del to toggle mute avi capturing
28-mar-2009 - shinydoofy - sdl - fix fm2 playback and fcm->fm2 conversion crash at the cost of ugly 0x00 bytes behind the author's comment line 28-mar-2009 - shinydoofy - sdl - fix fm2 playback and fcm->fm2 conversion crash at the cost of ugly 0x00 bytes behind the author's comment line
28-mar-2009 - adelikat - Lua - added FCEU.poweron() and FCEU.softreset() 28-mar-2009 - adelikat - Lua - added FCEU.poweron() and FCEU.softreset()

2
src/config.cpp
View File

@ -18,7 +18,7 @@ char *FCEUI_GetAboutString() {
Authors:\n\ Authors:\n\
zeromus, adelikat, CaH4e3\n\n\ zeromus, adelikat, CaH4e3\n\n\
Contributers:\n\ Contributers:\n\
DWEdit,QFox\n\ Acmlm,DWEdit,QFox\n\
\n\ \n\
FCEUX 2.0\n\ FCEUX 2.0\n\
mz, nitsujrehtona, Lukas Sabota,\n\ mz, nitsujrehtona, Lukas Sabota,\n\

2
src/drivers/win/lua/include/luaconf.h
View File

@ -86,7 +86,7 @@
** path of the directory of the executable file of the current process. ** path of the directory of the executable file of the current process.
*/ */
#define LUA_LDIR "!\\lua\\" #define LUA_LDIR "!\\lua\\"
#define LUA_CDIR "!\\dll\\" #define LUA_CDIR "!\\"
#define LUA_PATH_DEFAULT \ #define LUA_PATH_DEFAULT \
".\\?.lua;" LUA_LDIR"?.lua;" LUA_LDIR"?\\init.lua;" \ ".\\?.lua;" LUA_LDIR"?.lua;" LUA_LDIR"?\\init.lua;" \
LUA_CDIR"?.lua;" LUA_CDIR"?\\init.lua" LUA_CDIR"?.lua;" LUA_CDIR"?\\init.lua"

2
src/lua-engine.cpp
View File

@ -2036,7 +2036,7 @@ int FCEU_LoadLuaCode(const char *filename) {
if (!L) { if (!L) {
#ifdef WIN32 #ifdef WIN32
HMODULE test = LoadLibrary("dll\\lua5.1.dll"); HMODULE test = LoadLibrary("lua5.1.dll");
if(!test) if(!test)
{ {
FCEUD_PrintError("Couldn't initialize lua system due to failure loading lua5.1.dll"); FCEUD_PrintError("Couldn't initialize lua system due to failure loading lua5.1.dll");