[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[adonthell-wastesedge-commits] Release_0-3-1 8825dbb 011/237: configure
From: |
Kai Sterker |
Subject: |
[adonthell-wastesedge-commits] Release_0-3-1 8825dbb 011/237: configure now checks installation directory from adonthell binary. |
Date: |
Mon, 25 Jul 2016 18:14:53 +0000 (UTC) |
tag: Release_0-3-1
commit 8825dbb0ec078b33d3497bc790703433c95d53b4
Author: Alexandre Courbot <address@hidden>
Commit: Alexandre Courbot <address@hidden>
configure now checks installation directory from adonthell binary.
Added a few furnitures on the map! ;)
---
Makefile.am | 7 ++++++-
configure.in | 17 +++++++++++++++--
gamename.txt | 1 +
gfx/mapobjects/furnitures/Makefile.am | 4 ++--
gfx/mapobjects/furnitures/oven.mobj | Bin 0 -> 1732 bytes
maps/test.map | Bin 699 -> 754 bytes
6 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 50f1535..80db1ac 100755
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,10 +2,15 @@ SUBDIRS = audio gfx maps scripts
pkgdatadir = $(gamedatadir)
-pkgdata_DATA = character.data mapengine.data quest.data save.data
+pkgdata_DATA = gamename.txt character.data mapengine.data quest.data save.data
EXTRA_DIST = $(pkgdata_DATA)
+bin_SCRIPTS = adonthell-wastesedge
+
+
+adonthell-wastesedge:
+ echo -e "#!/bin/sh\n\n$(adonthell_binary) wastesedge" >
adonthell-wastesedge
## Be sure the data directory gets deleted
uninstall-local:
diff --git a/configure.in b/configure.in
index ced6a88..9bf0ade 100755
--- a/configure.in
+++ b/configure.in
@@ -6,10 +6,23 @@ AC_INIT(README)
AM_INIT_AUTOMAKE(wastesedge, 0.3pre1)
-dnl Should get the datadir from adonthell itself later
-gamedatadir=\${datadir}/adonthell
+dnl Checking for Adonthell
+AC_PATH_PROG(adonthell_binary, adonthell)
+if test x$adonthell_binary == x ; then
+ echo "Waste's Edge requires the Adonthell game engine. Exiting..."
+ exit 1
+fi
+
+dnl Checking for the Adonthell data directory
+AC_MSG_CHECKING(for Adonthell data directory)
+adonthelldatadir=`$adonthell_binary -d`
+AC_MSG_RESULT($adonthelldatadir)
+
+dnl Sets where the game will install itself
+gamedatadir=${adonthelldatadir}/games/wastesedge
AC_SUBST(gamedatadir)
+AC_SUBST(adonthell_binary)
AC_OUTPUT([
Makefile
diff --git a/gamename.txt b/gamename.txt
new file mode 100755
index 0000000..de0516a
--- /dev/null
+++ b/gamename.txt
@@ -0,0 +1 @@
+wastesedge
diff --git a/gfx/mapobjects/furnitures/Makefile.am
b/gfx/mapobjects/furnitures/Makefile.am
index 98153d9..e852dc4 100755
--- a/gfx/mapobjects/furnitures/Makefile.am
+++ b/gfx/mapobjects/furnitures/Makefile.am
@@ -1,5 +1,5 @@
-pkgdatadir = $(gamedatadir)/gfx/mapobjects/furniture
+pkgdatadir = $(gamedatadir)/gfx/mapobjects/furnitures
-pkgdata_DATA = clock.mobj
+pkgdata_DATA = clock.mobj oven.mobj
EXTRA_DIST = $(pkgdata_DATA)
diff --git a/gfx/mapobjects/furnitures/oven.mobj
b/gfx/mapobjects/furnitures/oven.mobj
new file mode 100755
index 0000000..56e28cc
Binary files /dev/null and b/gfx/mapobjects/furnitures/oven.mobj differ
diff --git a/maps/test.map b/maps/test.map
index 089e284..a45e8fb 100755
Binary files a/maps/test.map and b/maps/test.map differ
- [adonthell-wastesedge-commits] Release_0-3-1 7ae2828 002/237: grabbed latest tar, (continued)
- [adonthell-wastesedge-commits] Release_0-3-1 7ae2828 002/237: grabbed latest tar, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 2947fe0 010/237: Now makes sure that the destination directory is deleted when doing, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 5bd1d2a 009/237: Slight correction., Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 7dfaacc 006/237: Added audio files., Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 4b05883 005/237: New data tree imported, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 de62d4e 013/237: Removed adonthell.py from compilation targets. (Alex), Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 fab3f01 015/237: Fixed a graphical bug on the map, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 509a69d 018/237: Fixed audio behavior., Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 3621f37 020/237: Fixed a few things with main_menu, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 dc98f7b 022/237: Oups! Forgot the cellar walls., Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 8825dbb 011/237: configure now checks installation directory from adonthell binary.,
Kai Sterker <=
- [adonthell-wastesedge-commits] Release_0-3-1 dd672f0 023/237: Forgot this one! ; ), Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 9f82186 026/237: main_menu return value no more overridden! (sorry) (Alex), Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 944b13c 025/237: Oops! Put the bad character.data and quest.data!, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 f6f7dec 016/237: Added the guards house (Alex), Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 908f59b 029/237: Added orloth's schedule, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 2486015 027/237: Some stairs added, better map initialisation scheme., Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 0fbac81 017/237: Fixed last (?) severe bugs!, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 065306d 021/237: Added some rooms to the map (Alex), Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 9112207 034/237: Fixed Lucia's dialogue, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 0e77bb6 032/237: ADDED dialogues of Oliver and Bjarn, Kai Sterker, 2016/07/25