1
0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-12-20 23:50:27 +00:00
Commit Graph

38 Commits

Author SHA1 Message Date
Arthur O'Dwyer
4c10b17b7e Move Makefile.simple to just Makefile. 2021-03-21 17:40:06 -04:00
Zeno Rogue
b872926cac in -mingw64-cross, changed -DCAP_GLEW=1 to -DGLEW_STATIC 2021-03-11 09:29:27 +01:00
Zeno Rogue
f5793c7bcb added -mingw64-cross target 2021-03-11 09:16:55 +01:00
Zeno Rogue
a54c34ff99 mymake:: renamed system to mysystem (as it no longer just converts the type) and moved the implementation earlier 2021-03-11 09:16:42 +01:00
Zeno Rogue
6fbccbeda0 mymake:: added an option -v to view the commandline 2021-03-07 14:18:58 +01:00
Zeno Rogue
9e8a325cc8 changed default SDL version to 1.2 2021-03-07 14:02:33 +01:00
Zeno Rogue
77e673f6f1 mymake:: savepng now works like other modules, and is compiled with SDL2 if needed 2021-03-07 14:02:06 +01:00
Zeno Rogue
3eff38bb4d mymake:: option -vr 2021-03-06 14:53:48 +01:00
Zeno Rogue
f00696711a HyperRogue ported to SDL2 (in mymake do -sdl2) 2021-03-06 14:53:25 +01:00
Zeno Rogue
76462aa1e7 Merge branch 'master' of https://github.com/zenorogue/hyperrogue 2020-10-12 01:29:25 +02:00
Zeno Rogue
35d26d1595 mymake now works with Emscripten 2020-10-12 01:28:50 +02:00
still-flow
253061a4fd stop ignoring return values of some calls 2020-09-24 21:48:46 +03:00
still-flow
f1dab56bab try supporting MinGW64 in mymake 2020-09-24 20:56:29 +03:00
still-flow
31d836b2a9 restructure scheduling intervals
so that there is just one pause for every sweep of the workforce,
so that upper bound on idle time doesn't grow
proportionally to the number of workers
2020-05-30 17:17:51 +03:00
still-flow
d6de73a1dc remove unnecessary goto
which is a bit of a shame
2020-05-30 16:44:46 +03:00
still-flow
72008a7e85 change tasks into pairs of ids and do_work functions 2020-05-28 20:41:42 +03:00
still-flow
4386f86efb add diagnostic message showing batch size 2020-05-28 18:34:27 +03:00
still-flow
dcf81ee468
change default behavior to multi-tasking 2020-05-28 15:28:50 +03:00
still-flow
61d824803c add simple concurrent compilation
using something similar to round-robin scheduling
2020-05-28 13:29:03 +03:00
Zeno Rogue
64fb9ed24a in mymake, changed tests to use isalnum 2020-05-19 17:44:38 +02:00
rpljwi
e05a2f9b87 add more escaping to -D option,
to allow e.g. specifying HYPERPATH
2020-05-19 11:40:18 +03:00
rpljwi
1ac8aa2bc6 invoke make for just the first Makefile from list 2020-05-19 11:39:26 +03:00
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