fix mp3 export after migration to 64-bit

Rename libs back so that theu don't have architecture postfix
musescore · Aug 23, 2018 · 0599771 · 0599771
1 parent e5093a2
commit 0599771
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 13 deletions.
diff --git a/build/FindLameMSVC.cmake b/build/FindLameMSVC.cmake
@@ -1,7 +1,7 @@
 find_path(LAMEMSVC_INCLUDE_DIR lame.h PATHS ${PROJECT_SOURCE_DIR}/dependencies/include/lame;)
 
 set(CMAKE_FIND_LIBRARY_SUFFIXES ".lib")
-find_library(LAMEMSVC_LIBRARY NAMES lame_enc${ARCH_TYPE} PATHS ${DEPENDENCIES_DIR} NO_DEFAULT_PATH)
+find_library(LAMEMSVC_LIBRARY NAMES lame_enc PATHS ${DEPENDENCIES_DIR} NO_DEFAULT_PATH)
 if (MINGW)
   set(LAMEMSVC_INCLUDE_DIR "")
   set(LAMEMSVC_LIBRARY "")

diff --git a/build/FindOgg.cmake b/build/FindOgg.cmake
@@ -1,7 +1,7 @@
 find_path(OGG_INCLUDE_DIR ogg.h PATHS ${PROJECT_SOURCE_DIR}/dependencies/include/ogg;)
 
 set(CMAKE_FIND_LIBRARY_SUFFIXES ".lib")
-find_library(OGG_LIBRARY NAMES libogg${ARCH_TYPE} PATHS ${DEPENDENCIES_DIR} NO_DEFAULT_PATH)
+find_library(OGG_LIBRARY NAMES libogg PATHS ${DEPENDENCIES_DIR} NO_DEFAULT_PATH)
 
 if (MINGW)
   set(OGG_INCLUDE_DIR "")

diff --git a/build/FindPortAudio.cmake b/build/FindPortAudio.cmake
@@ -1,7 +1,7 @@
 find_path(PORTAUDIO_INCLUDE_DIR portaudio.h PATHS ${PROJECT_SOURCE_DIR}/dependencies/include;)
 
 set(CMAKE_FIND_LIBRARY_SUFFIXES ".lib")
-find_library(PORTAUDIO_LIBRARY NAMES portaudio${ARCH_TYPE} PATHS ${DEPENDENCIES_DIR} NO_DEFAULT_PATH)
+find_library(PORTAUDIO_LIBRARY NAMES portaudio PATHS ${DEPENDENCIES_DIR} NO_DEFAULT_PATH)
 
 if (MINGW)
   set(PORTAUDIO_INCLUDE_DIR "")

diff --git a/build/FindSndFile.cmake b/build/FindSndFile.cmake
@@ -1,7 +1,7 @@
 find_path(SNDFILE_INCLUDE_DIR sndfile.h PATHS ${PROJECT_SOURCE_DIR}/dependencies/include;)
 
 set(CMAKE_FIND_LIBRARY_SUFFIXES ".lib")
-find_library(SNDFILE_LIBRARY NAMES libsndfile-1${ARCH_TYPE} PATHS ${DEPENDENCIES_DIR} NO_DEFAULT_PATH)
+find_library(SNDFILE_LIBRARY NAMES libsndfile-1 PATHS ${DEPENDENCIES_DIR} NO_DEFAULT_PATH)
 
 if (MINGW)
   set(SNDFILE_INCLUDE_DIR "")

diff --git a/build/FindStaticLibrary.cmake b/build/FindStaticLibrary.cmake
@@ -1,3 +1,3 @@
 add_library(zlibstat STATIC IMPORTED)	
-set_target_properties(zlibstat PROPERTIES IMPORTED_LOCATION ${DEPENDENCIES_DIR}/zlibstat${ARCH_TYPE}.lib)   
+set_target_properties(zlibstat PROPERTIES IMPORTED_LOCATION ${DEPENDENCIES_DIR}/zlibstat.lib)   
 
diff --git a/build/FindVorbis.cmake b/build/FindVorbis.cmake
@@ -1,7 +1,7 @@
 find_path(VORBIS_INCLUDE_DIR vorbisenc.h PATHS ${PROJECT_SOURCE_DIR}/dependencies/include/vorbis;)
 
 set(CMAKE_FIND_LIBRARY_SUFFIXES ".lib")
-find_library(VORBIS_LIBRARY NAMES libvorbis${ARCH_TYPE} PATHS ${DEPENDENCIES_DIR} NO_DEFAULT_PATH)
+find_library(VORBIS_LIBRARY NAMES libvorbis PATHS ${DEPENDENCIES_DIR} NO_DEFAULT_PATH)
 
 if (MINGW)
   set(VORBIS_INCLUDE_DIR "")

diff --git a/build/FindVorbisfile.cmake b/build/FindVorbisfile.cmake
@@ -1,7 +1,7 @@
 find_path(VORBISFILE_INCLUDE_DIR vorbisfile.h PATHS ${PROJECT_SOURCE_DIR}/dependencies/include/vorbis;)
 
 set(CMAKE_FIND_LIBRARY_SUFFIXES ".lib")
-find_library(VORBISFILE_LIBRARY NAMES libvorbisfile${ARCH_TYPE} PATHS ${DEPENDENCIES_DIR} NO_DEFAULT_PATH)
+find_library(VORBISFILE_LIBRARY NAMES libvorbisfile PATHS ${DEPENDENCIES_DIR} NO_DEFAULT_PATH)
 
 if (MINGW)
   set(VORBISFILE_INCLUDE_DIR "")

diff --git a/mscore/CMakeLists.txt b/mscore/CMakeLists.txt
@@ -812,12 +812,12 @@ else (MINGW)
 
       set(CMAKE_FIND_LIBRARY_PREFIX "")
       set(CMAKE_FIND_LIBRARY_SUFFIXES ".dll")
-      find_library( dll_lame        NAMES "lame_enc${ARCH_TYPE}"       PATHS ${DEPENDENCIES_DIR} NO_DEFAULT_PATH)
-      find_library( dll_ogg         NAMES "libogg${ARCH_TYPE}"         PATHS ${DEPENDENCIES_DIR} NO_DEFAULT_PATH)
-      find_library( dll_sndfile     NAMES "libsndfile-1${ARCH_TYPE}"     PATHS ${DEPENDENCIES_DIR} NO_DEFAULT_PATH)
-      find_library( dll_vorbis      NAMES "libvorbis${ARCH_TYPE}"      PATHS ${DEPENDENCIES_DIR} NO_DEFAULT_PATH)
-      find_library( dll_vorbisfile  NAMES "libvorbisfile${ARCH_TYPE}"  PATHS ${DEPENDENCIES_DIR} NO_DEFAULT_PATH)
-      find_library( dll_portaudio   NAMES "portaudio${ARCH_TYPE}"      PATHS ${DEPENDENCIES_DIR} NO_DEFAULT_PATH)
+      find_library( dll_lame        NAMES "lame_enc"       PATHS ${DEPENDENCIES_DIR} NO_DEFAULT_PATH)
+      find_library( dll_ogg         NAMES "libogg"         PATHS ${DEPENDENCIES_DIR} NO_DEFAULT_PATH)
+      find_library( dll_sndfile     NAMES "libsndfile-1"   PATHS ${DEPENDENCIES_DIR} NO_DEFAULT_PATH)
+      find_library( dll_vorbis      NAMES "libvorbis"      PATHS ${DEPENDENCIES_DIR} NO_DEFAULT_PATH)
+      find_library( dll_vorbisfile  NAMES "libvorbisfile"  PATHS ${DEPENDENCIES_DIR} NO_DEFAULT_PATH)
+      find_library( dll_portaudio   NAMES "portaudio"      PATHS ${DEPENDENCIES_DIR} NO_DEFAULT_PATH)
 
       list(APPEND dlls_to_copy ${dll_lame} ${dll_ogg} ${dll_sndfile} ${dll_vorbis} ${dll_vorbisfile} ${dll_portaudio} "$<TARGET_FILE_DIR:mscore>/${MUSESCORE_NAME}.exe")
       set( output_dir_for_dlls "${PROJECT_BINARY_DIR}/../msvc.install${ARCH_TYPE}/bin")