Merge pull request #115 from still-flow/mymake_mingw64

Attempt to convince mymake to work on MinGW

.github/workflows/test_simple.sh

@@ -6,6 +6,7 @@ if [[ "$GH_OS" == "windows-latest" && "$GH_BUILDSYS" == "mymake" ]]; then
 cat << ENDOFCMDS > .github/workflows/gdb_cmds.txt
   run --version
   backtrace
+  exit 1
 ENDOFCMDS
 
   gdb --batch -x .github/workflows/gdb_cmds.txt ./hyperrogue

mymake.cpp

@@ -32,6 +32,7 @@ string linker;
 string libs;
 
 int batch_size = thread::hardware_concurrency() + 1;
+bool mingw64 = false;
 
 void set_linux() {
   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";
   }
 
-void set_win() {
+void set_mingw64() {
+  mingw64 = true;
   preprocessor = "g++ -E";
-  compiler = "runbat bwin-g.bat -c";
-  linker = "runbat bwin-linker.bat";
-  opts = "-DFHS -DLINUX -I/usr/include/SDL";
-  libs = "";
-
-  standard = "";
+  compiler = "g++ -mwindows -march=native -W -Wall -Wextra -Werror -Wno-unused-parameter -Wno-implicit-fallthrough -Wno-maybe-uninitialized -c";
+  linker = "g++ -o hyper";
+  opts = "-DWINDOWS -DCAP_GLEW=1 -DCAP_PNG=1";
+  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
   }
 
 vector<string> modules;
@@ -73,6 +74,8 @@ string obj_dir = "mymake_files";
 string setdir = "../";
 
 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());
   }
 
@@ -84,13 +87,15 @@ int main(int argc, char **argv) {
 #if defined(MAC)
   set_mac();
 #elif defined(WINDOWS)
-  set_win();
+  set_mingw64();
 #else
   set_linux();
 #endif
+  int retval = 0; // for storing return values of some function calls
   for(string fname: {"Makefile.loc", "Makefile.simple", "Makefile"})
     if(file_exists(fname)) {
-      system("make -f " + fname + " language-data.cpp autohdr.h savepng.o");
+      retval = system("make -f " + fname + " language-data.cpp autohdr.h savepng.o");
+      if (retval) { printf("error during preparation!\n"); exit(retval); }
       break;
       }
   for(int i=1; i<argc; i++) {
@@ -103,9 +108,9 @@ int main(int argc, char **argv) {
         if(!isalnum(c)) obj_dir += "_"; 
         else obj_dir += c;      
       }
-    else if(s == "-win") {
-      set_win();
-      obj_dir += "/win";
+    else if(s == "-mingw64") {
+      set_mingw64();
+      obj_dir += "/mingw64";
       setdir += "../";
       }
     else if(s == "-mac") {
@@ -170,7 +175,8 @@ int main(int argc, char **argv) {
   compiler += " " + standard;
   ifstream fs("hyper.cpp");
 
-  system("mkdir -p " + obj_dir);
+  retval = system("mkdir -p " + obj_dir);
+  if (retval) { printf("unable to create output directory!\n"); exit(retval); }
 
   ofstream fsm(obj_dir + "/hyper.cpp");
   fsm << "#if REM\n#define INCLUDE(x)\n#endif\n";
@@ -267,8 +273,14 @@ int main(int argc, char **argv) {
       }
     else if (tasks_done == tasks_amt) { finished = true; break; }
     } this_thread::sleep_for(quantum); }
-
+
+  if (mingw64) {
+    retval = system("windres hyper.rc -O coff -o hyper.res");
+    if (retval) { printf("windres error!\n"); exit(retval); }
+    }
+
   printf("linking...\n");
-  system(linker + allobj + libs);
+  retval = system(linker + allobj + libs);
+  if (retval) { printf("linking error!\n"); exit(retval); }
   return 0;
   }