From 08852d25bec10a47d3501afb846c75fb23f88b00 Mon Sep 17 00:00:00 2001 From: nhmall Date: Sat, 11 Apr 2020 10:14:05 -0400 Subject: [PATCH] mingw build bit --- .travis.yml | 7 +++---- include/optlist.h | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index dd9c6903b..e8bd72577 100644 --- a/.travis.yml +++ b/.travis.yml @@ -116,12 +116,11 @@ matrix: os: windows # install: choco install mingw script: - - sh sys/winnt/travis-gcc.sh - - test -d "lib/lua-$LUA_VERSION/src" || exit 0 - - test -d "lib/pdcurses" || exit 0 - export ADD_CURSES=Y - export PDCURSES_TOP=../lib/pdcurses - - export LUA_VERSION=5.3.5 + - export LUA_VERSION=5.3.5 - sh sys/winnt/travis-gcc.sh + - test -d "lib/lua-$LUA_VERSION/src" || exit 0 + - test -d "lib/pdcurses" || exit 0 - cd src - cp ../sys/winnt/Makefile.gcc ./Makefile - mingw32-make install diff --git a/include/optlist.h b/include/optlist.h index f557b1120..808bbfbab 100644 --- a/include/optlist.h +++ b/include/optlist.h @@ -339,10 +339,10 @@ pfx_##a, "the inventory order of the items in your pack") #ifdef CHANGE_COLOR #ifndef WIN32 - NHOPTC(palette, 15, opt_in, set_in_game, No, Yes, No, "hicolor", + NHOPTC(palette, 15, opt_in, set_in_game, No, Yes, No, No, "hicolor", "palette (00c/880/-fff is blue/yellow/reverse white)") #else - NHOPTC(palette, 15, opt_in, set_in_config, No, Yes, No, "hicolor", + NHOPTC(palette, 15, opt_in, set_in_config, No, Yes, No, No, "hicolor", "palette (adjust an RGB color in palette (color-R-G-B)") #endif #endif -- 2.50.1