diff --git a/.gitignore b/.gitignore index 378eac2..7b94ee2 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,7 @@ +*.rej +*.orig +.DS_Store +*.ini build +*.*~ +*.o diff --git a/CMakeLists.txt b/CMakeLists.txt index c44b16a..e28e6d6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,6 +11,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_AUTOMOC ON) include(GNUInstallDirs) set(CMAKE_AUTOUIC ON) +set(CMAKE_AUTORCC ON) set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD_REQUIRED ON) @@ -26,6 +27,7 @@ add_executable(samplebrain WIN32 MACOSX_BUNDLE app/feedback.cpp app/process_thread.cpp app/qtmain.cpp + app/samplebrain.qrc app/sound_items.cpp brain/src/aquila/filter/MelFilter.cpp brain/src/aquila/filter/MelFilterBank.cpp @@ -69,26 +71,6 @@ if(OpenMP_CXX_FOUND) target_link_libraries(samplebrain PUBLIC OpenMP::OpenMP_CXX) endif() - -# Resources: -set(samplebrain_resource_files - "app/images/at.png" - "app/images/pause.png" - "app/images/play.png" - "app/images/record.png" - "app/images/settings.png" - "app/images/stop.png" -) - -qt5_add_resources(samplebrain "samplebrain" - PREFIX - "/images" - #BASE - # "app" - FILES - ${samplebrain_resource_files} -) - install(TARGETS samplebrain BUNDLE DESTINATION . RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}