1
0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-11-14 01:14:48 +00:00
Commit Graph

16 Commits

Author SHA1 Message Date
Zeno Rogue
5ec85100e9
Merge branch 'master' into mymake 2020-05-15 12:14:04 +02:00
Zeno Rogue
5f85adc556 mymake:: allow -f* options 2020-05-15 11:47:27 +02:00
Arthur O'Dwyer
a49c40cee7 Make "mymake" work on OSX, and add it to Travis.
Fix a -Wformat bug exposed by compiling with Clang.

To preprocess C++11 code, you need `g++ -E -std=c++11`, not just
`g++ -E`. (The old code worked for GCC 6+ and Clang 6+ because they
changed the default mode from C++03 to C++14. But for GCC 5, we still
need `-std=c++11`. And regardless, it's a good idea.)

Add a "-mac" option to mymake, and cleanly factor out `set_mac`,
`set_linux`, and `set_win`. When you build mymake using
`make -f Makefile.simple mymake`, you get a mymake that knows what
platform it's on. This means you don't have to pass `mymake -mac`
on OSX, nor `mymake -win` on Windows.

The old code put `INCLUDE(___hyper-main.cpp)` into a C++ file that
would be preprocessed, which doesn't work because libSDL does
essentially `-Dmain=SDL_main`, which turns this into
`INCLUDE(___hyper-SDL_main.cpp)`, which gives us
a "file not found" error from mymake. The solution is to put
filenames into quotation marks, so that the string "main" never
appears as a token in the C++ file. (Alternatively, we could have
renamed "hyper-main.cpp" to "hypermain.cpp".)

Add several new "mymake" entries in the Travis build matrix,
and add the "mymake" builds' badge to the README.
2020-04-12 09:56:46 -04:00
Zeno Rogue
74b777b937 mymake now has commandline option -rv to add all RogueViz files 2020-03-29 17:36:20 +02:00
Zeno Rogue
b5a70c1bc6
Merge pull request #92 from Quuxplusone/pedantic
Add `-pedantic` to the Makefile, and fix all resulting warnings
2020-03-27 12:04:40 +01:00
Zeno Rogue
eb747e761f in mymake updated the filename to savepng.o 2020-03-25 13:43:07 +01:00
Arthur O'Dwyer
41669ab720 Eliminate -Wmissing-field-initializers warnings. 2020-03-23 14:38:57 -04:00
Zeno Rogue
bd5fe67e17 mymake: -I is a compiler flag not a linger flag; added -DMYMAKE 2020-03-16 21:06:11 +01:00
Zeno Rogue
f20a6bf2f6 zlib used for (de)compression 2020-01-26 00:30:13 +01:00
Zeno Rogue
411dffb601 fixed mymake with -DCAP_DAILY=1 2019-11-30 18:06:48 +01:00
Zeno Rogue
0e1b9c6720 option -win in mymain to compile for Windows (local use, does not work) 2019-10-05 12:38:35 +02:00
Zeno Rogue
0c72130ed8 mymake accepts modules with *.cpp extension 2019-09-28 18:18:00 +02:00
Zeno Rogue
1215c65e40 mymake: support -l and -I 2019-09-26 13:23:44 +02:00
Zeno Rogue
30988be557 mymake:: select existing Makefile, fixed incorrect 'file not found' error, added/removed some comments 2019-09-12 22:50:16 +02:00
Zeno Rogue
1621b0b556 standard can be changed in mymake 2019-09-12 22:50:16 +02:00
Zeno Rogue
ebc44af74c mymake, comments moved 2019-09-12 22:50:16 +02:00