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

add luaperks.lib (iup and associated libraries)

This commit is contained in:
zeromus 2009-11-03 06:11:55 +00:00
parent 009dd0f23a
commit 856ca12c03
5 changed files with 76 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/auxlib.lua
View File

@ -1,12 +1,15 @@
-- this includes the iup system -- this includes the iup system
local iuplua_open = package.loadlib("iuplua51.dll", "iuplua_open"); --local iuplua_open = package.loadlib("iuplua51.dll", "iuplua_open");
if(iuplua_open == nil) then require("libiuplua51"); end --if(iuplua_open == nil) then require("libiuplua51"); end
iuplua_open(); --iuplua_open();
-- this includes the "special controls" of iup (dont change the order though) -- this includes the "special controls" of iup (dont change the order though)
local iupcontrolslua_open = package.loadlib("iupluacontrols51.dll", "iupcontrolslua_open"); --local iupcontrolslua_open = package.loadlib("iupluacontrols51.dll", "iupcontrolslua_open");
if(iupcontrolslua_open == nil) then require("libiupluacontrols51"); end --if(iupcontrolslua_open == nil) then require("libiupluacontrols51"); end
iupcontrolslua_open(); --iupcontrolslua_open();
--TODO!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
--LUACALL_BEFOREEXIT use that instead of emu.OnClose below
-- callback function to clean up our mess -- callback function to clean up our mess
-- this is called when the script exits (forced or natural) -- this is called when the script exits (forced or natural)
@ -16,7 +19,7 @@ function emu.OnClose.iuplua()
if(emu and emu.OnCloseIup ~= nil) then if(emu and emu.OnCloseIup ~= nil) then
emu.OnCloseIup(); emu.OnCloseIup();
end end
iup.Close(); --iup.Close();
end end
-- this system allows you to open a number of dialogs without -- this system allows you to open a number of dialogs without

8
src/lua-engine.cpp
View File

@ -40,6 +40,10 @@ extern "C"
#include <lauxlib.h> #include <lauxlib.h>
#include <lualib.h> #include <lualib.h>
#include <lstate.h> #include <lstate.h>
#ifdef WIN32
int iuplua_open(lua_State * L);
int iupcontrolslua_open(lua_State * L);
#endif
} }
#ifndef TRUE #ifndef TRUE
@ -4403,6 +4407,10 @@ int FCEU_LoadLuaCode(const char *filename) {
L = lua_open(); L = lua_open();
luaL_openlibs(L); luaL_openlibs(L);
#ifdef WIN32
iuplua_open(L);
iupcontrolslua_open(L);
#endif
luaL_register(L, "emu", emulib); // added for better cross-emulator compatibility luaL_register(L, "emu", emulib); // added for better cross-emulator compatibility
luaL_register(L, "FCEU", emulib); // kept for backward compatibility luaL_register(L, "FCEU", emulib); // kept for backward compatibility

BIN
vc/luaperks.lib Normal file
View File

Binary file not shown.

112
vc/vc8_fceux.vcproj
View File

@ -68,7 +68,7 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="delayimp.lib Rpcrt4.lib comctl32.lib vfw32.lib winmm.lib ws2_32.lib htmlhelp.lib ../src/drivers/win/directx/dsound.lib ../src/drivers/win/directx/dxguid.lib ../src/drivers/win/directx/ddraw.lib ../src/drivers/win/directx/dinput.lib" AdditionalDependencies="Rpcrt4.lib comctl32.lib vfw32.lib winmm.lib ws2_32.lib htmlhelp.lib ../src/drivers/win/directx/dsound.lib ../src/drivers/win/directx/dxguid.lib ../src/drivers/win/directx/ddraw.lib ../src/drivers/win/directx/dinput.lib luaperks.lib"
LinkIncremental="2" LinkIncremental="2"
DelayLoadDLLs="" DelayLoadDLLs=""
GenerateDebugInformation="true" GenerateDebugInformation="true"
@ -155,7 +155,7 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="delayimp.lib Rpcrt4.lib comctl32.lib vfw32.lib winmm.lib ws2_32.lib htmlhelp.lib ../src/drivers/win/directx/dsound.lib ../src/drivers/win/directx/dxguid.lib ../src/drivers/win/directx/ddraw.lib ../src/drivers/win/directx/dinput.lib lua/lua-5.1.4-x86.lib" AdditionalDependencies="Rpcrt4.lib comctl32.lib vfw32.lib winmm.lib ws2_32.lib htmlhelp.lib ../src/drivers/win/directx/dsound.lib ../src/drivers/win/directx/dxguid.lib ../src/drivers/win/directx/ddraw.lib ../src/drivers/win/directx/dinput.lib luaperks.lib"
LinkIncremental="1" LinkIncremental="1"
DelayLoadDLLs="" DelayLoadDLLs=""
GenerateDebugInformation="true" GenerateDebugInformation="true"
@ -2521,218 +2521,218 @@
</File> </File>
</Filter> </Filter>
<Filter <Filter
Name="lua5.1.4" Name="lua"
> >
<File <File
RelativePath="..\lua5.1.4\src\lapi.c" RelativePath="..\src\lua\src\lapi.c"
> >
</File> </File>
<File <File
RelativePath="..\lua5.1.4\src\lapi.h" RelativePath="..\src\lua\src\lapi.h"
> >
</File> </File>
<File <File
RelativePath="..\lua5.1.4\src\lauxlib.c" RelativePath="..\src\lua\src\lauxlib.c"
> >
</File> </File>
<File <File
RelativePath="..\lua5.1.4\src\lauxlib.h" RelativePath="..\src\lua\src\lauxlib.h"
> >
</File> </File>
<File <File
RelativePath="..\lua5.1.4\src\lbaselib.c" RelativePath="..\src\lua\src\lbaselib.c"
> >
</File> </File>
<File <File
RelativePath="..\lua5.1.4\src\lcode.c" RelativePath="..\src\lua\src\lcode.c"
> >
</File> </File>
<File <File
RelativePath="..\lua5.1.4\src\lcode.h" RelativePath="..\src\lua\src\lcode.h"
> >
</File> </File>
<File <File
RelativePath="..\lua5.1.4\src\ldblib.c" RelativePath="..\src\lua\src\ldblib.c"
> >
</File> </File>
<File <File
RelativePath="..\lua5.1.4\src\ldebug.c" RelativePath="..\src\lua\src\ldebug.c"
> >
</File> </File>
<File <File
RelativePath="..\lua5.1.4\src\ldebug.h" RelativePath="..\src\lua\src\ldebug.h"
> >
</File> </File>
<File <File
RelativePath="..\lua5.1.4\src\ldo.c" RelativePath="..\src\lua\src\ldo.c"
> >
</File> </File>
<File <File
RelativePath="..\lua5.1.4\src\ldo.h" RelativePath="..\src\lua\src\ldo.h"
> >
</File> </File>
<File <File
RelativePath="..\lua5.1.4\src\ldump.c" RelativePath="..\src\lua\src\ldump.c"
> >
</File> </File>
<File <File
RelativePath="..\lua5.1.4\src\lfunc.c" RelativePath="..\src\lua\src\lfunc.c"
> >
</File> </File>
<File <File
RelativePath="..\lua5.1.4\src\lfunc.h" RelativePath="..\src\lua\src\lfunc.h"
> >
</File> </File>
<File <File
RelativePath="..\lua5.1.4\src\lgc.c" RelativePath="..\src\lua\src\lgc.c"
> >
</File> </File>
<File <File
RelativePath="..\lua5.1.4\src\lgc.h" RelativePath="..\src\lua\src\lgc.h"
> >
</File> </File>
<File <File
RelativePath="..\lua5.1.4\src\linit.c" RelativePath="..\src\lua\src\linit.c"
> >
</File> </File>
<File <File
RelativePath="..\lua5.1.4\src\liolib.c" RelativePath="..\src\lua\src\liolib.c"
> >
</File> </File>
<File <File
RelativePath="..\lua5.1.4\src\llex.c" RelativePath="..\src\lua\src\llex.c"
> >
</File> </File>
<File <File
RelativePath="..\lua5.1.4\src\llex.h" RelativePath="..\src\lua\src\llex.h"
> >
</File> </File>
<File <File
RelativePath="..\lua5.1.4\src\llimits.h" RelativePath="..\src\lua\src\llimits.h"
> >
</File> </File>
<File <File
RelativePath="..\lua5.1.4\src\lmathlib.c" RelativePath="..\src\lua\src\lmathlib.c"
> >
</File> </File>
<File <File
RelativePath="..\lua5.1.4\src\lmem.c" RelativePath="..\src\lua\src\lmem.c"
> >
</File> </File>
<File <File
RelativePath="..\lua5.1.4\src\lmem.h" RelativePath="..\src\lua\src\lmem.h"
> >
</File> </File>
<File <File
RelativePath="..\lua5.1.4\src\loadlib.c" RelativePath="..\src\lua\src\loadlib.c"
> >
</File> </File>
<File <File
RelativePath="..\lua5.1.4\src\lobject.c" RelativePath="..\src\lua\src\lobject.c"
> >
</File> </File>
<File <File
RelativePath="..\lua5.1.4\src\lobject.h" RelativePath="..\src\lua\src\lobject.h"
> >
</File> </File>
<File <File
RelativePath="..\lua5.1.4\src\lopcodes.c" RelativePath="..\src\lua\src\lopcodes.c"
> >
</File> </File>
<File <File
RelativePath="..\lua5.1.4\src\lopcodes.h" RelativePath="..\src\lua\src\lopcodes.h"
> >
</File> </File>
<File <File
RelativePath="..\lua5.1.4\src\loslib.c" RelativePath="..\src\lua\src\loslib.c"
> >
</File> </File>
<File <File
RelativePath="..\lua5.1.4\src\lparser.c" RelativePath="..\src\lua\src\lparser.c"
> >
</File> </File>
<File <File
RelativePath="..\lua5.1.4\src\lparser.h" RelativePath="..\src\lua\src\lparser.h"
> >
</File> </File>
<File <File
RelativePath="..\lua5.1.4\src\lstate.c" RelativePath="..\src\lua\src\lstate.c"
> >
</File> </File>
<File <File
RelativePath="..\lua5.1.4\src\lstate.h" RelativePath="..\src\lua\src\lstate.h"
> >
</File> </File>
<File <File
RelativePath="..\lua5.1.4\src\lstring.c" RelativePath="..\src\lua\src\lstring.c"
> >
</File> </File>
<File <File
RelativePath="..\lua5.1.4\src\lstring.h" RelativePath="..\src\lua\src\lstring.h"
> >
</File> </File>
<File <File
RelativePath="..\lua5.1.4\src\lstrlib.c" RelativePath="..\src\lua\src\lstrlib.c"
> >
</File> </File>
<File <File
RelativePath="..\lua5.1.4\src\ltable.c" RelativePath="..\src\lua\src\ltable.c"
> >
</File> </File>
<File <File
RelativePath="..\lua5.1.4\src\ltable.h" RelativePath="..\src\lua\src\ltable.h"
> >
</File> </File>
<File <File
RelativePath="..\lua5.1.4\src\ltablib.c" RelativePath="..\src\lua\src\ltablib.c"
> >
</File> </File>
<File <File
RelativePath="..\lua5.1.4\src\ltm.c" RelativePath="..\src\lua\src\ltm.c"
> >
</File> </File>
<File <File
RelativePath="..\lua5.1.4\src\ltm.h" RelativePath="..\src\lua\src\ltm.h"
> >
</File> </File>
<File <File
RelativePath="..\lua5.1.4\src\lua.h" RelativePath="..\src\lua\src\lua.h"
> >
</File> </File>
<File <File
RelativePath="..\lua5.1.4\src\luaconf.h" RelativePath="..\src\lua\src\luaconf.h"
> >
</File> </File>
<File <File
RelativePath="..\lua5.1.4\src\lualib.h" RelativePath="..\src\lua\src\lualib.h"
> >
</File> </File>
<File <File
RelativePath="..\lua5.1.4\src\lundump.c" RelativePath="..\src\lua\src\lundump.c"
> >
</File> </File>
<File <File
RelativePath="..\lua5.1.4\src\lundump.h" RelativePath="..\src\lua\src\lundump.h"
> >
</File> </File>
<File <File
RelativePath="..\lua5.1.4\src\lvm.c" RelativePath="..\src\lua\src\lvm.c"
> >
</File> </File>
<File <File
RelativePath="..\lua5.1.4\src\lvm.h" RelativePath="..\src\lua\src\lvm.h"
> >
</File> </File>
<File <File
RelativePath="..\lua5.1.4\src\lzio.c" RelativePath="..\src\lua\src\lzio.c"
> >
</File> </File>
<File <File
RelativePath="..\lua5.1.4\src\lzio.h" RelativePath="..\src\lua\src\lzio.h"
> >
</File> </File>
<File <File
RelativePath="..\lua5.1.4\src\print.c" RelativePath="..\src\lua\src\print.c"
> >
</File> </File>
</Filter> </Filter>

4
vc/vc9_fceux.vcproj
View File

@ -69,7 +69,7 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="delayimp.lib Rpcrt4.lib comctl32.lib vfw32.lib winmm.lib ws2_32.lib htmlhelp.lib ../src/drivers/win/directx/dsound.lib ../src/drivers/win/directx/dxguid.lib ../src/drivers/win/directx/ddraw.lib ../src/drivers/win/directx/dinput.lib" AdditionalDependencies="Rpcrt4.lib comctl32.lib vfw32.lib winmm.lib ws2_32.lib htmlhelp.lib ../src/drivers/win/directx/dsound.lib ../src/drivers/win/directx/dxguid.lib ../src/drivers/win/directx/ddraw.lib ../src/drivers/win/directx/dinput.lib luaperks.lib"
LinkIncremental="2" LinkIncremental="2"
DelayLoadDLLs="" DelayLoadDLLs=""
GenerateDebugInformation="true" GenerateDebugInformation="true"
@ -235,7 +235,7 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="delayimp.lib Rpcrt4.lib comctl32.lib vfw32.lib winmm.lib ws2_32.lib htmlhelp.lib ../src/drivers/win/directx/dsound.lib ../src/drivers/win/directx/dxguid.lib ../src/drivers/win/directx/ddraw.lib ../src/drivers/win/directx/dinput.lib" AdditionalDependencies="Rpcrt4.lib comctl32.lib vfw32.lib winmm.lib ws2_32.lib htmlhelp.lib ../src/drivers/win/directx/dsound.lib ../src/drivers/win/directx/dxguid.lib ../src/drivers/win/directx/ddraw.lib ../src/drivers/win/directx/dinput.lib luaperks.lib"
LinkIncremental="1" LinkIncremental="1"
DelayLoadDLLs="" DelayLoadDLLs=""
GenerateDebugInformation="true" GenerateDebugInformation="true"