diff options
Diffstat (limited to '3rdparty/lua')
-rw-r--r-- | 3rdparty/lua/src/Makefile | 6 | ||||
-rw-r--r-- | 3rdparty/lua/src/lstrlib.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/3rdparty/lua/src/Makefile b/3rdparty/lua/src/Makefile index d71c75c8732..c5b8a1afb41 100644 --- a/3rdparty/lua/src/Makefile +++ b/3rdparty/lua/src/Makefile @@ -6,8 +6,8 @@ # Your platform. See PLATS for possible values. PLAT= none -CC= gcc -std=gnu99 -CFLAGS= -O2 -Wall -Wextra -DLUA_COMPAT_5_2 $(SYSCFLAGS) $(MYCFLAGS) +CC= g++ -std=gnu99 +CFLAGS= -console -O2 -Wall -Wextra -DLUA_COMPAT_5_2 $(SYSCFLAGS) $(MYCFLAGS) LDFLAGS= $(SYSLDFLAGS) $(MYLDFLAGS) LIBS= -lm $(SYSLIBS) $(MYLIBS) @@ -114,7 +114,7 @@ macosx: mingw: $(MAKE) "LUA_A=lua53.dll" "LUA_T=lua.exe" \ - "AR=$(CC) -shared -o" "RANLIB=strip --strip-unneeded" \ + "AR=$(CC) -lstdc++ -o" "RANLIB=strip --strip-unneeded" \ "SYSCFLAGS=-DLUA_BUILD_AS_DLL" "SYSLIBS=" "SYSLDFLAGS=-s" lua.exe $(MAKE) "LUAC_T=luac.exe" luac.exe diff --git a/3rdparty/lua/src/lstrlib.c b/3rdparty/lua/src/lstrlib.c index 12264f88105..8ecf43f32b8 100644 --- a/3rdparty/lua/src/lstrlib.c +++ b/3rdparty/lua/src/lstrlib.c @@ -933,7 +933,7 @@ static void addquoted (luaL_Buffer *b, const char *s, size_t len) { static void checkdp (char *buff, int nb) { if (memchr(buff, '.', nb) == NULL) { /* no dot? */ char point = lua_getlocaledecpoint(); /* try locale point */ - char *ppoint = memchr(buff, point, nb); + char *ppoint = (char*)memchr(buff, point, nb); if (ppoint) *ppoint = '.'; /* change it to a dot */ } } |