From 2043db3e0bf8df7c95d51560869ffd3fdccf9675 Mon Sep 17 00:00:00 2001
From: Dmitry Marakasov <amdmi3@amdmi3.ru>
Date: Mon, 26 Jun 2017 22:19:57 +0300
Subject: [PATCH 1/2] Fix compilation error

You cannot perform ordered comparison on pointer and integer
---
 sound.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sound.cpp b/sound.cpp
index 5364cdb7..d4b20f4b 100644
--- a/sound.cpp
+++ b/sound.cpp
@@ -122,7 +122,7 @@ bool loadMusicInfo(string dir) {
     for(int i=0; i<size(dir); i++) if(dir[i] == '/' || dir[i] == '\\')
       dir2 = dir.substr(0, i+1);
     char buf[1000];
-    while(fgets(buf, 800, f) > 0) {
+    while(fgets(buf, 800, f) != NULL) {
       for(int i=0; buf[i]; i++) if(buf[i] == 10 || buf[i] == 13) buf[i] = 0;
       if(buf[0] == '[' && buf[3] == ']') {
         int id = (buf[1] - '0') * 10 + buf[2] - '0';

From 8486aff555ea10a2560921426378194e2f1de738 Mon Sep 17 00:00:00 2001
From: Janet Vorobyeva <janet.vorobyeva@gmail.com>
Date: Mon, 24 Jul 2017 15:11:28 -0400
Subject: [PATCH 2/2] Added -std=c++11 flag to Makefile

Project wont build on linux otherwise
---
 Makefile.am | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Makefile.am b/Makefile.am
index ab9d2f91..59b25c03 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,6 +7,7 @@ hyperrogue_SOURCES = hyper.cpp savepng.c
 
 # Some definitions used in graph.cpp
 hyperrogue_CPPFLAGS = -DFONTDESTDIR=\"$(pkgdatadir)/DejaVuSans-Bold.ttf\" -DMUSICDESTDIR=\"$(pkgdatadir)/hyperrogue-music.txt\" -DSOUNDDESTDIR=\"$(pkgdatadir)/sounds/\"
+hyperrogue_CPPFLAGS += -std=c++11
 
 # Musicdir
 musicdir=$(datadir)/hyperrogue/music