From c04f123344b1a045d3236f89b43ec1bd1110c14e Mon Sep 17 00:00:00 2001 From: tildearrow Date: Sat, 25 Feb 2023 00:43:27 -0500 Subject: [PATCH 1/6] fix critical bug that breaks initial system it was caused by the intro... --- src/engine/engine.cpp | 2 ++ src/gui/settings.cpp | 1 + 2 files changed, 3 insertions(+) diff --git a/src/engine/engine.cpp b/src/engine/engine.cpp index 85effd03c..8efde4e39 100644 --- a/src/engine/engine.cpp +++ b/src/engine/engine.cpp @@ -1481,6 +1481,7 @@ void DivEngine::createNewFromDefaults() { bool oldVol=getConfInt("configVersion",DIV_ENGINE_VERSION)<135; if (preset.empty()) { // try loading old preset + logD("trying to load old preset"); preset=decodeSysDesc(getConfString("initialSys","")); oldVol=false; } @@ -4468,6 +4469,7 @@ bool DivEngine::init() { bool oldVol=getConfInt("configVersion",DIV_ENGINE_VERSION)<135; if (preset.empty()) { // try loading old preset + logD("trying to load old preset"); preset=decodeSysDesc(getConfString("initialSys","")); oldVol=false; } diff --git a/src/gui/settings.cpp b/src/gui/settings.cpp index 1ee4fdd7e..c98ef7cbb 100644 --- a/src/gui/settings.cpp +++ b/src/gui/settings.cpp @@ -2758,6 +2758,7 @@ void FurnaceGUI::syncSettings() { settings.initialSys.set(fmt::sprintf("pan%d",i),newPan); } e->setConf("initialSys2",settings.initialSys.toBase64()); + e->setConf("configVersion",DIV_ENGINE_VERSION); } } From e3bebdca08d2228a96d86be3cb02ac260e1c8927 Mon Sep 17 00:00:00 2001 From: tildearrow Date: Sat, 25 Feb 2023 01:47:19 -0500 Subject: [PATCH 2/6] release v0.6pre4-hotfix --- src/engine/engine.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/engine/engine.h b/src/engine/engine.h index 298ef958a..4b2a1b3d7 100644 --- a/src/engine/engine.h +++ b/src/engine/engine.h @@ -47,8 +47,8 @@ #define BUSY_BEGIN_SOFT softLocked=true; isBusy.lock(); #define BUSY_END isBusy.unlock(); softLocked=false; -#define DIV_VERSION "0.6pre4" -#define DIV_ENGINE_VERSION 143 +#define DIV_VERSION "0.6pre5" +#define DIV_ENGINE_VERSION 144 // for imports #define DIV_VERSION_MOD 0xff01 #define DIV_VERSION_FC 0xff02 From c139d7d7fa7d22012b107993945457c7d90daa9b Mon Sep 17 00:00:00 2001 From: tildearrow Date: Sat, 25 Feb 2023 01:48:51 -0500 Subject: [PATCH 3/6] oh crap - this is the real pre4-hotfix --- src/engine/engine.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/engine/engine.h b/src/engine/engine.h index 4b2a1b3d7..32d4c9fad 100644 --- a/src/engine/engine.h +++ b/src/engine/engine.h @@ -47,7 +47,7 @@ #define BUSY_BEGIN_SOFT softLocked=true; isBusy.lock(); #define BUSY_END isBusy.unlock(); softLocked=false; -#define DIV_VERSION "0.6pre5" +#define DIV_VERSION "0.6pre4-hotfix" #define DIV_ENGINE_VERSION 144 // for imports #define DIV_VERSION_MOD 0xff01 From 9c4016b86c3ba5167421e41119537cf6c56f6562 Mon Sep 17 00:00:00 2001 From: tildearrow Date: Sat, 25 Feb 2023 01:54:51 -0500 Subject: [PATCH 4/6] GUI: add intro tune credits --- src/gui/about.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/gui/about.cpp b/src/gui/about.cpp index f156e83fd..abed9c422 100644 --- a/src/gui/about.cpp +++ b/src/gui/about.cpp @@ -34,6 +34,7 @@ const char* aboutLine[]={ "", "-- program --", "tildearrow", + "A M 4 N (intro tune)", "akumanatt", "cam900", "djtuBIG-MaliceX", From f9cbf17a07f9503aecdac3fe0b9496ad3f8f0036 Mon Sep 17 00:00:00 2001 From: James Alan Nguyen Date: Sat, 25 Feb 2023 19:20:51 +1100 Subject: [PATCH 5/6] Issue #643 - Rewrite CLI vs GUI strategy (this matches DefleMask) --- CMakeLists.txt | 4 +++- src/main.cpp | 12 +++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f994cfd55..5eddbf1bf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -780,13 +780,15 @@ endif() if(ANDROID AND NOT TERMUX) add_library(furnace SHARED ${USED_SOURCES}) +elseif(WIN32) + add_executable(furnace WIN32 ${USED_SOURCES}) else() add_executable(furnace ${USED_SOURCES}) endif() target_include_directories(furnace SYSTEM PRIVATE ${DEPENDENCIES_INCLUDE_DIRS}) target_compile_definitions(furnace PRIVATE ${DEPENDENCIES_DEFINES} IMGUI_USER_CONFIG="imconfig_fur.h") -target_compile_options(furnace PRIVATE ${DEPENDENCIES_COMPILE_OPTIONS}) +target_compile_options(furnace PRIVATE ${DEPENDENCIES_COMPILE_OPfTIONS}) target_link_libraries(furnace PRIVATE ${DEPENDENCIES_LIBRARIES}) if (PKG_CONFIG_FOUND AND (SYSTEM_FMT OR SYSTEM_LIBSNDFILE OR SYSTEM_ZLIB OR SYSTEM_SDL2 OR SYSTEM_RTMIDI OR WITH_JACK)) if ("${CMAKE_VERSION}" VERSION_LESS "3.13") diff --git a/src/main.cpp b/src/main.cpp index d8cc440b6..6ebedae31 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -342,12 +342,14 @@ void reportError(String what) { // TODO: CoInitializeEx on Windows? // TODO: add crash log int main(int argc, char** argv) { - // Windows console thing - thanks MarioKart7z! + // Windows console thing - thanks dj.tuBIG/MaliceX #ifdef _WIN32 - DWORD winPID; - HWND winConsole=GetConsoleWindow(); - GetWindowThreadProcessId(winConsole,&winPID); - if (GetCurrentProcessId()==winPID) FreeConsole(); + + if (AttachConsole(ATTACH_PARENT_PROCESS)) { + freopen("CONOUT$", "w", stdout); + freopen("CONOUT$", "w", stderr); + freopen("CONIN$", "r", stdin); + } #endif initLog(); From 16ccd4f8fe685f4e0b5bb5a67ec2bd3e7d5bc919 Mon Sep 17 00:00:00 2001 From: James Alan Nguyen Date: Sat, 25 Feb 2023 19:26:27 +1100 Subject: [PATCH 6/6] typo --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5eddbf1bf..bd93c9191 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -788,7 +788,7 @@ endif() target_include_directories(furnace SYSTEM PRIVATE ${DEPENDENCIES_INCLUDE_DIRS}) target_compile_definitions(furnace PRIVATE ${DEPENDENCIES_DEFINES} IMGUI_USER_CONFIG="imconfig_fur.h") -target_compile_options(furnace PRIVATE ${DEPENDENCIES_COMPILE_OPfTIONS}) +target_compile_options(furnace PRIVATE ${DEPENDENCIES_COMPILE_OPTIONS}) target_link_libraries(furnace PRIVATE ${DEPENDENCIES_LIBRARIES}) if (PKG_CONFIG_FOUND AND (SYSTEM_FMT OR SYSTEM_LIBSNDFILE OR SYSTEM_ZLIB OR SYSTEM_SDL2 OR SYSTEM_RTMIDI OR WITH_JACK)) if ("${CMAKE_VERSION}" VERSION_LESS "3.13")