aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rwxr-xr-xsrc/GuiLua/build.lua4
-rwxr-xr-xsrc/LuaSL/build.lua2
-rwxr-xr-xsrc/extantz/build.lua10
-rw-r--r--src/extantz/extantz.c4
-rwxr-xr-xsrc/libraries/build.lua4
-rwxr-xr-xsrc/love/build.lua6
-rw-r--r--src/love/love.c3
7 files changed, 18 insertions, 15 deletions
diff --git a/src/GuiLua/build.lua b/src/GuiLua/build.lua
index c0215b5..f6e6d81 100755
--- a/src/GuiLua/build.lua
+++ b/src/GuiLua/build.lua
@@ -15,9 +15,9 @@ end
15 15
16LDFLAGS = '-L ' .. dir .. ' ' .. LDFLAGS 16LDFLAGS = '-L ' .. dir .. ' ' .. LDFLAGS
17 17
18removeFiles(dir, {'test_c.so', 'GuiLua.o', lib_d .. '/libGuiLua.so', '../../skang'}) 18removeFiles(dir, {'test_c.so', 'GuiLua.o', lib_d .. '/libGuiLua.so', bin_d .. '/skang'})
19 19
20runCommand('C libraries', dir, 'gcc ' .. CFLAGS .. ' -fPIC -c GuiLua.c') 20runCommand('C libraries', dir, 'gcc ' .. CFLAGS .. ' -fPIC -c GuiLua.c')
21runCommand(nil, dir, 'gcc ' .. CFLAGS .. ' -shared -Wl,-soname,libGuiLua.so -o ' .. lib_d .. '/libGuiLua.so GuiLua.o') 21runCommand(nil, dir, 'gcc ' .. CFLAGS .. ' -shared -Wl,-soname,libGuiLua.so -o ' .. lib_d .. '/libGuiLua.so GuiLua.o')
22runCommand('C apps', dir, 'gcc ' .. CFLAGS .. ' -Wl,-export-dynamic -o ../../skang skang.c ' .. LDFLAGS .. ' -lGuiLua ' .. libs) 22runCommand('C apps', dir, 'gcc ' .. CFLAGS .. ' -Wl,-export-dynamic -o ' .. bin_d .. '/skang skang.c ' .. LDFLAGS .. ' -lGuiLua ' .. libs)
23runCommand('C modules', dir, 'gcc ' .. CFLAGS .. ' -fPIC -shared -o test_c.so test_c.c') 23runCommand('C modules', dir, 'gcc ' .. CFLAGS .. ' -fPIC -shared -o test_c.so test_c.c')
diff --git a/src/LuaSL/build.lua b/src/LuaSL/build.lua
index 3a45e9b..418f13b 100755
--- a/src/LuaSL/build.lua
+++ b/src/LuaSL/build.lua
@@ -19,4 +19,4 @@ removeFiles(dir, {'*.output', '*.backup', 'LuaSL_lexer.h', 'LuaSL_lexer.c', 'Lua
19compileFiles('lemon', dir .. '/../others/lemon', {'lemon'}, '') 19compileFiles('lemon', dir .. '/../others/lemon', {'lemon'}, '')
20runCommand('lemon', dir, '../others/lemon/lemon -qs -T../others/lemon/lempar.c LuaSL_lemon_yaccer.y') 20runCommand('lemon', dir, '../others/lemon/lemon -qs -T../others/lemon/lempar.c LuaSL_lemon_yaccer.y')
21runCommand('flex', dir, 'flex -C --outfile=LuaSL_lexer.c --header-file=LuaSL_lexer.h LuaSL_lexer.l') 21runCommand('flex', dir, 'flex -C --outfile=LuaSL_lexer.c --header-file=LuaSL_lexer.h LuaSL_lexer.l')
22compileFiles('../../LuaSL', dir, {'LuaSL_main', 'LuaSL_compile', 'LuaSL_lexer', 'LuaSL_lemon_yaccer'}, '') 22compileFiles(bin_d .. '/LuaSL', dir, {'LuaSL_main', 'LuaSL_compile', 'LuaSL_lexer', 'LuaSL_lemon_yaccer'}, '')
diff --git a/src/extantz/build.lua b/src/extantz/build.lua
index abb449e..d094f74 100755
--- a/src/extantz/build.lua
+++ b/src/extantz/build.lua
@@ -19,13 +19,13 @@ end
19CFLAGS = CFLAGS .. ' -I/usr/X11R6/include -I../GuiLua' 19CFLAGS = CFLAGS .. ' -I/usr/X11R6/include -I../GuiLua'
20libs = libs .. ' -lephysics -lGuiLua' 20libs = libs .. ' -lephysics -lGuiLua'
21 21
22--removeFiles(dir, {'crappisspuke.o', 'CDemo.o', 'extantzCamera.o', '../../media/extantz.edj'}) 22--removeFiles(dir, {'crappisspuke.o', 'CDemo.o', 'extantzCamera.o', data_d .. '/extantz.edj'})
23removeFiles(dir, {'../../media/extantz.edj'}) 23removeFiles(dir, {data_d .. '/extantz.edj'})
24 24
25runCommand('edje_cc', dir, 'edje_cc ' .. EDJE_FLAGS .. ' extantz.edc ../../media/extantz.edj') 25runCommand('edje_cc', dir, 'edje_cc ' .. EDJE_FLAGS .. ' extantz.edc ' .. data_d .. '/extantz.edj')
26--runCommand('Irrlicht files', dir, 'g++ ' .. CFLAGS .. ' -ffast-math -c crappisspuke.cpp -o crappisspuke.o ' .. LDFLAGS) 26--runCommand('Irrlicht files', dir, 'g++ ' .. CFLAGS .. ' -ffast-math -c crappisspuke.cpp -o crappisspuke.o ' .. LDFLAGS)
27--runCommand(nil, dir, 'g++ ' .. CFLAGS .. ' -ffast-math -c CDemo.cpp -o CDemo.o ' .. LDFLAGS) 27--runCommand(nil, dir, 'g++ ' .. CFLAGS .. ' -ffast-math -c CDemo.cpp -o CDemo.o ' .. LDFLAGS)
28--runCommand(nil, dir, 'g++ ' .. CFLAGS .. ' -ffast-math -c extantzCamera.cpp -o extantzCamera.o ' .. LDFLAGS) 28--runCommand(nil, dir, 'g++ ' .. CFLAGS .. ' -ffast-math -c extantzCamera.cpp -o extantzCamera.o ' .. LDFLAGS)
29CFLAGS = CFLAGS .. ' -Wl,-export-dynamic' 29CFLAGS = CFLAGS .. ' -Wl,-export-dynamic'
30--compileFiles('../../extantz', dir, {'gears', 'ephysics_demo', 'camera', 'files', 'scenri', 'woMan', 'extantz'}, 'crappisspuke.o CDemo.o extantzCamera.o') 30--compileFiles(bin_d .. '/extantz', dir, {'gears', 'ephysics_demo', 'camera', 'files', 'scenri', 'woMan', 'extantz'}, 'crappisspuke.o CDemo.o extantzCamera.o')
31compileFiles('../../extantz', dir, {'gears', 'ephysics_demo', 'camera', 'files', 'scenri', 'woMan', 'extantz'}, '') 31compileFiles(bin_d .. '/extantz', dir, {'gears', 'ephysics_demo', 'camera', 'files', 'scenri', 'woMan', 'extantz'}, '')
diff --git a/src/extantz/extantz.c b/src/extantz/extantz.c
index 159fcaf..1708a6c 100644
--- a/src/extantz/extantz.c
+++ b/src/extantz/extantz.c
@@ -538,6 +538,7 @@ int skangStep = 0;
538static Eina_Bool _makeSkang(void *data) 538static Eina_Bool _makeSkang(void *data)
539{ 539{
540 globals *ourGlobals = data; 540 globals *ourGlobals = data;
541 char buf[PATH_MAX];
541 542
542 switch (skangStep++) 543 switch (skangStep++)
543 { 544 {
@@ -567,7 +568,8 @@ static Eina_Bool _makeSkang(void *data)
567#if USE_LOVE 568#if USE_LOVE
568 case 5 : 569 case 5 :
569// PD("About to try connecting to a love server."); 570// PD("About to try connecting to a love server.");
570 reachOut("love", "./love", "127.0.0.1", 8211 + 1, ourGlobals, (Ecore_Event_Handler_Cb) _add, /*(Ecore_Event_Handler_Cb) _data*/ NULL, (Ecore_Event_Handler_Cb) _del, clientParser, NULL); 571 snprintf(buf, sizeof(buf), "%s/love", prefix_bin_get());
572 reachOut("love", buf, "127.0.0.1", 8211 + 1, ourGlobals, (Ecore_Event_Handler_Cb) _add, /*(Ecore_Event_Handler_Cb) _data*/ NULL, (Ecore_Event_Handler_Cb) _del, clientParser, NULL);
571 break; 573 break;
572#endif 574#endif
573 575
diff --git a/src/libraries/build.lua b/src/libraries/build.lua
index d0c0b46..ceb7771 100755
--- a/src/libraries/build.lua
+++ b/src/libraries/build.lua
@@ -21,7 +21,7 @@ CFLAGS = CFLAGS .. ' -DPACKAGE_LOCALE_DIR=\\"' .. locale_d .. '\\"'
21 21
22LDFLAGS = '-L ' .. dir .. ' ' .. LDFLAGS 22LDFLAGS = '-L ' .. dir .. ' ' .. LDFLAGS
23 23
24removeFiles(dir, {'LumbrJack.o', lib_d .. '/libLumbrJack.so', 'Runnr.o', lib_d .. '/libRunnr.so', 'SledjHamr.o', lib_d .. '/libSledjHamr.so', '../../media/winFang.edj', 'winFang.o', lib_d .. '/libwinFang.so'}) 24removeFiles(dir, {'LumbrJack.o', lib_d .. '/libLumbrJack.so', 'Runnr.o', lib_d .. '/libRunnr.so', 'SledjHamr.o', lib_d .. '/libSledjHamr.so', data_d .. '/winFang.edj', 'winFang.o', lib_d .. '/libwinFang.so'})
25 25
26runCommand('C libraries', dir, 'gcc ' .. CFLAGS .. ' -fPIC -c LumbrJack.c') 26runCommand('C libraries', dir, 'gcc ' .. CFLAGS .. ' -fPIC -c LumbrJack.c')
27runCommand(nil, dir, 'gcc ' .. CFLAGS .. ' -shared -Wl,-soname,libLumbrJack.so -o ' .. lib_d .. '/libLumbrJack.so LumbrJack.o') 27runCommand(nil, dir, 'gcc ' .. CFLAGS .. ' -shared -Wl,-soname,libLumbrJack.so -o ' .. lib_d .. '/libLumbrJack.so LumbrJack.o')
@@ -33,6 +33,6 @@ runCommand(nil, dir, 'gcc ' .. CFLAGS .. ' -shared -Wl,-soname,libRunnr.so -o
33runCommand(nil, dir, 'gcc ' .. CFLAGS .. ' -fPIC -c SledjHamr.c') 33runCommand(nil, dir, 'gcc ' .. CFLAGS .. ' -fPIC -c SledjHamr.c')
34runCommand(nil, dir, 'gcc ' .. CFLAGS .. ' -shared -Wl,-soname,libSledjHamr.so -o ' .. lib_d .. '/libSledjHamr.so SledjHamr.o') 34runCommand(nil, dir, 'gcc ' .. CFLAGS .. ' -shared -Wl,-soname,libSledjHamr.so -o ' .. lib_d .. '/libSledjHamr.so SledjHamr.o')
35 35
36runCommand(nil, dir, 'edje_cc ' .. EDJE_FLAGS .. ' winFang.edc ../../media/winFang.edj') 36runCommand(nil, dir, 'edje_cc ' .. EDJE_FLAGS .. ' winFang.edc ' .. data_d .. '/winFang.edj')
37runCommand(nil, dir, 'gcc ' .. CFLAGS .. ' -fPIC -c winFang.c') 37runCommand(nil, dir, 'gcc ' .. CFLAGS .. ' -fPIC -c winFang.c')
38runCommand(nil, dir, 'gcc ' .. CFLAGS .. ' -shared -Wl,-soname,libwinFang.so -o ' .. lib_d .. '/libwinFang.so winFang.o') 38runCommand(nil, dir, 'gcc ' .. CFLAGS .. ' -shared -Wl,-soname,libwinFang.so -o ' .. lib_d .. '/libwinFang.so winFang.o')
diff --git a/src/love/build.lua b/src/love/build.lua
index ff5bf7d..b5200b4 100755
--- a/src/love/build.lua
+++ b/src/love/build.lua
@@ -14,7 +14,7 @@ if 'nil' == type(dir) then
14end 14end
15 15
16 16
17removeFiles(dir, {'../../media/love.edj'}) 17removeFiles(dir, {data_d .. '/love.edj'})
18 18
19runCommand('edje_cc', dir, 'edje_cc ' .. EDJE_FLAGS .. ' love.edc ../../media/love.edj') 19runCommand('edje_cc', dir, 'edje_cc ' .. EDJE_FLAGS .. ' love.edc ' .. data_d .. '/love.edj')
20compileFiles('../../love', dir, {'love'}, '') 20compileFiles(bin_d .. '/love', dir, {'love'}, '')
diff --git a/src/love/love.c b/src/love/love.c
index 698726f..0c1a63d 100644
--- a/src/love/love.c
+++ b/src/love/love.c
@@ -666,7 +666,8 @@ int main(int argc, char **argv)
666 666
667// PD("About to try connecting to a LuaSL server."); 667// PD("About to try connecting to a LuaSL server.");
668 // Try to connect to a local LuaSL server. 668 // Try to connect to a local LuaSL server.
669 reachOut("LuaSL", "./LuaSL", "127.0.0.1", ourGlobals.port, &ourGlobals, (Ecore_Event_Handler_Cb) _addLuaSL, /*(Ecore_Event_Handler_Cb) _dataLuaSL*/ NULL, (Ecore_Event_Handler_Cb) _delLuaSL, LuaSLParser, NULL); 669 snprintf(buf, sizeof(buf), "%s/LuaSL", prefix_bin_get());
670 reachOut("LuaSL", buf, "127.0.0.1", ourGlobals.port, &ourGlobals, (Ecore_Event_Handler_Cb) _addLuaSL, /*(Ecore_Event_Handler_Cb) _dataLuaSL*/ NULL, (Ecore_Event_Handler_Cb) _delLuaSL, LuaSLParser, NULL);
670 671
671// PD("Love is about to try creating a love server."); 672// PD("Love is about to try creating a love server.");
672 if (openArms("love", ourGlobals.address, ourGlobals.port + 1, &ourGlobals, (Ecore_Event_Handler_Cb) _addClient, NULL, (Ecore_Event_Handler_Cb) _delClient, clientParser, NULL)) 673 if (openArms("love", ourGlobals.address, ourGlobals.port + 1, &ourGlobals, (Ecore_Event_Handler_Cb) _addClient, NULL, (Ecore_Event_Handler_Cb) _delClient, clientParser, NULL))
generated by cgit v1.1 at 2024-11-09 17:46:06 +0000