diff --git a/.gitignore b/.gitignore index 91c0bc5..50800cb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ *.exe -*.dll +*.zip +*.tar.gz .vscode/* *.dSYM/* build/* diff --git a/bin/SDL3.dll b/bin/SDL3.dll new file mode 100644 index 0000000..d3f2213 Binary files /dev/null and b/bin/SDL3.dll differ diff --git a/bin/libwinpthread-1.dll b/bin/libwinpthread-1.dll new file mode 100644 index 0000000..9888dc8 Binary files /dev/null and b/bin/libwinpthread-1.dll differ diff --git a/do_release.bat b/do_release.bat index 692de7f..633109f 100644 --- a/do_release.bat +++ b/do_release.bat @@ -17,7 +17,7 @@ respak2 -p || exit /b 1 echo Creando paquetes... REM Crear ZIP release con exe + data.jf2 -tar -a -c -f mini_%PARAM%_windows_release.zip thepool.exe data.jf2 bin\*.dll || exit /b 1 +tar -a -c -f thepool_%PARAM%_win32-x64.zip thepool.exe data.jf2 bin\*.dll || exit /b 1 echo Paquetes generados: echo thepool_%PARAM%_win32-x64.zip diff --git a/do_release.sh b/do_release.sh index 80d59c6..0bacf14 100755 --- a/do_release.sh +++ b/do_release.sh @@ -7,14 +7,14 @@ set -e #fi # Leer versión desde version.h -VERSION=$(grep '#define VERSIO' versio.h | sed 's/.*"\(.*\)".*/\1/') +VERSION=$(grep '#define VERSIO' source/versio.h | sed 's/.*"\(.*\)".*/\1/') echo "Versión detectada: $VERSION" #PARAM=$1 # Datos Windows WIN_USER="raimon" -WIN_HOST="tonlab19.uv.es" +WIN_HOST="tonlab19" WIN_PATH_SSH="C:\Users\raimon\dev\thepool" WIN_PATH_SCP="C:/Users/Raimon/dev/thepool" diff --git a/source/jail_audio.cpp b/source/jail_audio.cpp index 42f3a56..4f29423 100644 --- a/source/jail_audio.cpp +++ b/source/jail_audio.cpp @@ -447,7 +447,7 @@ void JA_StopChannel(const int channel) { for (int i = 0; i < JA_MAX_SIMULTANEOUS_CHANNELS; i++) { if (channels[i].state != JA_CHANNEL_FREE) SDL_DestroyAudioStream(channels[i].stream); - channels[channel].stream = nullptr; + channels[i].stream = nullptr; channels[i].state = JA_CHANNEL_FREE; channels[i].pos = 0; channels[i].sound = NULL; diff --git a/source/jdraw.cpp b/source/jdraw.cpp index dd94eda..388fb72 100644 --- a/source/jdraw.cpp +++ b/source/jdraw.cpp @@ -113,7 +113,7 @@ namespace draw SDL_DisplayID display = SDL_GetPrimaryDisplay(); const SDL_DisplayMode *mode = SDL_GetDesktopDisplayMode(display); if (mode) { - printf("Native resolution: %dx%d @ %d Hz\n", mode->w, mode->h, mode->refresh_rate); + printf("Native resolution: %ix%i @ %f Hz\n", mode->w, mode->h, mode->refresh_rate); } screen_fullscreen = true; sdl_window = SDL_CreateWindow(screen_title.c_str(), mode->w, mode->h, SDL_WINDOW_FULLSCREEN);