Skip to content

Commit 138bf3c

Browse files
committed
Pre-merge commit
1 parent 505e789 commit 138bf3c

24 files changed

+48
-46
lines changed

LuaEngine.sdf

37.3 MB
Binary file not shown.

LuaEngine.v11.suo

-2 KB
Binary file not shown.

LuaEngine.vcxproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
<UseDebugLibraries>false</UseDebugLibraries>
2727
<WholeProgramOptimization>true</WholeProgramOptimization>
2828
<CharacterSet>Unicode</CharacterSet>
29+
<PlatformToolset>v110</PlatformToolset>
2930
</PropertyGroup>
3031
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
3132
<ImportGroup Label="ExtensionSettings">

Main.cpp

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
#include <iostream>
55
#include <string>
66
#include <stdarg.h>
7-
7+
#include <thread>
8+
#include <list>
89

910
using namespace std;
1011

@@ -70,6 +71,9 @@ int main()
7071

7172
map<string, LuaScript*>::iterator scriptItr = ScriptManager::getInstance()->getScripts().begin();
7273

74+
//Thread repository
75+
list<thread> threads;
76+
7377
//Init all scripts
7478
for(scriptItr; scriptItr != ScriptManager::getInstance()->getScripts().end(); scriptItr++)
7579
scriptItr->second->lua_voidfunc("s", "init");
@@ -79,9 +83,13 @@ int main()
7983
while(!quit)
8084
{
8185
printf("\n %d \n", ++count);
82-
for(scriptItr = ScriptManager::getInstance()->getScripts().begin(); scriptItr != ScriptManager::getInstance()->getScripts().end(); scriptItr++)
86+
for(scriptItr = ScriptManager::getInstance()->getScripts().begin();
87+
scriptItr != ScriptManager::getInstance()->getScripts().end();
88+
scriptItr++)
89+
{
8390
scriptItr->second->lua_voidfunc("s", "update");
84-
91+
threads.push_back(thread(scriptItr->second->lua_voidfunc("s","update")));
92+
}
8593
/*char q;
8694
printf("Enter q to quit: ");
8795
cin >> q;

Release/CL.read.1.tlog

-19.3 KB
Binary file not shown.

Release/CL.write.1.tlog

-428 Bytes
Binary file not shown.
Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,22 @@
1-
J:\PORTABLEAPPS\DOCUMENTS\GIT\LUAENGINE\RELEASE\THREADMANAGER.OBJ
2-
J:\PORTABLEAPPS\DOCUMENTS\GIT\LUAENGINE\RELEASE\MAIN.OBJ
3-
J:\PORTABLEAPPS\DOCUMENTS\GIT\LUAENGINE\RELEASE\LUASCRIPT.OBJ
4-
J:\PORTABLEAPPS\DOCUMENTS\GIT\LUAENGINE\RELEASE\VC110.PDB
5-
J:\PortableApps\Documents\Git\LuaEngine\Release\LuaScript.obj
6-
J:\PortableApps\Documents\Git\LuaEngine\Release\Main.obj
7-
J:\PortableApps\Documents\Git\LuaEngine\Release\ThreadManager.obj
8-
J:\PortableApps\Documents\Git\LuaEngine\Release\cl.command.1.tlog
9-
J:\PortableApps\Documents\Git\LuaEngine\Release\CL.read.1.tlog
10-
J:\PortableApps\Documents\Git\LuaEngine\Release\CL.write.1.tlog
11-
J:\PortableApps\Documents\Git\LuaEngine\Release\link.command.1.tlog
12-
J:\PortableApps\Documents\Git\LuaEngine\Release\link.read.1.tlog
13-
J:\PortableApps\Documents\Git\LuaEngine\Release\link.write.1.tlog
14-
J:\PortableApps\Documents\Git\LuaEngine\Release\vc110.pdb
1+
H:\PORTABLEAPPS\DOCUMENTS\GIT\LUAENGINE\RELEASE\SCRIPTMANAGER.OBJ
2+
H:\PORTABLEAPPS\DOCUMENTS\GIT\LUAENGINE\RELEASE\MAIN.OBJ
3+
H:\PORTABLEAPPS\DOCUMENTS\GIT\LUAENGINE\RELEASE\LUASCRIPT.OBJ
4+
H:\PORTABLEAPPS\DOCUMENTS\GIT\LUAENGINE\RELEASE\VC110.PDB
5+
H:\PORTABLEAPPS\DOCUMENTS\GIT\LUAENGINE\RELEASE\LUAENGINE.EXE
6+
H:\PORTABLEAPPS\DOCUMENTS\GIT\LUAENGINE\RELEASE\LUAENGINE.PDB
7+
H:\PortableApps\Documents\Git\LuaEngine\Release\LuaScript.obj
8+
H:\PortableApps\Documents\Git\LuaEngine\Release\Main.obj
9+
H:\PortableApps\Documents\Git\LuaEngine\Release\ScriptManager.obj
10+
H:\PortableApps\Documents\Git\LuaEngine\Release\cl.command.1.tlog
11+
H:\PortableApps\Documents\Git\LuaEngine\Release\CL.read.1.tlog
12+
H:\PortableApps\Documents\Git\LuaEngine\Release\CL.write.1.tlog
13+
H:\PortableApps\Documents\Git\LuaEngine\Release\link-cvtres.read.1.tlog
14+
H:\PortableApps\Documents\Git\LuaEngine\Release\link-cvtres.write.1.tlog
15+
H:\PortableApps\Documents\Git\LuaEngine\Release\link-rc.read.1.tlog
16+
H:\PortableApps\Documents\Git\LuaEngine\Release\link-rc.write.1.tlog
17+
H:\PortableApps\Documents\Git\LuaEngine\Release\link.command.1.tlog
18+
H:\PortableApps\Documents\Git\LuaEngine\Release\link.read.1.tlog
19+
H:\PortableApps\Documents\Git\LuaEngine\Release\link.write.1.tlog
20+
H:\PortableApps\Documents\Git\LuaEngine\Release\LuaEngine.pdb
21+
H:\PortableApps\Documents\Git\LuaEngine\Release\vc110.pdb
22+
H:\PortableApps\Documents\Git\LuaEngine\Release\LuaEngine.exe

Release/LuaEngine.exe

2 KB
Binary file not shown.

Release/LuaEngine.exe.intermediate.manifest

Lines changed: 0 additions & 10 deletions
This file was deleted.

Release/LuaEngine.lastbuildstate

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
#v4.0:v100:false
2-
Release|Win32|J:\PortableApps\Documents\Git\LuaEngine\|
1+
#v4.0:v110:false
2+
Release|Win32|H:\PortableApps\Documents\Git\LuaEngine\|

0 commit comments

Comments
 (0)