From f62bd1ed3072c5449aa4e584e15b49628bd5f4a0 Mon Sep 17 00:00:00 2001 From: Scott Duensing Date: Tue, 26 Mar 2024 20:24:48 -0500 Subject: [PATCH] Singe 2.10 Released! --- CHANGELOG | 2 +- build-all.sh | 22 +++++++++++++--------- src/embedded.h | 2 +- src/main.c | 4 +++- 4 files changed, 18 insertions(+), 12 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index a68eede21..e3eef63cc 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,7 +1,7 @@ SINGE 2.10 ========== - Released ...? + Released March 26th, 2024 New Features diff --git a/build-all.sh b/build-all.sh index 206760467..00f25410b 100755 --- a/build-all.sh +++ b/build-all.sh @@ -92,6 +92,7 @@ if [[ 1 == 1 ]]; then ../build/cmake make install popd +fi pushd thirdparty/SDL2 clearAndEnterBuild @@ -104,7 +105,7 @@ if [[ 1 == 1 ]]; then pushd thirdparty/SDL2_image clearAndEnterBuild - CFLAGS="-Iexternal/libpng -I${G_TARGET}/include" \ + CFLAGS="-Iexternal/libpng ${CFLAGS}" \ cmake ${COMMON} \ -DBUILD_SHARED_LIBS=off \ -DSDL2IMAGE_DEPS_SHARED=off \ @@ -388,9 +389,8 @@ if [[ 1 == 1 ]]; then createEmbeddedBinary assets/Menu.singe ${G_GENERATED}/Menu_singe.h MENU_SINGE_H # === Singe Manual === - lyx -batch -f all -E pdf ${G_GENERATED}/Manual.pdf assets/Manual.lyx - createEmbeddedBinary ${G_GENERATED}/Manual.pdf ${G_GENERATED}/Manual_pdf.h MANUAL_H -fi + #lyx -batch -f all -E pdf ${G_GENERATED}/Manual.pdf assets/Manual.lyx + #createEmbeddedBinary ${G_GENERATED}/Manual.pdf ${G_GENERATED}/Manual_pdf.h MANUAL_H pushd ${G_TARGET} clearAndEnterBuild @@ -554,12 +554,16 @@ sudo apt-get install -y \ libvdpau-dev \ upx-ucl -buildAll linux x86_64 2>&1 | tee ${G_BUILDDIR}/linux-x86_64.log -buildAll windows x86_64 2>&1 | tee ${G_BUILDDIR}/windows-x86_64.log -buildAll pi aarch64 2>&1 | tee ${G_BUILDDIR}/pi-aarch64.log -buildAll macos aarch64 2>&1 | tee ${G_BUILDDIR}/macos-aarch64.log +buildAll linux x86_64 2>&1 | tee ${G_BUILDDIR}/linux-x86_64.log +buildAll macos aarch64 2>&1 | tee ${G_BUILDDIR}/macos-aarch64.log +buildAll pi aarch64 2>&1 | tee ${G_BUILDDIR}/pi-aarch64.log +buildAll windows x86_64 2>&1 | tee ${G_BUILDDIR}/windows-x86_64.log + + +# === UNSUPPORTED === + +#buildAll macos x86_64 2>&1 | tee ${G_BUILDDIR}/macos-x86_64.log #buildAll linux x86 #buildAll macos x86 #***TODO*** Needs older SDL2 -#buildAll macos x86_64 #***TODO*** Needs older SDL2 #buildAll windows x86 diff --git a/src/embedded.h b/src/embedded.h index c117aba10..766cfc846 100644 --- a/src/embedded.h +++ b/src/embedded.h @@ -37,7 +37,7 @@ #include "generated/Menu_singe.h" #include "generated/FreeSansBold_ttf.h" #include "generated/menuBackground_mkv.h" -#include "generated/Manual_pdf.h" +//#include "generated/Manual_pdf.h" // LuaSocket #include "generated/ftp_lua.h" diff --git a/src/main.c b/src/main.c index 71365d881..1b07ab44c 100644 --- a/src/main.c +++ b/src/main.c @@ -721,7 +721,7 @@ void showHeader(void) { // 00000000011111111112222222222333333333344444444445555555555666666666677777777778 // 12345678901234567890123456789012345678901234567890123456789012345678901234567890 utilSay(" ___ ___ _ _ ___ ___"); - utilSay("/ __|_ _| \\| |/ __| __| Somewhat Interactive Nostalgic Game Engine %s B7", VERSION_STRING); + utilSay("/ __|_ _| \\| |/ __| __| Somewhat Interactive Nostalgic Game Engine %s", VERSION_STRING); utilSay("\\__ \\| || .` | (_ | _| Copyright (c) 2006-%s Scott C. Duensing", COPYRIGHT_END_YEAR); utilSay("|___/___|_|\\_|\\___|___| https://KangarooPunch.com https://SingeEngine.com"); utilSay(""); @@ -824,9 +824,11 @@ void unpackData(char *name) { created |= extractFile(temp, controls_cfg, controls_cfg_len); free(temp); // Singe/Manual.pdf + /* temp = utilCreateString("Singe%cManual.pdf", utilGetPathSeparator()); created |= extractFile(temp, Manual_pdf, Manual_pdf_len); free(temp); + */ // Singe/Menu.singe temp = utilCreateString("Singe%cMenu.singe", utilGetPathSeparator()); created |= extractFile(temp, Menu_singe, Menu_singe_len);