mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-07-01 17:32:51 +00:00
Code Issues Releases Wiki Activity

added -DMUSICDESTDIR

Browse Source
This commit is contained in:
Zeno Rogue 2017-03-31 22:10:05 +02:00
parent b7450edef5
commit 0d7d2cf825
5 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -6,7 +6,7 @@ dist_doc_DATA = README.md
hyperrogue_SOURCES = hyper.cpp savepng.c hyperrogue_SOURCES = hyper.cpp savepng.c
# Some definitions used in graph.cpp # 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
musicdir=$(datadir)/hyperrogue/music musicdir=$(datadir)/hyperrogue/music

2
configure.ac
View File

@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script. # Process this file with autoconf to produce a configure script.
AC_PREREQ([2.68]) AC_PREREQ([2.68])
AC_INIT([hyperrogue], [8.3j]) AC_INIT([hyperrogue], [9.4d])
AM_INIT_AUTOMAKE([-Wall -Werror foreign]) AM_INIT_AUTOMAKE([-Wall -Werror foreign])
${CXXFLAGS=""} ${CXXFLAGS=""}
AC_CONFIG_SRCDIR([hyperpoint.cpp]) AC_CONFIG_SRCDIR([hyperpoint.cpp])

6
hyperroid/copy.sh
View File

@ -2,6 +2,6 @@
mkdir app/src/main/assets/sounds mkdir app/src/main/assets/sounds
cp ../sounds/* app/src/main/assets/sounds/ cp ../sounds/* app/src/main/assets/sounds/
mkdir app/src/main/res/raw/ mkdir app/src/main/res/raw/
for x in caves crossroads desert graveyard hell icyland jungle laboratory mirror rlyeh #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 #do cp ../music/hr3-$x.ogg app/src/main/res/raw/$x.ogg
done #done

2
setversion-sh
View File

@ -2,7 +2,7 @@
# set the version numbers in hyper.rc automatically # set the version numbers in hyper.rc automatically
export VER=`grep "#define VER " hyper.cpp | sed "s/#define VER \"//" | sed "s/\"//"` 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/"` #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 #VERNUM=8.1.7.0
#echo $VERNUM #echo $VERNUM
sed "s/\"ProductVersion\", \"\(.*\)\"/\"ProductVersion\", \"$VER\"/" -i hyper.rc sed "s/\"ProductVersion\", \"\(.*\)\"/\"ProductVersion\", \"$VER\"/" -i hyper.rc

4
sound.cpp
View File

@ -184,7 +184,11 @@ void initAudio() {
map<string, Mix_Chunk*> chunks; map<string, Mix_Chunk*> chunks;
#ifdef SOUNDDESTDIR
string wheresounds = SOUNDDESTDIR;
#else
string wheresounds = "sounds/"; string wheresounds = "sounds/";
#endif
void playSound(cell *c, const string& fname, int vol) { void playSound(cell *c, const string& fname, int vol) {
if(effvolume == 0) return; if(effvolume == 0) return;