mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-10-31 05:52:59 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' of https://github.com/zenorogue/hyperrogue

Browse Source
This commit is contained in:
Zeno Rogue
2021-12-12 22:39:54 +01:00
parent 973fc68b66 237a521e80
commit d3fb683a95
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
basegraph.cpp
View File

@@ -197,7 +197,7 @@ EX void present_screen() {
#if CAP_SDLTTF #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) { void loadfont(int siz) {
fix_font_size(siz); fix_font_size(siz);

4
sysconfig.h
View File

@@ -347,6 +347,10 @@
#define HYPERPATH "" #define HYPERPATH ""
#endif #endif
#ifndef HYPERFONTPATH
#define HYPERFONTPATH HYPERPATH
#endif
#if ISWINDOWS #if ISWINDOWS
#define hyper fake_hyper // avoid "hyper" typedef in <_mingw.h> #define hyper fake_hyper // avoid "hyper" typedef in <_mingw.h>
#define WIN32_LEAN_AND_MEAN // avoid "rad1" macro in <windows.h> #define WIN32_LEAN_AND_MEAN // avoid "rad1" macro in <windows.h>