mingw rc and lua version

diff --git a/sys/windows/Makefile.mingw32 b/sys/windows/Makefile.mingw32
index fe015d3d70b4635b5fc97631bdccea6fab386c70..3d236dcf742190ee83b0d15604b4a1c56c135579 100644 (file)
--- a/sys/windows/Makefile.mingw32
+++ b/sys/windows/Makefile.mingw32
@@ -96,7 +96,7 @@ DEBUGINFO = N
 
 #---------------------------------------------------------------
 ifndef LUA_VERSION
-LUAVER=5.4.3
+LUAVER=5.4.4
 else
 LUAVER=$(LUA_VERSION)
 endif
@@ -104,7 +104,7 @@ endif
 # Location of LUA
 #
 # Original source needs to be obtained from:
-#    http://www.lua.org/ftp/lua-5.4.3.tar.gz
+#    http://www.lua.org/ftp/lua-5.4.4.tar.gz
 #
 #    This build assumes that the LUA sources are located
 #    at the specified location. If they are actually elsewhere
@@ -206,10 +206,10 @@ rc = windres --target=pe-i386
 else
 cc = gcc -c
 ld = gcc
-ifeq "$(MSYSTEM)" "MINGW64"
-rc = windres --target=pe-x86-64
-else # MINGW32
+ifeq "$(MSYSTEM)" "MINGW32"
 rc = windres --target=pe-i386
+else # MINGW32
+rc = windres --target=pe-x86-64
 endif
 endif
 
@@ -250,7 +250,7 @@ CLEAN_DIR = $(GAMEDIR) $(OBJ)
 
 #===============-=================================================
 # LUA library
-# Source from http://www.lua.org/ftp/lua-5.4.3.tar.gz
+# Source from http://www.lua.org/ftp/lua-5.4.4.tar.gz
 #=================================================================
 
 OLUA = $(O)lua

diff --git a/sys/windows/consoletty.c b/sys/windows/consoletty.c
index 73d560a6a56c8a26d1537614a110fcab2ea55e36..47205ae09e57c906ba76641f85c0324a40f1eed3 100644 (file)
--- a/sys/windows/consoletty.c
+++ b/sys/windows/consoletty.c
@@ -2793,7 +2793,7 @@ static boolean qwertz = FALSE;
 #endif
 #define inmap(x, vk) (((x) > 'A' && (x) < 'Z') || (vk) == 0xBF || (x) == '2')
 
-const struct pad {
+struct pad {
     uchar normal, shift, cntrl;
 };