- [NEW] Inclosa llibreria estàtica de Lua 5.5.0 en Windows
- [FIX] Llevat un warning en Windows
This commit is contained in:
@@ -1,27 +1,27 @@
|
||||
[linux]
|
||||
cppflags = -D LUA_USE_LINUX -Wall -Os -ffunction-sections -fdata-sections -std=c++20 -Isource
|
||||
libs = -Wl,--gc-sections -lSDL3 -lGL -Lsource/external/lua -llua -ldl -lm
|
||||
libs = -Wl,--gc-sections -lSDL3 -lGL -Lsource/external/lua/lib/linux -llua -ldl -lm
|
||||
executable = mini
|
||||
sourcepath = source+
|
||||
buildpath = build
|
||||
|
||||
[linux_debug] default
|
||||
cppflags = -D LUA_USE_LINUX -D DEBUG -g -Wall -std=c++20 -Isource
|
||||
libs = -lSDL3 -lGL -Lsource/external/lua -llua -ldl -lm
|
||||
libs = -lSDL3 -lGL -Lsource/external/lua/lib/linux -llua -ldl -lm
|
||||
executable = mini_debug
|
||||
sourcepath = source+
|
||||
buildpath = build
|
||||
|
||||
[windows]
|
||||
cppflags = -Wall -Os -ffunction-sections -fdata-sections -std=c++20 -Isource
|
||||
libs = icon.res -Wl,--gc-sections -lmingw32 -lSDL3 -lopengl32 -static-libstdc++ -static-libgcc -lpthread -mwindows
|
||||
libs = icon.res -Wl,--gc-sections -lmingw32 -lSDL3 -lopengl32 -static-libstdc++ -static-libgcc -lpthread -mwindows -Lsource/external/lua/lib/windows -llua
|
||||
executable = mini.exe
|
||||
sourcepath = source+
|
||||
buildpath = build
|
||||
|
||||
[windows_debug]
|
||||
cppflags = -D DEBUG -g -Wall -std=c++20 -Isource
|
||||
libs = -lmingw32 -lSDL3 -lopengl32
|
||||
libs = -lmingw32 -lSDL3 -lopengl32 -Lsource/external/lua/lib/windows -llua
|
||||
executable = mini_debug.exe
|
||||
sourcepath = source+
|
||||
buildpath = build
|
||||
|
||||
BIN
source/external/lua/lib/windows/liblua.a
vendored
Normal file
BIN
source/external/lua/lib/windows/liblua.a
vendored
Normal file
Binary file not shown.
@@ -455,7 +455,6 @@ namespace mini
|
||||
void text(const char* str, int x, int y, uint8_t color) {
|
||||
|
||||
const unsigned char* p = (const unsigned char*)str;
|
||||
uint8_t cp;
|
||||
uint8_t xpos = x;
|
||||
|
||||
uint8_t old_source = surf::source::get();
|
||||
@@ -465,8 +464,8 @@ namespace mini
|
||||
uint8_t old_trans = state.trans;
|
||||
state.trans = 0;
|
||||
while (p[0]!=0) {
|
||||
uint8_t cp = p[0];
|
||||
if (p[0] < 0x80) {
|
||||
cp = p[0];
|
||||
p+=1;
|
||||
} else if ((p[0] & 0xE0) == 0xC0) {
|
||||
cp = (p[0] << 6) | (p[1] & 0x3F);
|
||||
|
||||
Reference in New Issue
Block a user