mingw build bit

diff --git a/.travis.yml b/.travis.yml
index dd9c6903b83a8e4fa17d7a5e81b0a21098422e14..e8bd725773f2548c3210a16b30df07ad0b52b7cf 100644 (file)
--- 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 f557b1120cc1cc16c103f65529e14d8aa54bd79f..808bbfbabfa698438a8fa76836b5cc1339f6bd04 100644 (file)
--- 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