Clean up all the build and test scripts to be similar, and not have the EFL directory hard coded.

4 files changed, 25 insertions, 8 deletions

diff --git a/ClientHamr/GuiLua/build.sh b/ClientHamr/GuiLua/build.sh
index 076c106..c405bb2 100755
--- a/ClientHamr/GuiLua/build.sh
+++ b/ClientHamr/GuiLua/build.sh
@@ -4,7 +4,6 @@ export LOCALDIR=`pwd`
 
 # No need for a make file, or dependencies, the entire thing takes only a few seconds to build.
 
-
 CFLAGS="-g -Wall -I include -I $LOCALDIR"
 CFLAGS="$CFLAGS -I ../../libraries"
 CFLAGS="$CFLAGS $(pkg-config --cflags luajit)"
diff --git a/ClientHamr/GuiLua/test.sh b/ClientHamr/GuiLua/test.sh
index 4f72c52..c1b0afb 100755
--- a/ClientHamr/GuiLua/test.sh
+++ b/ClientHamr/GuiLua/test.sh
@@ -1,3 +1,3 @@
-#!/bin/bash
+#! /bin/bash
 
 export LD_LIBRARY_PATH="."; ./skang -l test -foo "argy bargy"
diff --git a/ClientHamr/extantz/build.sh b/ClientHamr/extantz/build.sh
index 17344b1..d3ad3b0 100755
--- a/ClientHamr/extantz/build.sh
+++ b/ClientHamr/extantz/build.sh
@@ -1,4 +1,20 @@
-export PKG_CONFIG_PATH="/opt/e17/lib/pkgconfig"
+#! /bin/bash
+
+export LOCALDIR=`pwd`
+
+# No need for a make file, or dependencies, the entire thing takes only a few seconds to build.
+
+CFLAGS="-g -Wall -I include -I $LOCALDIR"
+CFLAGS="$CFLAGS -I ../../libraries -I../../libraries/irrlicht-1.8.1/include -I/usr/X11R6/include"
+CFLAGS="$CFLAGS $(pkg-config --cflags luajit)"
+CFLAGS="$CFLAGS $(pkg-config --cflags elementary)"
+CFLAGS="$CFLAGS $(pkg-config --cflags ephysics)"
+CFLAGS="$CFLAGS -DPACKAGE_BIN_DIR=\"$LOCALDIR\""
+CFLAGS="$CFLAGS -DPACKAGE_LIB_DIR=\"$LOCALDIR\""
+CFLAGS="$CFLAGS -DPACKAGE_DATA_DIR=\"$LOCALDIR\" $CFLAGOPTS"
+
+LDFLAGS="-L $LOCALDIR $(pkg-config --libs-only-L luajit) -L lib -L /usr/lib -L /lib -L../../libraries/irrlicht-1.8.1/lib/Linux "
+libs="$(pkg-config --cflags --libs elementary) $(pkg-config --libs luajit) -lpthread -lm -ldl -lIrrlicht -lGL -lbz2"
 
 echo "clean"
 rm -f extantz crappisspuke.o CDemo.o extantzCamera.o extantz.edj
@@ -6,8 +22,8 @@ echo "edje"
 edje_cc -id images extantz.edc extantz.edj
 echo "Irrlicht"
 #g++ -O3 -ffast-math crappisspuke.cpp -o crappisspuke -I../../libraries/irrlicht-1.8/include -I/usr/X11R6/include -L../../libraries/irrlicht-1.8/lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor && ./crappisspuke
-g++ -O3 -ffast-math -c crappisspuke.cpp -o crappisspuke.o -I../../libraries/irrlicht-1.8.1/include -I/usr/X11R6/include  $(pkg-config --cflags elementary)
-g++ -O3 -ffast-math -c CDemo.cpp -o CDemo.o -I../../libraries/irrlicht-1.8.1/include -I/usr/X11R6/include  $(pkg-config --cflags elementary)
+g++ $CFLAGS -O3 -ffast-math -c crappisspuke.cpp -o crappisspuke.o $LDFLAGS
+g++ $CFLAGS -O3 -ffast-math -c CDemo.cpp -o CDemo.o $LDFLAGS
 echo "extantz"
-g++ -O3 -ffast-math -c extantzCamera.cpp -o extantzCamera.o -I../../libraries/irrlicht-1.8.1/include -I/usr/X11R6/include  $(pkg-config --cflags elementary)
-gcc -g -DPACKAGE_BIN_DIR="\"$(pwd)\"" -DPACKAGE_DATA_DIR="\"$(pwd)\"" extantz.c crappisspuke.o CDemo.o extantzCamera.o -o extantz $(pkg-config --cflags --libs eo) $(pkg-config --cflags --libs ecore-x) $(pkg-config --cflags --libs elementary) $(pkg-config --cflags --libs ephysics)  -L../../libraries/irrlicht-1.8.1/lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg -lbz2 && strip extantz
+g++ $CFLAGS -O3 -ffast-math -c extantzCamera.cpp -o extantzCamera.o $LDFLAGS
+gcc $CFLAGS extantz.c crappisspuke.o CDemo.o extantzCamera.o -o extantz $LDFLAGS $libs && strip extantz
diff --git a/ClientHamr/extantz/test.sh b/ClientHamr/extantz/test.sh
index 01c2abe..f2a17fa 100755
--- a/ClientHamr/extantz/test.sh
+++ b/ClientHamr/extantz/test.sh
@@ -1 +1,3 @@
-./build.sh && ./extantz
+#! /bin/bash
+
+./extantz