1
0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-11-30 15:39:54 +00:00
Commit Graph

21 Commits

Author SHA1 Message Date
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
f03b7bd1b0 version in README 2020-03-27 11:50:57 +01:00
Zeno Rogue
33bacc8731 updated version and documentation link in README 2020-03-22 00:24:52 +01:00
Zeno Rogue
a961499fbe update 11.3 2020-03-07 04:47:11 +01:00
Arthur O'Dwyer
e7ce5e3084 Fix some typos in the README. 2020-02-15 23:01:25 -05:00
Zeno Rogue
7568accff7 where to download 2019-12-10 12:49:29 +01:00
Zeno Rogue
ec5b16691e updated the README.md file 2019-09-12 23:34:44 +02:00
Zeno Rogue
2c8089034a fixed the version number in README 2018-11-20 19:04:24 +01:00
Zeno Rogue
cedd78b3e7 10.4m 2018-07-16 19:54:31 +02:00
Arthur O'Dwyer
ef562d0d43 TravisCI and Makefile integration for the emscripten build!
For testing the emscripten build in TravisCI, it looks like some
arcane combination of node + Browserify + the wasmify plugin + maybe
some other stuff *might* work, but I have no real idea yet.

For grabbing the build artifacts from Travis, you can temporarily
insert lines into the .travis.yml such as

    curl --upload-file ./hyper.html https://transfer.sh/hyper.html
    curl --upload-file ./hyper.js https://transfer.sh/hyper.js
    curl --upload-file ./hyper.wasm https://transfer.sh/hyper.wasm

However, "hyper.wasm" is about 2.8 megabytes in size, so this hack
definitely should never become part of the *master* `.travis.yml`.
2018-07-10 17:48:31 -07:00
Arthur O'Dwyer
5142901772 Merge Makefile.{mac,mgw} into Makefile.simple.
https://travis-ci.org/Quuxplusone/hyperrogue
2018-07-10 17:02:56 -07:00
Arthur O'Dwyer
c713b9f209 Add a TravisCI badge to the README. 2018-07-01 12:38:08 -07:00
Zeno Rogue
8fe482ec16 improved the installation instructions for non-Linux 2018-06-15 00:14:24 +02:00
Zeno Rogue
b0d9305665 fixed markup 2018-06-15 00:10:10 +02:00
Zeno Rogue
239713de6b updated the version number in config script, and README.md 2018-06-15 00:09:35 +02:00
nobrakal
ed9f54deb7 Updated to 9.4g 2017-05-16 13:20:04 +02:00
Dorota Celińska
1d24f4c5c8 Updated README 2016-10-27 00:47:39 +02:00
Zeno Rogue
9f072a47e3 Version number updated 2016-01-02 11:37:22 +01:00
Alexandre Moine
721461a5c5 Update for the new configure/make files 2015-09-12 12:24:20 +02:00
Alexandre Moine
b0def85362 Update README.md 2015-08-08 16:20:28 +02:00
nobrakal
4b5634b554 Initial commit 2015-08-08 15:53:43 +02:00