diff options
| author | Oliver Schneider <oliver@assarbad.net> | 2012-10-24 19:00:00 +0400 |
|---|---|---|
| committer | Oliver Schneider <oliver@assarbad.net> | 2012-10-24 19:00:00 +0400 |
| commit | 13f67b7ba1ef1939811f71cff76bb0084a9de42b (patch) | |
| tree | 29215356ff589d9ac830abcfbbb7ad8c5ace5b44 /sandbox | |
| parent | b1ea7cb3b5456992f51e5e98146f5d1626bb5f49 (diff) | |
- Implemented os.iswow64()
- Preparing for os.isadmin()
- Some consolidation
Diffstat (limited to 'sandbox')
| -rw-r--r-- | sandbox/luaconf/lua_conf.cpp | 5 | ||||
| -rw-r--r-- | sandbox/luaconf/lua_conf.vcproj | 116 |
2 files changed, 117 insertions, 4 deletions
diff --git a/sandbox/luaconf/lua_conf.cpp b/sandbox/luaconf/lua_conf.cpp index 3b7d058..c705101 100644 --- a/sandbox/luaconf/lua_conf.cpp +++ b/sandbox/luaconf/lua_conf.cpp @@ -12,12 +12,9 @@ using namespace std; int _tmain(int argc, TCHAR* argv[], TCHAR* envp[])
{
- lua_State* L = lua_open();
+ lua_State* L = luaWDS_open();
if(L)
{
- lua_gc(L, LUA_GCSTOP, 0); /* stop collector during initialization */
- luaL_openlibs(L); /* open libraries */
- lua_gc(L, LUA_GCRESTART, 0);
int ret = luaL_dofile(L, "..\\lua_conf.lua");
if(ret)
{
diff --git a/sandbox/luaconf/lua_conf.vcproj b/sandbox/luaconf/lua_conf.vcproj index 38d5f1e..a00ff88 100644 --- a/sandbox/luaconf/lua_conf.vcproj +++ b/sandbox/luaconf/lua_conf.vcproj @@ -1120,6 +1120,78 @@ Name="Modules"
>
<File
+ RelativePath="..\..\lua\src\modules\isadmin.c"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\..\lua\src\modules\w32resembed.c"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ </File>
+ <File
RelativePath="..\..\lua\src\modules\winreg.c"
>
<FileConfiguration
@@ -1163,6 +1235,42 @@ />
</FileConfiguration>
</File>
+ <File
+ RelativePath="..\..\lua\src\modules\wow64.c"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ </File>
<Filter
Name="winreg"
>
@@ -1982,9 +2090,17 @@ Name="Modules"
>
<File
+ RelativePath="..\..\lua\src\modules\isadmin.h"
+ >
+ </File>
+ <File
RelativePath="..\..\lua\src\modules\winreg.h"
>
</File>
+ <File
+ RelativePath="..\..\lua\src\modules\wow64.h"
+ >
+ </File>
<Filter
Name="winreg"
>
|