Merge branch 'FSM' into jl777

.gitlab-ci.yml

@@ -71,6 +71,10 @@ build:windows:
   - cp src/komodod.exe
     src/komodo-cli.exe
     src/komodo-tx.exe
+    src/cc/rogue/rogue.exe
+    zcutil/fetch-params.bat
+    src/cc/rogue/x86_64-w64-mingw32/libcurl-4.dll
+    src/cc/rogue/x86_64-w64-mingw32/libncursesw6.dll
     ${PACKAGE_DIR_WINDOWS}
   - zip -r ${PACKAGE_DIR_WINDOWS}.zip ${PACKAGE_DIR_WINDOWS}
   - md5sum ${AGAMA_ARTIFACTS_WINDOWS} > ${AGAMA_ARTIFACTS_WINDOWS_CHECKSUM}
@@ -91,6 +95,7 @@ build:macos:
     key: "${CI_JOB_NAME}${CI_COMMIT_REF_NAME}"
     paths:
     - depends/built
+  allow_failure: true
   script:
   - zcutil/build-mac.sh -j$(sysctl -n hw.physicalcpu)
   - ./makeRelease.sh ${PACKAGE_DIR_MACOS}

src/cc/Makefile_rogue

@@ -4,7 +4,7 @@ CC_DARWIN	= g++-6
 CC_WIN		= x86_64-w64-mingw32-gcc-posix
 CFLAGS_DARWIN	= -DBUILD_ROGUE -std=c++11 -arch x86_64 -I../../depends/$(shell echo `../..//depends/config.guess`/include) -I../univalue/include -I../cryptoconditions/include -I../cryptoconditions/src -I../cryptoconditions/src/asn -I.. -I. -fPIC -Wl,-undefined -Wl,dynamic_lookup -Wno-write-strings -shared -dynamiclib
 CFLAGS		= -Wno-write-strings -DBUILD_ROGUE -std=c++11 -I../../depends/$(shell echo `../..//depends/config.guess`/include) -I../univalue/include -I../cryptoconditions/include -I../cryptoconditions/src -I../cryptoconditions/src/asn -I.. -I. -fPIC -shared
-CFLAGS_WIN	= -Wno-write-strings -DBUILD_ROGUE -std=c++11 -I../../depends/x86_64-w64-mingw32/include -I../univalue/include -I../cryptoconditions/include -I../cryptoconditions/src -I../cryptoconditions/src/asn -I.. -I. -fPIC -shared
+CFLAGS_WIN	= -Wno-write-strings -DBUILD_ROGUE -std=c++11 -I./rogue/x86_64-w64-mingw32/include -I./rogue/x86_64-w64-mingw32/include/ncursesw -I../univalue/include -I../cryptoconditions/include -I../cryptoconditions/src -I../cryptoconditions/src/asn -I.. -I. -fPIC -shared
 DEBUGFLAGS	= -O0 -D _DEBUG
 RELEASEFLAGS	= -O2 -D NDEBUG -combine -fwhole-program
 $(info $(OS))

src/cc/makerogue

@@ -5,12 +5,10 @@ make clean;
 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 && rm mingw32.zip
+  wget https://github.com/KomodoPlatform/rogue/releases/download/0.3.3b-01/x86_64-w64-mingw32.tar.gz
+  tar xvfz x86_64-w64-mingw32.tar.gz && rm x86_64-w64-mingw32.tar.gz
   echo lib archive cleaned
-  cd ..
   echo $PWD
   if make -f Makefile_win "$@"; then
     echo rogue.exe build SUCCESSFUL

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 -I./ncurses/include/ncursesw -I../../../depends/x86_64-w64-mingw32/include
+CFLAGS= -g -O2 -I./x86_64-w64-mingw32/include -I./x86_64-w64-mingw32/include/ncursesw
 
 #LIBS=-lcurses
-LIBS = -L./ncurses/lib -lncursesw -lcurl
+LIBS = -L./x86_64-w64-mingw32/lib -lncursesw -lcurl
 
 #RM=rm -f
 RM    = rm -f