Merge branch 'master' into blender2.8
[blender.git] / build_files / cmake / platform / platform_win32.cmake
index bfbc8d90859c89a93fc496aa49b657d5310830c6..c45e8ad533dc135d8ed90df7062f0d34a60bfd98 100644 (file)
@@ -548,7 +548,7 @@ set(WINTAB_INC ${LIBDIR}/wintab/include)
 if(WITH_OPENAL)
        set(OPENAL ${LIBDIR}/openal)
        set(OPENALDIR ${LIBDIR}/openal)
 if(WITH_OPENAL)
        set(OPENAL ${LIBDIR}/openal)
        set(OPENALDIR ${LIBDIR}/openal)
-       set(OPENAL_INCLUDE_DIR ${OPENAL}/include)
+       set(OPENAL_INCLUDE_DIR ${OPENAL}/include/AL)
        set(OPENAL_LIBPATH ${OPENAL}/lib)
        if(MSVC)
                set(OPENAL_LIBRARY ${OPENAL_LIBPATH}/openal32.lib)
        set(OPENAL_LIBPATH ${OPENAL}/lib)
        if(MSVC)
                set(OPENAL_LIBRARY ${OPENAL_LIBPATH}/openal32.lib)
@@ -559,11 +559,10 @@ if(WITH_OPENAL)
 endif()
 
 if(WITH_CODEC_SNDFILE)
 endif()
 
 if(WITH_CODEC_SNDFILE)
-       set(SNDFILE ${LIBDIR}/sndfile)
-       set(SNDFILE_INCLUDE_DIRS ${SNDFILE}/include)
-       set(SNDFILE_LIBPATH ${SNDFILE}/lib) # TODO, deprecate
-       set(SNDFILE_LIBRARIES ${SNDFILE_LIBPATH}/libsndfile-1.lib)
-
+       set(LIBSNDFILE ${LIBDIR}/sndfile)
+       set(LIBSNDFILE_INCLUDE_DIRS ${LIBSNDFILE}/include)
+       set(LIBSNDFILE_LIBPATH ${LIBSNDFILE}/lib) # TODO, deprecate
+       set(LIBSNDFILE_LIBRARIES ${LIBSNDFILE_LIBPATH}/libsndfile-1.lib)
 endif()
 
 if(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD)
 endif()
 
 if(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD)