Merge pull request #1275 from KomodoPlatform/rogue_nocurses

winify rogue

.gitlab-ci.yml

@@ -32,9 +32,9 @@ build:ubuntu:
   variables:
     DOCKER_DRIVER: overlay2
   cache:
-    key: "${CI_JOB_NAME}${CI_COMMIT_REF_NAME}"
+    key: ${CI_COMMIT_REF_SLUG}
     paths:
-    - depends/built
+    - depends/
   script:
   - zcutil/build.sh -j$(nproc)
   - mkdir ${PACKAGE_DIR_LINUX}

src/cc/makerogue

@@ -3,10 +3,14 @@ cd rogue;
 
 if [ "$HOST" = "x86_64-w64-mingw32" ]; then
   echo building rogue.exe...
+  ./configure --host=x86_64-w64-mingw32
   mkdir ncurses && cd ncurses
+  echo $PWD
   wget https://invisible-island.net/datafiles/release/mingw32.zip
-  unzip mingw32.zip && delete mingw32.zip
+  unzip mingw32.zip && rm mingw32.zip
+  echo lib archive cleaned
   cd ..
+  echo $PWD
   if make -f Makefile_win "$@"; then
     echo rogue.exe build SUCCESSFUL
     cd ..

src/cc/rogue/Makefile_win

@@ -26,10 +26,10 @@ O=o
 CC    = x86_64-w64-mingw32-gcc
 
 #CFLAGS=-O2
-CFLAGS= -g -O2 -I./ncurses/include
+CFLAGS= -g -O2 -I./ncurses/include -I./ncurses/include/ncursesw -I../../../depends/x86_64-w64-mingw32/include
 
 #LIBS=-lcurses
-LIBS = -L./ncurses/lib -lncursesw
+LIBS = -L./ncurses/lib -lncursesw -lcurl
 
 #RM=rm -f
 RM    = rm -f

src/cc/rogue/main.c

@@ -41,7 +41,11 @@ typedef union _bits256 bits256;
 double OS_milliseconds()
 {
     struct timeval tv; double millis;
+    #ifdef __MINGW32__
+    mingw_gettimeofday(&tv,NULL);
+    #else
     gettimeofday(&tv,NULL);
+    #endif
     millis = ((double)tv.tv_sec * 1000. + (double)tv.tv_usec / 1000.);
     //printf("tv_sec.%ld usec.%d %f\n",tv.tv_sec,tv.tv_usec,millis);
     return(millis);

src/cc/rogue/mdport.c

@@ -705,7 +705,9 @@ md_erasechar()
 #elif defined(VERASE)
     return(_tty.c_cc[VERASE]); /* process erase character */
 #else
+    #ifndef __MINGW32__
     return(_tty.sg_erase); /* process erase character */
+    #endif
 #endif
 }
 
@@ -717,7 +719,9 @@ md_killchar()
 #elif defined(VKILL)
     return(_tty.c_cc[VKILL]);
 #else
+    #ifndef __MINGW32__
     return(_tty.sg_kill);
+    #endif
 #endif
 }