- switch to use x64 libraries for Windows builds

2021-10-08 10:53:22 +03:00
parent 7420b7e0ec
commit 1d890b671d
9 changed files with 12 additions and 10 deletions
@@ -38,20 +38,22 @@ endif()
 if (CMAKE_SYSTEM MATCHES "Windows*")
    # Sndfile
    set (SNDFILE_INCLUDE     ${CMAKE_CURRENT_LIST_DIR}/sndfile/include)
-    set (SNDFILE_LIBS        ${CMAKE_CURRENT_LIST_DIR}/sndfile/win32/static/flac.lib
-                             ${CMAKE_CURRENT_LIST_DIR}/sndfile/win32/static/flac++.lib
-                             ${CMAKE_CURRENT_LIST_DIR}/sndfile/win32/static/libsndfile.lib
-                             ${CMAKE_CURRENT_LIST_DIR}/sndfile/win32/static/ogg.lib
-                             ${CMAKE_CURRENT_LIST_DIR}/sndfile/win32/static/vorbis.lib
-                             ${CMAKE_CURRENT_LIST_DIR}/sndfile/win32/static/vorbisfile.lib
-                             ${CMAKE_CURRENT_LIST_DIR}/sndfile/win32/static/vorbisenc.lib)
+    set (SNDFILE_LIBS        ${CMAKE_CURRENT_LIST_DIR}/sndfile/win64/static/FLAC.lib
+                             ${CMAKE_CURRENT_LIST_DIR}/sndfile/win64/static/flac++.lib
+                             ${CMAKE_CURRENT_LIST_DIR}/sndfile/win64/static/sndfile.lib
+                             ${CMAKE_CURRENT_LIST_DIR}/sndfile/win64/static/ogg.lib
+                             ${CMAKE_CURRENT_LIST_DIR}/sndfile/win64/static/vorbis.lib
+                             ${CMAKE_CURRENT_LIST_DIR}/sndfile/win64/static/vorbisfile.lib
+                             ${CMAKE_CURRENT_LIST_DIR}/sndfile/win64/static/vorbisenc.lib
+                             ${CMAKE_CURRENT_LIST_DIR}/sndfile/win64/static/opus.lib
+                             )
    # Opus libraries
    set (OPUS_INCLUDE        ${CMAKE_CURRENT_LIST_DIR}/opus/include)
-    set (OPUS_LIB            ${CMAKE_CURRENT_LIST_DIR}/opus/win32/${CMAKE_BUILD_TYPE}/opus.lib)
+    set (OPUS_LIB            ${CMAKE_CURRENT_LIST_DIR}/opus/win64/${CMAKE_BUILD_TYPE}/opus.lib)

    # Opencore AMR libraries
-    set (OPENCORE_AMRNB      ${CMAKE_CURRENT_LIST_DIR}/opencore-amr/win32/opencore-amrnb.lib)
-    set (OPENCORE_AMRWB      ${CMAKE_CURRENT_LIST_DIR}/opencore-amr/win32/opencore-amrwb.lib)
+    set (OPENCORE_AMRNB      ${CMAKE_CURRENT_LIST_DIR}/opencore-amr/win64/opencore-amrnb.lib)
+    set (OPENCORE_AMRWB      ${CMAKE_CURRENT_LIST_DIR}/opencore-amr/win64/opencore-amrwb.lib)
 endif()