diff options
author | David Walter Seikel | 2014-05-23 13:22:36 +1000 |
---|---|---|
committer | David Walter Seikel | 2014-05-23 13:22:36 +1000 |
commit | f97c73bd1e43a0eb32ad8dc43fc28f6e40b28f38 (patch) | |
tree | df45770acc4a26d56e45bc7ae3420cddb6522d15 /src/extantz | |
parent | TODO-- (diff) | |
download | SledjHamr-f97c73bd1e43a0eb32ad8dc43fc28f6e40b28f38.zip SledjHamr-f97c73bd1e43a0eb32ad8dc43fc28f6e40b28f38.tar.gz SledjHamr-f97c73bd1e43a0eb32ad8dc43fc28f6e40b28f38.tar.bz2 SledjHamr-f97c73bd1e43a0eb32ad8dc43fc28f6e40b28f38.tar.xz |
Rewrite the LuaSL script running stuff (twice lol), plus much related tweakage and cleanups.
Diffstat (limited to 'src/extantz')
-rwxr-xr-x | src/extantz/build.lua | 2 | ||||
-rw-r--r-- | src/extantz/extantz.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/extantz/build.lua b/src/extantz/build.lua index 1591e8a..99362d1 100755 --- a/src/extantz/build.lua +++ b/src/extantz/build.lua | |||
@@ -15,7 +15,7 @@ end | |||
15 | 15 | ||
16 | CFLAGS = CFLAGS .. ' -I../../libraries/irrlicht-1.8.1/include -I/usr/X11R6/include -I../GuiLua' | 16 | CFLAGS = CFLAGS .. ' -I../../libraries/irrlicht-1.8.1/include -I/usr/X11R6/include -I../GuiLua' |
17 | LDFLAGS = LDFLAGS .. ' -L../../libraries/irrlicht-1.8.1/lib/Linux' | 17 | LDFLAGS = LDFLAGS .. ' -L../../libraries/irrlicht-1.8.1/lib/Linux' |
18 | libs = libs .. ' -lIrrlicht -lGL -lbz2 -lGuiLua -lwinFang -lRunnr' | 18 | libs = libs .. ' -lIrrlicht -lephysics -lGL -lbz2 -lGuiLua -lwinFang -lRunnr' |
19 | 19 | ||
20 | removeFiles(dir, {'crappisspuke.o', 'CDemo.o', 'extantzCamera.o', 'gears.o', 'ephysics_demo.o', 'Evas_3D_demo.o', '../../media/extantz.edj'}) | 20 | removeFiles(dir, {'crappisspuke.o', 'CDemo.o', 'extantzCamera.o', 'gears.o', 'ephysics_demo.o', 'Evas_3D_demo.o', '../../media/extantz.edj'}) |
21 | removeFiles(dir, {'../../extantz', 'camera.o', 'files.o', 'scenri.o', 'woMan.o'}) | 21 | removeFiles(dir, {'../../extantz', 'camera.o', 'files.o', 'scenri.o', 'woMan.o'}) |
diff --git a/src/extantz/extantz.c b/src/extantz/extantz.c index a27118b..2ccb97c 100644 --- a/src/extantz/extantz.c +++ b/src/extantz/extantz.c | |||
@@ -669,7 +669,7 @@ EAPI_MAIN int elm_main(int argc, char **argv) | |||
669 | ourGlobals.LSLGuiMess = GuiLuaLoad("LSLGuiMess", ourGlobals.mainWindow, ourGlobals.world); | 669 | ourGlobals.LSLGuiMess = GuiLuaLoad("LSLGuiMess", ourGlobals.mainWindow, ourGlobals.world); |
670 | ourGlobals.files = filesAdd(&ourGlobals, (char *) prefix_data_get(), EINA_TRUE, EINA_FALSE); | 670 | ourGlobals.files = filesAdd(&ourGlobals, (char *) prefix_data_get(), EINA_TRUE, EINA_FALSE); |
671 | 671 | ||
672 | // Try to connect to the love server we started before. | 672 | // Try to connect to a local love server. |
673 | serverStream = eina_strbuf_new(); | 673 | serverStream = eina_strbuf_new(); |
674 | reachOut("127.0.0.1", 8211 + 1, &ourGlobals, (Ecore_Event_Handler_Cb) _add, (Ecore_Event_Handler_Cb) _data, (Ecore_Event_Handler_Cb) _del); | 674 | reachOut("127.0.0.1", 8211 + 1, &ourGlobals, (Ecore_Event_Handler_Cb) _add, (Ecore_Event_Handler_Cb) _data, (Ecore_Event_Handler_Cb) _del); |
675 | 675 | ||