From 0d7d2cf825a856bb91f19a6a7c0910b82a919d61 Mon Sep 17 00:00:00 2001
From: Zeno Rogue <zeno@attnam.com>
Date: Fri, 31 Mar 2017 22:10:05 +0200
Subject: [PATCH] added -DMUSICDESTDIR

---
 Makefile.am       | 2 +-
 configure.ac      | 2 +-
 hyperroid/copy.sh | 6 +++---
 setversion-sh     | 2 +-
 sound.cpp         | 4 ++++
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index f93acbe8..6da553f0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,7 @@ dist_doc_DATA = README.md
 hyperrogue_SOURCES = hyper.cpp savepng.c
 
 # Some definitions used in graph.cpp
-hyperrogue_CPPFLAGS = -DFONTDESTDIR=\"$(pkgdatadir)/DejaVuSans-Bold.ttf\" -DMUSICDESTDIR=\"$(pkgdatadir)/hyperrogue-music.txt\" -O2
+hyperrogue_CPPFLAGS = -DFONTDESTDIR=\"$(pkgdatadir)/DejaVuSans-Bold.ttf\" -DMUSICDESTDIR=\"$(pkgdatadir)/hyperrogue-music.txt\" -DSOUNDDESTDIR=\"$(pkgdatadir)/sound/\" -O2
 
 # Musicdir
 musicdir=$(datadir)/hyperrogue/music
diff --git a/configure.ac b/configure.ac
index 6dd50fca..961faf02 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.68])
-AC_INIT([hyperrogue], [8.3j])
+AC_INIT([hyperrogue], [9.4d])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign])
 ${CXXFLAGS=""}
 AC_CONFIG_SRCDIR([hyperpoint.cpp])
diff --git a/hyperroid/copy.sh b/hyperroid/copy.sh
index fa3d32b7..76fa09ba 100755
--- a/hyperroid/copy.sh
+++ b/hyperroid/copy.sh
@@ -2,6 +2,6 @@
 mkdir app/src/main/assets/sounds
 cp ../sounds/* app/src/main/assets/sounds/
 mkdir app/src/main/res/raw/
-for x in caves crossroads desert graveyard hell icyland jungle laboratory mirror rlyeh
-do cp ../music/hr3-$x.ogg app/src/main/res/raw/$x.ogg
-done
+#for x in caves crossroads desert graveyard hell icyland jungle laboratory mirror rlyeh
+#do cp ../music/hr3-$x.ogg app/src/main/res/raw/$x.ogg
+#done
diff --git a/setversion-sh b/setversion-sh
index ee6bde24..9483de7a 100755
--- a/setversion-sh
+++ b/setversion-sh
@@ -2,7 +2,7 @@
 # set the version numbers in hyper.rc automatically
 export VER=`grep "#define VER " hyper.cpp | sed "s/#define VER \"//" | sed "s/\"//"`
 #export VERNUM=`grep "#define VERNUM " hyper.cpp | sed "s/#define VERNUM //" | sed "s/^\(.\)\(.\)\(.\)\(.\)$/\1.\2.\4.\3/"`
-VERNUM=9,4,0,3
+VERNUM=9,4,0,4
 #VERNUM=8.1.7.0
 #echo $VERNUM
 sed "s/\"ProductVersion\", \"\(.*\)\"/\"ProductVersion\", \"$VER\"/" -i hyper.rc
diff --git a/sound.cpp b/sound.cpp
index 01e6a0c6..5364cdb7 100644
--- a/sound.cpp
+++ b/sound.cpp
@@ -184,7 +184,11 @@ void initAudio() {
 
 map<string, Mix_Chunk*> chunks;
 
+#ifdef SOUNDDESTDIR
+string wheresounds = SOUNDDESTDIR;
+#else
 string wheresounds = "sounds/";
+#endif
 
 void playSound(cell *c, const string& fname, int vol) {
   if(effvolume == 0) return;