JailDoctor/mini
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 7 Wiki Activity

- [NEW] Inclosa llibreria estàtica de Lua 5.5.0 en Windows

Browse Source 
- [FIX] Llevat un warning en Windows
This commit is contained in:
Raimon Zamora
2026-05-04 13:07:35 +02:00
parent fe39cd6c60
commit 5cd901e5a9
4 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lagueirtofile
View File

@@ -1,27 +1,27 @@
[linux] [linux]
cppflags = -D LUA_USE_LINUX -Wall -Os -ffunction-sections -fdata-sections -std=c++20 -Isource 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 executable = mini
sourcepath = source+ sourcepath = source+
buildpath = build buildpath = build
[linux_debug] default [linux_debug] default
cppflags = -D LUA_USE_LINUX -D DEBUG -g -Wall -std=c++20 -Isource 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 executable = mini_debug
sourcepath = source+ sourcepath = source+
buildpath = build buildpath = build
[windows] [windows]
cppflags = -Wall -Os -ffunction-sections -fdata-sections -std=c++20 -Isource 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 executable = mini.exe
sourcepath = source+ sourcepath = source+
buildpath = build buildpath = build
[windows_debug] [windows_debug]
cppflags = -D DEBUG -g -Wall -std=c++20 -Isource 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 executable = mini_debug.exe
sourcepath = source+ sourcepath = source+
buildpath = build buildpath = build

0
source/external/lua/liblua.a → source/external/lua/lib/linux/liblua.a vendored
View File

BIN
source/external/lua/lib/windows/liblua.a vendored Normal file
View File

Binary file not shown.

3
source/mini/draw/draw.cpp
View File

@@ -455,7 +455,6 @@ namespace mini
void text(const char* str, int x, int y, uint8_t color) { void text(const char* str, int x, int y, uint8_t color) {
const unsigned char* p = (const unsigned char*)str; const unsigned char* p = (const unsigned char*)str;
uint8_t cp;
uint8_t xpos = x; uint8_t xpos = x;
uint8_t old_source = surf::source::get(); uint8_t old_source = surf::source::get();
@@ -465,8 +464,8 @@ namespace mini
uint8_t old_trans = state.trans; uint8_t old_trans = state.trans;
state.trans = 0; state.trans = 0;
while (p[0]!=0) { while (p[0]!=0) {
uint8_t cp = p[0];
if (p[0] < 0x80) { if (p[0] < 0x80) {
cp = p[0];
p+=1; p+=1;
} else if ((p[0] & 0xE0) == 0xC0) { } else if ((p[0] & 0xE0) == 0xC0) {
cp = (p[0] << 6) | (p[1] & 0x3F); cp = (p[0] << 6) | (p[1] & 0x3F);