mingw rc and lua version
This commit is contained in:
@@ -96,7 +96,7 @@ DEBUGINFO = N
|
|||||||
|
|
||||||
#---------------------------------------------------------------
|
#---------------------------------------------------------------
|
||||||
ifndef LUA_VERSION
|
ifndef LUA_VERSION
|
||||||
LUAVER=5.4.3
|
LUAVER=5.4.4
|
||||||
else
|
else
|
||||||
LUAVER=$(LUA_VERSION)
|
LUAVER=$(LUA_VERSION)
|
||||||
endif
|
endif
|
||||||
@@ -104,7 +104,7 @@ endif
|
|||||||
# Location of LUA
|
# Location of LUA
|
||||||
#
|
#
|
||||||
# Original source needs to be obtained from:
|
# 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
|
# This build assumes that the LUA sources are located
|
||||||
# at the specified location. If they are actually elsewhere
|
# at the specified location. If they are actually elsewhere
|
||||||
@@ -206,10 +206,10 @@ rc = windres --target=pe-i386
|
|||||||
else
|
else
|
||||||
cc = gcc -c
|
cc = gcc -c
|
||||||
ld = gcc
|
ld = gcc
|
||||||
ifeq "$(MSYSTEM)" "MINGW64"
|
ifeq "$(MSYSTEM)" "MINGW32"
|
||||||
rc = windres --target=pe-x86-64
|
|
||||||
else # MINGW32
|
|
||||||
rc = windres --target=pe-i386
|
rc = windres --target=pe-i386
|
||||||
|
else # MINGW32
|
||||||
|
rc = windres --target=pe-x86-64
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
@@ -250,7 +250,7 @@ CLEAN_DIR = $(GAMEDIR) $(OBJ)
|
|||||||
|
|
||||||
#===============-=================================================
|
#===============-=================================================
|
||||||
# LUA library
|
# 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
|
OLUA = $(O)lua
|
||||||
|
|||||||
@@ -2793,7 +2793,7 @@ static boolean qwertz = FALSE;
|
|||||||
#endif
|
#endif
|
||||||
#define inmap(x, vk) (((x) > 'A' && (x) < 'Z') || (vk) == 0xBF || (x) == '2')
|
#define inmap(x, vk) (((x) > 'A' && (x) < 'Z') || (vk) == 0xBF || (x) == '2')
|
||||||
|
|
||||||
const struct pad {
|
struct pad {
|
||||||
uchar normal, shift, cntrl;
|
uchar normal, shift, cntrl;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user