aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDavid Walter Seikel2014-04-08 01:51:30 +1000
committerDavid Walter Seikel2014-04-08 01:51:30 +1000
commitb511313b3822dba3dc96588135228e02eb2c23ea (patch)
treef29d28508e48e3fcb593b77eb561b186b4a9251e
parentNotes about why a combined skang library / app probably wont work, and what w... (diff)
downloadSledjHamr-b511313b3822dba3dc96588135228e02eb2c23ea.zip
SledjHamr-b511313b3822dba3dc96588135228e02eb2c23ea.tar.gz
SledjHamr-b511313b3822dba3dc96588135228e02eb2c23ea.tar.bz2
SledjHamr-b511313b3822dba3dc96588135228e02eb2c23ea.tar.xz
Actually build GuiLua.
-rw-r--r--.gitignore1
-rwxr-xr-xClientHamr/GuiLua/build.sh3
2 files changed, 3 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 45bc49a..b5c0470 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
1/LuaSL/XMRE.txt 1/LuaSL/XMRE.txt
2/ClientHamr/extantz/extantz 2/ClientHamr/extantz/extantz
3/ClientHamr/GuiLua/GuiLua
3/libraries/irrlicht-1.8.1/bin/Linux/01.HelloWorld 4/libraries/irrlicht-1.8.1/bin/Linux/01.HelloWorld
4/libraries/irrlicht-1.8.1/lib/Linux/libIrrlicht.a 5/libraries/irrlicht-1.8.1/lib/Linux/libIrrlicht.a
5/libraries/irrlicht-1.8.1/source/Irrlicht/C3DSMeshFileLoader.d 6/libraries/irrlicht-1.8.1/source/Irrlicht/C3DSMeshFileLoader.d
diff --git a/ClientHamr/GuiLua/build.sh b/ClientHamr/GuiLua/build.sh
index 387b193..5c111e4 100755
--- a/ClientHamr/GuiLua/build.sh
+++ b/ClientHamr/GuiLua/build.sh
@@ -35,7 +35,7 @@ CFLAGS="$CFLAGS -DPACKAGE_DATA_DIR=\"$LOCALDIR\" $CFLAGOPTS"
35#LDFLAGS="-L ../../libraries/LuaJIT-2.0.2/src -L lib -L /usr/lib -L /lib -L $E17DIR/lib" 35#LDFLAGS="-L ../../libraries/LuaJIT-2.0.2/src -L lib -L /usr/lib -L /lib -L $E17DIR/lib"
36#libs="-leo -lecore -levas -ledje -lembryo -leet -leina -lluajit -lpthread -lm" 36#libs="-leo -lecore -levas -ledje -lembryo -leet -leina -lluajit -lpthread -lm"
37LDFLAGS="$(pkg-config --libs-only-L luajit) -L lib -L /usr/lib -L /lib -L $E17DIR/lib" 37LDFLAGS="$(pkg-config --libs-only-L luajit) -L lib -L /usr/lib -L /lib -L $E17DIR/lib"
38libs="-leo -lecore -levas -ledje -lembryo -leet -leina $(pkg-config --libs-only-L luajit) -lpthread -lm" 38libs="-leo -lecore -levas -ledje -lembryo -leet -leina $(pkg-config --libs luajit) -lpthread -lm -ldl"
39#LDFLAGS="-L /usr/lib/lua/5.1 -L lib -L /usr/lib -L /lib -L $E17DIR/lib" 39#LDFLAGS="-L /usr/lib/lua/5.1 -L lib -L /usr/lib -L /lib -L $E17DIR/lib"
40#libs="-lecore -levas -ledje -lembryo -leet -leina -llua5.1 -lpthread -lm" 40#libs="-lecore -levas -ledje -lembryo -leet -leina -llua5.1 -lpthread -lm"
41# These need to be added to libs if linking staticaly, though some parts of EFL don't like that. 41# These need to be added to libs if linking staticaly, though some parts of EFL don't like that.
@@ -52,3 +52,4 @@ echo "clean"
52rm -f test_c.so test_c.o 52rm -f test_c.so test_c.o
53echo "C modules" 53echo "C modules"
54gcc $CFLAGS -fPIC -shared -o test_c.so test_c.c 54gcc $CFLAGS -fPIC -shared -o test_c.so test_c.c
55gcc $CFLAGS -o GuiLua GuiLua.c $LDFLAGS $libs