mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-02-02 12:19:18 +00:00
Code Issues Releases Wiki Activity

Merge pull request #16 from Quuxplusone/makefile-for-mac

Browse Source 
Update "Makefile.mac" to work for OS X with Homebrew.
This commit is contained in:
Zeno Rogue 2017-10-17 21:54:03 +02:00 committed by GitHub
commit d3fd02f896
3 changed files with 33 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
Makefile.mac
View File

@ -1,7 +1,32 @@
# note: this Makefile for Mac is based on this post. I have no resources to test it myself.
# http://groups.google.com/group/rec.games.roguelike.development/browse_thread/thread/9c02e09c0195dc16/3cbde3dc4a0b7e4e
# This Makefile works for Mac OS X (Yosemite).
#
# You will also probably need to configure it yourself a bit to make it work.
# Run "brew install sdl" to install SDL in /usr/local.
# Run "brew install sdl_gfx".
# Run "brew install sdl_mixer".
# Run "brew install sdl_ttf".
# Run "make -f Makefile.mac" to build HyperRogue as ./hyper.
hyper: hyper.cpp graph.cpp hyperpoint.cpp geometry.cpp cell.cpp heptagon.cpp game.cpp polygons.cpp classes.cpp
g++ -m32 -I/sw/include hyper.cpp -L/sw/lib -lSDL -lSDLMain -lSDL_ttf -lSDL_gfx -framework AppKit -DMAC -O3
CXXFLAGS += -std=c++11 -DMAC
CXXFLAGS += -W -Wall -Wextra -pedantic
CXXFLAGS += -Wno-format-pedantic -Wno-unused-parameter -Wno-char-subscripts -Wno-missing-field-initializers -Wno-vla-extension
CXXFLAGS += ${EXTRA_CXXFLAGS}
CXXFLAGS += -I/usr/local/include
LDFLAGS += -L/usr/local/lib
hyper: hyper.o
$(CXX) $(CXXFLAGS) hyper.o $(LDFLAGS) -lSDL -lSDLMain -lSDL_gfx -lSDL_mixer -lSDL_ttf -framework AppKit -framework OpenGL -o hyper
hyper.o: *.cpp language-data.cpp
$(CXX) $(CXXFLAGS) -O2 -c hyper.cpp
langen: langen.cpp
$(CXX) $(CXXFLAGS) -O0 -Wno-embedded-directive langen.cpp -o langen
# Generation of language-data.cpp
language-data.cpp: langen
./langen > language-data.cpp
.PHONY: clean
clean:
rm -f langen language-data.cpp hyper.o hyper

2
graph.cpp
View File

@ -3557,7 +3557,7 @@ void drawcell(cell *c, transmatrix V, int spinv, bool mirrored) {
else if((c->land == laCaribbean || c->land == laOcean || c->land == laOceanWall || c->land == laWhirlpool))
qfloor(c, Vf, shCloudFloor[ct6], darkena(fcol, fd, 0xFF));
else if((c->land == laKraken))
else if(c->land == laKraken)
qfloor(c, Vf, shFullFloor[ct6], darkena(fcol, fd, 0xFF));
else if(c->land == laLivefjord)

4
langen.cpp
View File

@ -362,7 +362,7 @@ int main() {
printf("hashcode hashval = 0x%x;\n\n", hashval);
printf("sentence all_sentences[] = {\n", size(allsent));
printf("sentence all_sentences[] = {\n");
for(map<hashcode,string>::iterator it = ms.begin(); it != ms.end(); it++) {
string s = it->second;
@ -374,7 +374,7 @@ int main() {
}
printf(" };\n\n");
printf("fullnoun all_nouns[] = {\n", size(allnouns));
printf("fullnoun all_nouns[] = {\n");
for(map<hashcode,string>::iterator it = mn.begin(); it != mn.end(); it++) {
string s = it->second;