From 03efb3d44a560b3344b62feaaf2618a8970673b5 Mon Sep 17 00:00:00 2001 From: Asiern Date: Tue, 31 Aug 2021 09:31:56 +0200 Subject: [PATCH 1/5] fixed: build/ path --- scripts/FedoraSetup.sh | 2 +- scripts/UbuntuSetup.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/FedoraSetup.sh b/scripts/FedoraSetup.sh index 0ea5319..8c90cce 100755 --- a/scripts/FedoraSetup.sh +++ b/scripts/FedoraSetup.sh @@ -16,4 +16,4 @@ mv C/bass_fx.h ./bass_fx.h rm -rf C/ rm bass_fx24-linux.zip -cd .. && mkdir build && cd build && cmake .. \ No newline at end of file +cd ../.. && mkdir build && cd build && cmake .. \ No newline at end of file diff --git a/scripts/UbuntuSetup.sh b/scripts/UbuntuSetup.sh index ff6a92a..c407c0d 100755 --- a/scripts/UbuntuSetup.sh +++ b/scripts/UbuntuSetup.sh @@ -15,4 +15,4 @@ mv C/bass_fx.h ./bass_fx.h rm -rf C/ rm bass_fx24-linux.zip -cd .. && mkdir build && cd build && cmake .. \ No newline at end of file +cd ../.. && mkdir build && cd build && cmake .. \ No newline at end of file From d05cabed6126e38e41ecc8fafd9f5af85ec6ef32 Mon Sep 17 00:00:00 2001 From: Asiern Date: Tue, 31 Aug 2021 11:23:59 +0200 Subject: [PATCH 2/5] added: BASS FX --- scripts/WindowsSetup.bat | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/WindowsSetup.bat b/scripts/WindowsSetup.bat index dfe4813..993efe4 100644 --- a/scripts/WindowsSetup.bat +++ b/scripts/WindowsSetup.bat @@ -9,8 +9,12 @@ set WorkDir=%cd% Rem Download BASS bitsadmin /transfer BASS_Download /download /priority normal http://uk.un4seen.com/files/bass24.zip %WorkDir%\thirdparty\bass.zip +Rem Download BASS FX +bitsadmin /transfer BASS_FX_Download /download /priority normal http://uk.un4seen.com/files/bass_fx24.zip %WorkDir%\thirdparty\bass_fx.zip + Rem Unzip files powershell Expand-Archive %WorkDir%\thirdparty\bass.zip -DestinationPath %WorkDir%\thirdparty\BASS +powershell Expand-Archive %WorkDir%\thirdparty\bass_fx.zip -DestinationPath %WorkDir%\thirdparty\BASS_FX Rem Cleanup DEL %WorkDir%\thirdparty\*.zip From 6d8893026db505dcd1c801d049d1c87c58e3deb8 Mon Sep 17 00:00:00 2001 From: Asiern Date: Tue, 31 Aug 2021 11:26:16 +0200 Subject: [PATCH 3/5] added: BASS FX --- CMakeLists.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 839b56c..c1f3997 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -106,7 +106,10 @@ endif() add_library(BASS_FX SHARED IMPORTED) if(WIN32) - # TODO + set(BASS_FX_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/BASS_FX/C) + set(BASS_FX_LIBRARY ${CMAKE_SOURCE_DIR}/thirdparty/BASS_FX/C/x64/bass_fx.lib) + include_directories(${BASS_FX_INCLUDE_DIR}) + target_link_libraries(${PROJECT_NAME} ${BASS_FX_LIBRARY}) else() set_target_properties(BASS_FX PROPERTIES IMPORTED_LOCATION ${CMAKE_SOURCE_DIR}/thirdparty/BASS/x64/libbass_fx.so) target_include_directories(BASS_FX INTERFACE ${CMAKE_SOURCE_DIR}/thirdparty/BASS) From 1ff43990ca72ae27446ab70bb1826bb5b1aedb03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asier=20Nu=C3=B1ez?= <45818936+Asiern@users.noreply.github.com> Date: Sun, 5 Sep 2021 09:20:18 +0200 Subject: [PATCH 4/5] fixed: BASS_FX_INCLUDE path --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c1f3997..be15d01 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -106,7 +106,7 @@ endif() add_library(BASS_FX SHARED IMPORTED) if(WIN32) - set(BASS_FX_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/BASS_FX/C) + set(BASS_FX_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/thirdparty/BASS_FX/C) set(BASS_FX_LIBRARY ${CMAKE_SOURCE_DIR}/thirdparty/BASS_FX/C/x64/bass_fx.lib) include_directories(${BASS_FX_INCLUDE_DIR}) target_link_libraries(${PROJECT_NAME} ${BASS_FX_LIBRARY}) From 2f240d329797a17cc57173f41bb07d35105ef461 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asier=20Nu=C3=B1ez?= <45818936+Asiern@users.noreply.github.com> Date: Sun, 5 Sep 2021 09:20:33 +0200 Subject: [PATCH 5/5] fixed: BASS_FX url --- scripts/WindowsSetup.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/WindowsSetup.bat b/scripts/WindowsSetup.bat index 993efe4..c1714f6 100644 --- a/scripts/WindowsSetup.bat +++ b/scripts/WindowsSetup.bat @@ -10,7 +10,7 @@ Rem Download BASS bitsadmin /transfer BASS_Download /download /priority normal http://uk.un4seen.com/files/bass24.zip %WorkDir%\thirdparty\bass.zip Rem Download BASS FX -bitsadmin /transfer BASS_FX_Download /download /priority normal http://uk.un4seen.com/files/bass_fx24.zip %WorkDir%\thirdparty\bass_fx.zip +bitsadmin /transfer BASS_FX_Download /download /priority normal http://uk.un4seen.com/files/z/0//bass_fx24.zip %WorkDir%\thirdparty\bass_fx.zip Rem Unzip files powershell Expand-Archive %WorkDir%\thirdparty\bass.zip -DestinationPath %WorkDir%\thirdparty\BASS