From 9c6d7766e9fceca9e988cfb057bee4b820840e33 Mon Sep 17 00:00:00 2001 From: Richard Date: Wed, 31 Mar 2021 03:24:18 +0100 Subject: update FindCsound.cmake --- cmake/Modules/FindCsound.cmake | 17 +++++++++++------ 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(csound, "dbarray_kb", csnd::thread::ik); csnd::plugin(csound, "dbarray_kb.S", csnd::thread::ik); -} \ No newline at end of file +} -- cgit v1.2.3