diff options
| author | Richard <q@1bpm.net> | 2021-03-31 03:24:18 +0100 |
|---|---|---|
| committer | Richard <q@1bpm.net> | 2021-03-31 03:24:18 +0100 |
| commit | 9c6d7766e9fceca9e988cfb057bee4b820840e33 (patch) | |
| tree | 6f4c29a878d8e89b69e61a691b04a64d5a12df09 | |
| parent | c5c3a919f4abca8208c4b9e33a34161e0d88ebb1 (diff) | |
| download | csound-sqldb-9c6d7766e9fceca9e988cfb057bee4b820840e33.tar.gz csound-sqldb-9c6d7766e9fceca9e988cfb057bee4b820840e33.tar.bz2 csound-sqldb-9c6d7766e9fceca9e988cfb057bee4b820840e33.zip | |
update FindCsound.cmake
| -rw-r--r-- | cmake/Modules/FindCsound.cmake | 17 | ||||
| -rw-r--r-- | src/opcodes.cpp | 2 |
2 files changed, 12 insertions, 7 deletions
diff --git a/cmake/Modules/FindCsound.cmake b/cmake/Modules/FindCsound.cmake index e55b269..b5631c9 100644 --- a/cmake/Modules/FindCsound.cmake +++ b/cmake/Modules/FindCsound.cmake @@ -5,17 +5,22 @@ # CSOUND_LIBRARIES - The libraries needed to use the Csound library. if(APPLE) -find_path(CSOUND_INCLUDE_DIR csound.h HINTS /Library/Frameworks/CsoundLib64.framework/Headers -"$ENV{HOME}/Library/Frameworks/CsoundLib64.framework/Headers") + find_path(CSOUND_INCLUDE_DIR csound.h HINTS /Library/Frameworks/CsoundLib64.framework/Headers + "$ENV{HOME}/Library/Frameworks/CsoundLib64.framework/Headers") +elseif(WIN32) + find_path(CSOUND_INCLUDE_DIR csound.h PATH_SUFFIXES csound + HINTS "c:\\Program Files\\Csound6_x64\\include") else() -find_path(CSOUND_INCLUDE_DIR csound.h PATH_SUFFIXES csound) + find_path(CSOUND_INCLUDE_DIR csound.h PATH_SUFFIXES csound) endif() if(APPLE) -find_library(CSOUND_LIBRARY NAMES CsoundLib64 HINTS /Library/Frameworks/CsoundLib64.framework/ -"$ENV{HOME}/Library/Frameworks/CsoundLib64.framework") + find_library(CSOUND_LIBRARY NAMES CsoundLib64 HINTS /Library/Frameworks/CsoundLib64.framework/ + "$ENV{HOME}/Library/Frameworks/CsoundLib64.framework") +elseif(WIN32) + find_library(CSOUND_LIBRARY NAMES csound64 HINTS "c:\\Program Files\\Csound6_x64\\lib") else() -find_library(CSOUND_LIBRARY NAMES csound64 csound) + find_library(CSOUND_LIBRARY NAMES csound64 csound) endif() include(FindPackageHandleStandardArgs) diff --git a/src/opcodes.cpp b/src/opcodes.cpp index 3527f83..94831f5 100644 --- a/src/opcodes.cpp +++ b/src/opcodes.cpp @@ -746,4 +746,4 @@ void csnd::on_load(csnd::Csound *csound) { csnd::plugin<dbarray_kb>(csound, "dbarray_kb", csnd::thread::ik); csnd::plugin<dbarraystr_kb>(csound, "dbarray_kb.S", csnd::thread::ik); -}
\ No newline at end of file +} |