diff --git a/CMakeLists.txt b/CMakeLists.txt index 322693f5..9a6dcd0e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,20 +15,22 @@ endif() add_subdirectory(extern/fmt) -set(BUILD_TESTING OFF FORCE) -set(BUILD_PROGRAMS OFF FORCE) -set(BUILD_EXAMPLES OFF FORCE) -set(ENABLE_EXTERNAL_LIBS OFF FORCE) -set(ENABLE_MPEG OFF FORCE) +set(BUILD_TESTING OFF CACHE BOOL "aaaaaa" FORCE) +set(BUILD_PROGRAMS OFF CACHE BOOL "aaa" FORCE) +set(BUILD_EXAMPLES OFF CACHE BOOL "a" FORCE) +set(ENABLE_EXTERNAL_LIBS OFF CACHE BOOL "come on" FORCE) +set(ENABLE_MPEG OFF CACHE BOOL "come on" FORCE) add_subdirectory(extern/libsndfile) +add_subdirectory(extern/zlib) + +include_directories(extern/zlib ${CMAKE_CURRENT_BINARY_DIR}/extern/zlib) if (WIN32) set(SDL_SHARED OFF) add_subdirectory(extern/SDL) - add_subdirectory(extern/zlib) set(HAVE_SDL2 SDL2-static) set(HAVE_Z zlibstatic) - include_directories(extern/imgui extern/IconFontCppHeaders extern/imgui/backends extern/igfd extern/zlib ${CMAKE_CURRENT_BINARY_DIR}/extern/zlib extern/fmt/include) + include_directories(extern/imgui extern/IconFontCppHeaders extern/imgui/backends extern/igfd extern/fmt/include) else() if (BUILD_GUI) set(SDL_SHARED ON) @@ -45,8 +47,8 @@ else() if (NOT APPLE) find_library(HAVE_JACK jack) endif() - find_library(HAVE_Z z) find_library(HAVE_SNDFILE sndfile) + set(HAVE_Z zlibstatic) endif() set(AUDIO_SOURCES src/audio/abstract.cpp) diff --git a/res/furnace.desktop b/res/furnace.desktop index ff8ce146..67e83996 100644 --- a/res/furnace.desktop +++ b/res/furnace.desktop @@ -5,4 +5,4 @@ Icon=furnace Exec=furnace Terminal=false Type=Application -Categories=Audio; +Categories=AudioVideo;Audio; diff --git a/scripts/release-linux.sh b/scripts/release-linux.sh new file mode 100755 index 00000000..a3c945da --- /dev/null +++ b/scripts/release-linux.sh @@ -0,0 +1,43 @@ +#!/bin/bash +# make linux release + +if [ ! -e /tmp/furnace ]; then + ln -s "$PWD" /tmp/furnace || exit 1 +fi + +cd /tmp/furnace + +if [ ! -e linuxbuild ]; then + mkdir linuxbuild || exit 1 +fi + +cd linuxbuild + +cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS="-O2" -DCMAKE_CXX_FLAGS="-O2 -Wall -Wextra -Wno-unused-parameter -Werror" .. || exit 1 +make -j4 || exit 1 + +cd .. + +mkdir -p release/linux/furnace.AppDir || exit 1 +cd linuxbuild + +make DESTDIR=/tmp/furnace/release/linux/furnace.AppDir install || exit 1 + +cd ../release/linux/furnace.AppDir + +cp ../../../res/logo.png furnace.png || exit 1 +ln -s furnace.png .DirIcon || exit 1 +cp ../../../res/furnace.desktop . || exit 1 +cp ../../../res/AppRun . || exit 1 + +cp /usr/lib/libm.so.6 usr/lib/ || exit 1 +cp /usr/lib/libstdc++.so.6 usr/lib/ || exit 1 +cp /usr/lib/libc.so.6 usr/lib/ || exit 1 +cp /usr/lib/libgcc_s.so.1 usr/lib/ || exit 1 + +cd .. + +[ -e appimagetool-x86_64.AppImage ] || { wget "https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage" && chmod 755 appimagetool-x86_64.AppImage; } +ARCH=$(uname -m) ./appimagetool-x86_64.AppImage furnace.AppDir + +#zip -r furnace.zip LICENSE.txt Furnace*.dmg README.txt papers