diff --git a/CMakeLists.txt b/CMakeLists.txt index 839b56c..be15d01 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}/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}) 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) 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 diff --git a/scripts/WindowsSetup.bat b/scripts/WindowsSetup.bat index dfe4813..c1714f6 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/z/0//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