From 7687a84f2c8a7ff82b8f1ce9dcff446cdf7e2f42 Mon Sep 17 00:00:00 2001 From: LaurentGom Date: Mon, 13 Dec 2010 21:01:49 +0000 Subject: [PATCH] Fixed the sndfile.h issue on Mac OS X git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1755 4e206d99-4929-0410-ac5d-dfc041789085 --- .../{libs-osx/include => headers/libsndfile/osx}/sndfile.h | 0 extlibs/headers/{ => libsndfile/windows}/sndfile.h | 0 src/SFML/Audio/CMakeLists.txt | 5 +++-- 3 files changed, 3 insertions(+), 2 deletions(-) rename extlibs/{libs-osx/include => headers/libsndfile/osx}/sndfile.h (100%) rename extlibs/headers/{ => libsndfile/windows}/sndfile.h (100%) diff --git a/extlibs/libs-osx/include/sndfile.h b/extlibs/headers/libsndfile/osx/sndfile.h similarity index 100% rename from extlibs/libs-osx/include/sndfile.h rename to extlibs/headers/libsndfile/osx/sndfile.h diff --git a/extlibs/headers/sndfile.h b/extlibs/headers/libsndfile/windows/sndfile.h similarity index 100% rename from extlibs/headers/sndfile.h rename to extlibs/headers/libsndfile/windows/sndfile.h diff --git a/src/SFML/Audio/CMakeLists.txt b/src/SFML/Audio/CMakeLists.txt index f30fdad4..f3af0009 100644 --- a/src/SFML/Audio/CMakeLists.txt +++ b/src/SFML/Audio/CMakeLists.txt @@ -30,9 +30,10 @@ set(SRC # let CMake know about our additional audio libraries paths (on Windows and OSX) if(WINDOWS) - set(CMAKE_INCLUDE_PATH ${CMAKE_INCLUDE_PATH} "${CMAKE_SOURCE_DIR}/extlibs/headers/AL") + set(CMAKE_INCLUDE_PATH ${CMAKE_INCLUDE_PATH} "${CMAKE_SOURCE_DIR}/extlibs/headers/AL") + set(CMAKE_INCLUDE_PATH ${CMAKE_INCLUDE_PATH} "${CMAKE_SOURCE_DIR}/extlibs/headers/libsndfile/windows") elseif (MACOSX) - set(CMAKE_INCLUDE_PATH ${CMAKE_INCLUDE_PATH} "${CMAKE_SOURCE_DIR}/extlibs/libs-osx/include") + set(CMAKE_INCLUDE_PATH ${CMAKE_INCLUDE_PATH} "${CMAKE_SOURCE_DIR}/extlibs/headers/libsndfile/osx") set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} "${CMAKE_SOURCE_DIR}/extlibs/libs-osx/Frameworks") endif()