mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-11-30 15:39:54 +00:00
Code Issues Releases Wiki Activity

try supporting MinGW64 in mymake

Browse Source
This commit is contained in:
still-flow 2020-09-22 02:39:04 +03:00
parent b991b1ae85
commit f1dab56bab
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
mymake.cpp
View File

@ -32,6 +32,7 @@ string linker;
string libs; string libs;
int batch_size = thread::hardware_concurrency() + 1; int batch_size = thread::hardware_concurrency() + 1;
bool mingw64 = false;
void set_linux() { void set_linux() {
preprocessor = "g++ -E"; preprocessor = "g++ -E";
@ -49,14 +50,14 @@ void set_mac() {
libs = " savepng.o -L/usr/local/lib -framework AppKit -framework OpenGL -lSDL -lSDLMain -lSDL_gfx -lSDL_mixer -lSDL_ttf -lpng -lpthread -lz"; libs = " savepng.o -L/usr/local/lib -framework AppKit -framework OpenGL -lSDL -lSDLMain -lSDL_gfx -lSDL_mixer -lSDL_ttf -lpng -lpthread -lz";
} }
void set_win() { void set_mingw64() {
mingw64 = true;
preprocessor = "g++ -E"; preprocessor = "g++ -E";
compiler = "runbat bwin-g.bat -c"; compiler = "g++ -mwindows -march=native -W -Wall -Wextra -Werror -Wno-unused-parameter -Wno-implicit-fallthrough -Wno-maybe-uninitialized -c";
linker = "runbat bwin-linker.bat"; linker = "g++ -o hyper";
opts = "-DFHS -DLINUX -I/usr/include/SDL"; opts = "-DWINDOWS -DCAP_GLEW=1 -DCAP_PNG=1";
libs = ""; libs = " savepng.o hyper.res -lopengl32 -lSDL -lSDL_gfx -lSDL_mixer -lSDL_ttf -lpthread -lz -lglew32 -lpng";
setvbuf(stdout, NULL, _IONBF, 0); // MinGW is quirky with output buffering
standard = "";
} }
vector<string> modules; vector<string> modules;
@ -73,6 +74,8 @@ string obj_dir = "mymake_files";
string setdir = "../"; string setdir = "../";
int system(string cmdline) { int system(string cmdline) {
if (mingw64)
cmdline = "sh -c '" + cmdline + "'"; // because system(arg) passes arg to cmd.exe on MinGW
return system(cmdline.c_str()); return system(cmdline.c_str());
} }
@ -84,7 +87,7 @@ int main(int argc, char **argv) {
#if defined(MAC) #if defined(MAC)
set_mac(); set_mac();
#elif defined(WINDOWS) #elif defined(WINDOWS)
set_win(); set_mingw64();
#else #else
set_linux(); set_linux();
#endif #endif
@ -103,9 +106,9 @@ int main(int argc, char **argv) {
if(!isalnum(c)) obj_dir += "_"; if(!isalnum(c)) obj_dir += "_";
else obj_dir += c; else obj_dir += c;
} }
else if(s == "-win") { else if(s == "-mingw64") {
set_win(); set_mingw64();
obj_dir += "/win"; obj_dir += "/mingw64";
setdir += "../"; setdir += "../";
} }
else if(s == "-mac") { else if(s == "-mac") {
@ -267,7 +270,9 @@ int main(int argc, char **argv) {
} }
else if (tasks_done == tasks_amt) { finished = true; break; } else if (tasks_done == tasks_amt) { finished = true; break; }
} this_thread::sleep_for(quantum); } } this_thread::sleep_for(quantum); }
if (mingw64) (void)system("windres hyper.rc -O coff -o hyper.res");
printf("linking...\n"); printf("linking...\n");
system(linker + allobj + libs); system(linker + allobj + libs);
return 0; return 0;