From a125e799ad6aa757bfd212f1a00a0edb29ab2c5c Mon Sep 17 00:00:00 2001 From: Raimon Zamora Date: Fri, 1 May 2026 11:38:45 +0200 Subject: [PATCH] =?UTF-8?q?-=20[FIX]=20Windows=20no=20admet=20directoris?= =?UTF-8?q?=20que=20es=20diguen=20"aux",=20el=20molt=20membrillo=20.=20[NE?= =?UTF-8?q?W]=20Compilaci=C3=B3=20migrada=20a=20lagueirto?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- do_release.bat | 4 ++-- do_release.sh | 4 ++-- source/mini/audio/jail_audio.cpp | 2 +- source/mini/font/font.cpp | 9 ++++++++- source/mini/font/font.h | 1 + source/mini/lua/lua.cpp | 2 +- source/mini/mini.cpp | 3 ++- source/mini/surf/surf.cpp | 6 +++--- source/mini/win/win.cpp | 2 +- source/{aux => other}/gif.h | 0 source/{aux => other}/gifenc.h | 0 source/{aux => other}/log.h | 0 12 files changed, 21 insertions(+), 12 deletions(-) rename source/{aux => other}/gif.h (100%) rename source/{aux => other}/gifenc.h (100%) rename source/{aux => other}/log.h (100%) diff --git a/do_release.bat b/do_release.bat index 42e9810..bc97e46 100644 --- a/do_release.bat +++ b/do_release.bat @@ -9,10 +9,10 @@ IF "%1"=="" ( set PARAM=%1 echo Compilando windows... -make windows || exit /b 1 +lagueirto windows || exit /b 1 echo Compilando windows_debug... -make windows_debug || exit /b 1 +lagueirto windows_debug || exit /b 1 echo Creando paquetes... diff --git a/do_release.sh b/do_release.sh index 63817ec..b10d906 100755 --- a/do_release.sh +++ b/do_release.sh @@ -19,8 +19,8 @@ WIN_PATH_SSH="C:\Users\raimon\dev\mini" WIN_PATH_SCP="C:/Users/Raimon/dev/mini" echo "=== Compilando Linux ===" -make linux -make linux_debug +lagueirto linux +lagueirto linux_debug echo "=== Empaquetando Linux ===" tar -czf mini_v${VERSION}_linux_release.tar.gz mini diff --git a/source/mini/audio/jail_audio.cpp b/source/mini/audio/jail_audio.cpp index 010e780..2dca44f 100644 --- a/source/mini/audio/jail_audio.cpp +++ b/source/mini/audio/jail_audio.cpp @@ -1,7 +1,7 @@ #ifndef JA_USESDLMIXER #include "jail_audio.h" #include "external/stb_vorbis.h" -#include "aux/log.h" +#include "other/log.h" #include diff --git a/source/mini/font/font.cpp b/source/mini/font/font.cpp index 8d89ded..b99c131 100644 --- a/source/mini/font/font.cpp +++ b/source/mini/font/font.cpp @@ -4,7 +4,7 @@ #include "mini/surf/surf.h" #include "mini/file/file.h" -#include "aux/log.h" +#include "other/log.h" #include #include @@ -110,6 +110,13 @@ namespace mini current_font = &fonts[0]; } + void quit() { + for (int i=0;i #include diff --git a/source/mini/mini.cpp b/source/mini/mini.cpp index 32ecef9..90d2b3a 100644 --- a/source/mini/mini.cpp +++ b/source/mini/mini.cpp @@ -16,7 +16,7 @@ #include "file/file.h" #include "lua/lua.h" -#include "aux/log.h" +#include "other/log.h" #include "backends/backend.h" @@ -246,6 +246,7 @@ int main(int argc,char*argv[]){ } } + font::quit(); lua::quit(); audio::quit(); surf::quit(); diff --git a/source/mini/surf/surf.cpp b/source/mini/surf/surf.cpp index 339eda2..87fe4b7 100644 --- a/source/mini/surf/surf.cpp +++ b/source/mini/surf/surf.cpp @@ -1,8 +1,8 @@ #include "surf.h" -#include "aux/gif.h" -#include "aux/gifenc.h" -#include "aux/log.h" +#include "other/gif.h" +#include "other/gifenc.h" +#include "other/log.h" #include "mini/file/file.h" #include "mini/draw/draw.h" #include "mini/win/win.h" diff --git a/source/mini/win/win.cpp b/source/mini/win/win.cpp index 0d799ea..02049ac 100644 --- a/source/mini/win/win.cpp +++ b/source/mini/win/win.cpp @@ -1,5 +1,5 @@ #include "win.h" -#include "aux/log.h" +#include "other/log.h" #include "mini/file/file.h" #include "mini/shader/shader.h" #include diff --git a/source/aux/gif.h b/source/other/gif.h similarity index 100% rename from source/aux/gif.h rename to source/other/gif.h diff --git a/source/aux/gifenc.h b/source/other/gifenc.h similarity index 100% rename from source/aux/gifenc.h rename to source/other/gifenc.h diff --git a/source/aux/log.h b/source/other/log.h similarity index 100% rename from source/aux/log.h rename to source/other/log.h