diff --git a/CMakeLists.txt b/CMakeLists.txt index 997abc02b..2a26de4a0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -136,6 +136,7 @@ option(WITH_INSTRUMENTS "Install instruments" ON) option(WITH_WAVETABLES "Install wavetables" ON) option(SHOW_OPEN_ASSETS_MENU_ENTRY "Show option to open built-in assets directory (on supported platforms)" OFF) option(CONSOLE_SUBSYSTEM "Build Furnace with Console subsystem on Windows" OFF) +option(FORCE_CODEVIEW "Force -gcodeview on MinGW GCC" OFF) option(FLATPAK_WORKAROUNDS "Enable Flatpak-specific workaround for system file picker" OFF) if (APPLE) option(FORCE_APPLE_BIN "Force enable binary installation to /bin" OFF) @@ -1116,7 +1117,7 @@ if (USE_BACKWARD) if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang") include(CheckCXXCompilerFlag) check_cxx_compiler_flag(-gcodeview GCC_CODEVIEW) - if (GCC_CODEVIEW) + if (GCC_CODEVIEW OR FORCE_CODEVIEW) set(CMAKE_EXE_LINKER_FLAGS "-Wl,--pdb= ") add_compile_options(-gcodeview) message(STATUS "Enabling -gcodeview flag for backward-cpp.") diff --git a/README.md b/README.md index 261893593..5119f494a 100644 --- a/README.md +++ b/README.md @@ -446,7 +446,8 @@ also make sure you've installed the rest of dependencies so you don't hit one of #### Compatibility with CMake < 3.5 has been removed from CMake -CMake 4.0 has removed support for cmake\_minimum\_required earlier than 3.5. Furnace 0.6.8 has been updated for this, but if you are building an older version, pass `-DCMAKE_POLICY_VERSION_MINIMUM=3.5` to CMake so you can force it to succeed. +immediately report this issue. +patch out every CMakeLists.txt and change the cmake\_minimum\_required() to comply for now. ### Furnace errors diff --git a/res/docpdf/make_paper.py b/res/docpdf/make_paper.py index 7f0800918..8ea827bc1 100644 --- a/res/docpdf/make_paper.py +++ b/res/docpdf/make_paper.py @@ -325,7 +325,7 @@ if __name__ == "__main__":

Furnace
User Manual

- for version 0.6.8 + for version 0.6.8.1
@@ -348,7 +348,7 @@ if __name__ == "__main__":

this documentation is under the Creative Commons Attribution 3.0 Unported license.

you may reproduce, modify and/or distribute this documentation provided this copyright notice (including license and attribution) is present and any necessary disclaimers whether modifications have been made.

this documentation is provided as-is and without warranty of any kind.

-

this manual is written for version 0.6.8 of Furnace.
it may not necessarily apply to previous or future versions.

+

this manual is written for version 0.6.8.1 of Furnace.
it may not necessarily apply to previous or future versions.

%s diff --git a/res/releaseReadme/stable-linux.txt b/res/releaseReadme/stable-linux.txt index eb3ddfe8b..1562bd070 100644 --- a/res/releaseReadme/stable-linux.txt +++ b/res/releaseReadme/stable-linux.txt @@ -16,7 +16,7 @@ if you find issues (e.g. bugs or annoyances), report them. links below. - Furnace on GitHub (project page and issue tracker): https://github.com/tildearrow/furnace - issues: https://github.com/tildearrow/furnace/issues - discussion: https://github.com/tildearrow/furnace/discussions -- online manual: https://tildearrow.org/furnace/doc/v0.6.8/ +- online manual: https://tildearrow.org/furnace/doc/v0.6.8.1/ - Furnace on Discord: https://discord.gg/QhA26dXD23 # notes diff --git a/res/releaseReadme/stable-mac.txt b/res/releaseReadme/stable-mac.txt index da689d5e2..b40ebe60b 100644 --- a/res/releaseReadme/stable-mac.txt +++ b/res/releaseReadme/stable-mac.txt @@ -26,7 +26,7 @@ if you find issues (e.g. bugs or annoyances), report them. links below. - Furnace on GitHub (project page and issue tracker): https://github.com/tildearrow/furnace - issues: https://github.com/tildearrow/furnace/issues - discussion: https://github.com/tildearrow/furnace/discussions -- online manual: https://tildearrow.org/furnace/doc/v0.6.8/ +- online manual: https://tildearrow.org/furnace/doc/v0.6.8.1/ - Furnace on Discord: https://discord.gg/QhA26dXD23 # notes diff --git a/res/releaseReadme/stable-win.txt b/res/releaseReadme/stable-win.txt index f9a0ce213..f49ca4bb5 100644 --- a/res/releaseReadme/stable-win.txt +++ b/res/releaseReadme/stable-win.txt @@ -16,7 +16,7 @@ if you find issues (e.g. bugs or annoyances), report them. links below. - Furnace on GitHub (project page and issue tracker): https://github.com/tildearrow/furnace - issues: https://github.com/tildearrow/furnace/issues - discussion: https://github.com/tildearrow/furnace/discussions -- online manual: https://tildearrow.org/furnace/doc/v0.6.8/ +- online manual: https://tildearrow.org/furnace/doc/v0.6.8.1/ - Furnace on Discord: https://discord.gg/QhA26dXD23 # notes diff --git a/scripts/release-win32.sh b/scripts/release-win32.sh index cc5a3c232..fe909c544 100755 --- a/scripts/release-win32.sh +++ b/scripts/release-win32.sh @@ -3,7 +3,8 @@ # this script shall be run from Arch Linux with MinGW installed! if [ ! -e /tmp/furnace ]; then - ln -s "$PWD" /tmp/furnace || exit 1 + mkdir /tmp/furnace || exit 1 + sudo mount --bind $PWD /tmp/furnace || exit 1 fi cd /tmp/furnace @@ -15,7 +16,7 @@ fi cd win32build # TODO: potential Arch-ism? -i686-w64-mingw32-cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_C_FLAGS="-O2 -march=i586" -DCMAKE_CXX_FLAGS="-O2 -Wall -Wextra -Wno-unused-parameter -Wno-cast-function-type -march=i586" -DBUILD_SHARED_LIBS=OFF -DSUPPORT_XP=OFF -DWITH_RENDER_DX11=ON -DUSE_BACKWARD=ON -DSDL_SSE=OFF -DSDL_SSE2=OFF -DSDL_SSE3=OFF -DENABLE_SSE=OFF -DENABLE_SSE2=OFF -DENABLE_AVX=OFF -DENABLE_AVX2=OFF -DWITH_LOCALE=ON -DUSE_MOMO=ON .. || exit 1 +i686-w64-mingw32-cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_C_FLAGS="-O2 -march=i586" -DCMAKE_CXX_FLAGS="-O2 -Wall -Wextra -Wno-unused-parameter -Wno-cast-function-type -march=i586" -DBUILD_SHARED_LIBS=OFF -DSUPPORT_XP=OFF -DWITH_RENDER_DX11=ON -DUSE_BACKWARD=ON -DSDL_SSE=OFF -DSDL_SSE2=OFF -DSDL_SSE3=OFF -DENABLE_SSE=OFF -DENABLE_SSE2=OFF -DENABLE_AVX=OFF -DENABLE_AVX2=OFF -DWITH_LOCALE=ON -DUSE_MOMO=ON -DFORCE_CODEVIEW=ON .. || exit 1 make -j8 || exit 1 cd .. @@ -25,6 +26,7 @@ cd release/win32 cp ../../LICENSE LICENSE.txt || exit 1 cp ../../win32build/furnace.exe . || exit 1 +cp ../../win32build/furnace.pdb . || echo "WARNING: NO PDB FILE FOUND" cp ../../res/releaseReadme/stable-win.txt README.txt || exit 1 cp -r ../../papers papers || exit 1 cp -r ../../demos demos || exit 1 diff --git a/scripts/release-win64.sh b/scripts/release-win64.sh index fbc79bbad..de046941c 100755 --- a/scripts/release-win64.sh +++ b/scripts/release-win64.sh @@ -3,7 +3,9 @@ # this script shall be run from Arch Linux with MinGW installed! if [ ! -e /tmp/furnace ]; then - ln -s "$PWD" /tmp/furnace || exit 1 + mkdir /tmp/furnace || exit 1 + sudo mount --bind $PWD /tmp/furnace || exit 1 + #ln -s "$PWD" /tmp/furnace || exit 1 fi cd /tmp/furnace @@ -15,7 +17,7 @@ fi cd winbuild # TODO: potential Arch-ism? -x86_64-w64-mingw32-cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_C_FLAGS="-O2" -DCMAKE_CXX_FLAGS="-O2 -Wall -Wextra -Wno-unused-parameter -Wno-cast-function-type -Wno-deprecated-declarations -Werror" -DWITH_LOCALE=ON -DUSE_MOMO=ON -DUSE_BACKWARD=ON .. || exit 1 +x86_64-w64-mingw32-cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_C_FLAGS="-O2" -DCMAKE_CXX_FLAGS="-O2 -Wall -Wextra -Wno-unused-parameter -Wno-cast-function-type -Wno-deprecated-declarations -Werror" -DWITH_LOCALE=ON -DUSE_MOMO=ON -DUSE_BACKWARD=ON -DFORCE_CODEVIEW=ON .. || exit 1 make -j8 || exit 1 cd .. @@ -25,6 +27,7 @@ cd release/windows cp ../../LICENSE LICENSE.txt || exit 1 cp ../../winbuild/furnace.exe . || exit 1 +cp ../../winbuild/furnace.pdb . || echo "WARNING: NO PDB FILE FOUND" cp ../../res/releaseReadme/stable-win.txt README.txt || exit 1 cp -r ../../papers papers || exit 1 cp -r ../../demos demos || exit 1 diff --git a/scripts/release-winconsole.sh b/scripts/release-winconsole.sh index a506617a3..4ccce0881 100755 --- a/scripts/release-winconsole.sh +++ b/scripts/release-winconsole.sh @@ -3,7 +3,8 @@ # this script shall be run from Arch Linux with MinGW installed! if [ ! -e /tmp/furnace ]; then - ln -s "$PWD" /tmp/furnace || exit 1 + mkdir /tmp/furnace || exit 1 + sudo mount --bind $PWD /tmp/furnace || exit 1 fi cd /tmp/furnace @@ -15,7 +16,7 @@ fi cd winCbuild # TODO: potential Arch-ism? -x86_64-w64-mingw32-cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_C_FLAGS="-O2" -DCMAKE_CXX_FLAGS="-O2 -Wall -Wextra -Wno-unused-parameter -Wno-cast-function-type -Wno-deprecated-declarations -Werror" -DUSE_BACKWARD=ON -DCONSOLE_SUBSYSTEM=ON -DWITH_LOCALE=ON -DUSE_MOMO=ON .. || exit 1 +x86_64-w64-mingw32-cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_C_FLAGS="-O2" -DCMAKE_CXX_FLAGS="-O2 -Wall -Wextra -Wno-unused-parameter -Wno-cast-function-type -Wno-deprecated-declarations -Werror" -DUSE_BACKWARD=ON -DCONSOLE_SUBSYSTEM=ON -DWITH_LOCALE=ON -DUSE_MOMO=ON -DFORCE_CODEVIEW=ON .. || exit 1 make -j8 || exit 1 cd .. @@ -25,6 +26,7 @@ cd release/winconsole cp ../../LICENSE LICENSE.txt || exit 1 cp ../../winCbuild/furnace.exe . || exit 1 +cp ../../winCbuild/furnace.pdb . || echo "WARNING: NO PDB FILE FOUND" cp ../../res/releaseReadme/stable-win.txt README.txt || exit 1 cp -r ../../papers papers || exit 1 cp -r ../../demos demos || exit 1 diff --git a/scripts/release-winxp.sh b/scripts/release-winxp.sh index 904fdca7d..33bab73c7 100755 --- a/scripts/release-winxp.sh +++ b/scripts/release-winxp.sh @@ -3,7 +3,8 @@ # this script shall be run from Arch Linux with MinGW installed! if [ ! -e /tmp/furnace ]; then - ln -s "$PWD" /tmp/furnace || exit 1 + mkdir /tmp/furnace || exit 1 + sudo mount --bind $PWD /tmp/furnace || exit 1 fi cd /tmp/furnace @@ -15,7 +16,7 @@ fi cd xpbuild # TODO: potential Arch-ism? -i686-w64-mingw32-cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_C_FLAGS="-O2" -DCMAKE_CXX_FLAGS="-O2 -Wall -Wextra -Wno-unused-parameter -Wno-cast-function-type" -DBUILD_SHARED_LIBS=OFF -DSUPPORT_XP=ON -DWITH_RENDER_DX11=OFF -DSDL_SSE=OFF -DSDL_SSE2=OFF -DSDL_SSE3=OFF -DENABLE_SSE=OFF -DENABLE_SSE2=OFF -DENABLE_AVX=OFF -DENABLE_AVX2=OFF -DUSE_BACKWARD=ON -DCONSOLE_SUBSYSTEM=OFF -DWITH_LOCALE=ON -DUSE_MOMO=ON .. || exit 1 +i686-w64-mingw32-cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_C_FLAGS="-O2" -DCMAKE_CXX_FLAGS="-O2 -Wall -Wextra -Wno-unused-parameter -Wno-cast-function-type" -DBUILD_SHARED_LIBS=OFF -DSUPPORT_XP=ON -DWITH_RENDER_DX11=OFF -DSDL_SSE=OFF -DSDL_SSE2=OFF -DSDL_SSE3=OFF -DENABLE_SSE=OFF -DENABLE_SSE2=OFF -DENABLE_AVX=OFF -DENABLE_AVX2=OFF -DUSE_BACKWARD=ON -DCONSOLE_SUBSYSTEM=OFF -DWITH_LOCALE=ON -DUSE_MOMO=ON -DFORCE_CODEVIEW=ON .. || exit 1 make -j8 || exit 1 cd .. @@ -25,6 +26,7 @@ cd release/winxp cp ../../LICENSE LICENSE.txt || exit 1 cp ../../xpbuild/furnace.exe . || exit 1 +cp ../../xpbuild/furnace.pdb . || echo "WARNING: NO PDB FILE FOUND" cp ../../res/releaseReadme/stable-win.txt README.txt || exit 1 cp -r ../../papers papers || exit 1 cp -r ../../demos demos || exit 1