mirror of
https://github.com/zenorogue/hyperrogue.git
synced 2024-12-25 17:40:36 +00:00
Merge branch 'master' of https://github.com/zenorogue/hyperrogue
This commit is contained in:
commit
d3fb683a95
@ -197,7 +197,7 @@ EX void present_screen() {
|
||||
|
||||
#if CAP_SDLTTF
|
||||
|
||||
EX string fontpath = ISWEB ? "sans-serif" : HYPERPATH "DejaVuSans-Bold.ttf";
|
||||
EX string fontpath = ISWEB ? "sans-serif" : HYPERFONTPATH "DejaVuSans-Bold.ttf";
|
||||
|
||||
void loadfont(int siz) {
|
||||
fix_font_size(siz);
|
||||
|
@ -347,6 +347,10 @@
|
||||
#define HYPERPATH ""
|
||||
#endif
|
||||
|
||||
#ifndef HYPERFONTPATH
|
||||
#define HYPERFONTPATH HYPERPATH
|
||||
#endif
|
||||
|
||||
#if ISWINDOWS
|
||||
#define hyper fake_hyper // avoid "hyper" typedef in <_mingw.h>
|
||||
#define WIN32_LEAN_AND_MEAN // avoid "rad1" macro in <windows.h>
|
||||
|
Loading…
Reference in New Issue
Block a user