diff options
author | David Walter Seikel | 2013-01-13 19:59:13 +1000 |
---|---|---|
committer | David Walter Seikel | 2013-01-13 19:59:13 +1000 |
commit | e49a9d4d24fb151d0f0499a22ffc1d51662f0181 (patch) | |
tree | b0718a4f3a81333f4a7f6d83cb34511558004ce6 | |
parent | Fixed some of the bit rot in LuaSL, it compiles now, but not working still. (diff) | |
download | SledjHamr-e49a9d4d24fb151d0f0499a22ffc1d51662f0181.zip SledjHamr-e49a9d4d24fb151d0f0499a22ffc1d51662f0181.tar.gz SledjHamr-e49a9d4d24fb151d0f0499a22ffc1d51662f0181.tar.bz2 SledjHamr-e49a9d4d24fb151d0f0499a22ffc1d51662f0181.tar.xz |
Add extantz into the build and test framework.
-rwxr-xr-x | ClientHamr/extantz/build.sh (renamed from ClientHamr/extantz/make.sh) | 4 | ||||
-rwxr-xr-x | ClientHamr/extantz/test.sh | 1 | ||||
-rwxr-xr-x | build.sh | 4 | ||||
-rwxr-xr-x | test.sh | 7 |
4 files changed, 14 insertions, 2 deletions
diff --git a/ClientHamr/extantz/make.sh b/ClientHamr/extantz/build.sh index 45694e6..9649947 100755 --- a/ClientHamr/extantz/make.sh +++ b/ClientHamr/extantz/build.sh | |||
@@ -1,6 +1,6 @@ | |||
1 | export PKG_CONFIG_PATH="/opt/e17/lib/pkgconfig" | 1 | export PKG_CONFIG_PATH="/opt/e17/lib/pkgconfig" |
2 | 2 | ||
3 | echo "rm" | 3 | echo "clean" |
4 | rm -f extantz crappisspuke.o extantz.edj | 4 | rm -f extantz crappisspuke.o extantz.edj |
5 | echo "edje" | 5 | echo "edje" |
6 | edje_cc -id images extantz.edc extantz.edj | 6 | edje_cc -id images extantz.edc extantz.edj |
@@ -8,4 +8,4 @@ echo "Irrlicht" | |||
8 | #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 | 8 | #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 |
9 | g++ -O3 -ffast-math -c crappisspuke.cpp -o crappisspuke.o -I../../libraries/irrlicht-1.8/include -I/usr/X11R6/include $(pkg-config --cflags elementary) | 9 | g++ -O3 -ffast-math -c crappisspuke.cpp -o crappisspuke.o -I../../libraries/irrlicht-1.8/include -I/usr/X11R6/include $(pkg-config --cflags elementary) |
10 | echo "extantz" | 10 | echo "extantz" |
11 | gcc -g -DPACKAGE_DATA_DIR="\"$(pwd)\"" extantz.c crappisspuke.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/lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor && strip extantz && ./extantz | 11 | gcc -g -DPACKAGE_DATA_DIR="\"$(pwd)\"" extantz.c crappisspuke.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/lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor && strip extantz |
diff --git a/ClientHamr/extantz/test.sh b/ClientHamr/extantz/test.sh new file mode 100755 index 0000000..01c2abe --- /dev/null +++ b/ClientHamr/extantz/test.sh | |||
@@ -0,0 +1 @@ | |||
./build.sh && ./extantz | |||
@@ -71,4 +71,8 @@ echo "_______________ BUILDING LuaSL _______________" | |||
71 | cd $wd/LuaSL | 71 | cd $wd/LuaSL |
72 | ./build.sh | 72 | ./build.sh |
73 | 73 | ||
74 | echo "_______________ BUILDING extantz _______________" | ||
75 | cd $wd/ClientHamr/extantz | ||
76 | ./build.sh | ||
77 | |||
74 | 78 | ||
@@ -6,6 +6,11 @@ wd=$(pwd) | |||
6 | 6 | ||
7 | ./build.sh || exit | 7 | ./build.sh || exit |
8 | 8 | ||
9 | echo "_______________ TESTING extantz _______________" | ||
10 | cd $wd/ClientHamr/extantz | ||
11 | ./extantz & | ||
12 | sleep 1 | ||
13 | |||
9 | echo "_______________ TESTING LuaSL _______________" | 14 | echo "_______________ TESTING LuaSL _______________" |
10 | # Kill any left overs. | 15 | # Kill any left overs. |
11 | killall -KILL LuaSL | 16 | killall -KILL LuaSL |
@@ -26,8 +31,10 @@ case $@ in | |||
26 | ;; | 31 | ;; |
27 | 32 | ||
28 | *) | 33 | *) |
34 | echo "_______________ STARTING LuaSL _______________" | ||
29 | ../LuaSL & | 35 | ../LuaSL & |
30 | sleep 1 | 36 | sleep 1 |
37 | echo "_______________ STARTING LuaSL_test _______________" | ||
31 | ../LuaSL_test | 38 | ../LuaSL_test |
32 | ;; | 39 | ;; |
33 | 40 | ||