Use same dependencies for MinGW as are used for MSVC

musescore · Apr 22, 2019 · 2cf0aae · 2cf0aae
1 parent 6c58cef
commit 2cf0aae
Show file tree

Hide file tree

Showing 9 changed files with 62 additions and 80 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -507,11 +507,9 @@ ENDIF(BUILD_JACK)
 if (BUILD_PORTAUDIO)
     if (MINGW OR MSVC)
         set ( USE_PORTAUDIO 1 )
-        if (MSVC)
-           include(FindPortAudio)
-           add_library(portaudiodll SHARED IMPORTED)
-           set_target_properties(portaudiodll PROPERTIES IMPORTED_IMPLIB ${PORTAUDIO_LIBRARY})
-        endif(MSVC)
+        include(FindPortAudio)
+        add_library(portaudiodll SHARED IMPORTED)
+        set_target_properties(portaudiodll PROPERTIES IMPORTED_IMPLIB ${PORTAUDIO_LIBRARY})
     else (MINGW OR MSVC)
         PKGCONFIG1 (portaudio-2.0 19 PORTAUDIO_INCDIR PORTAUDIO_LIBDIR PORTAUDIO_LIB PORTAUDIO_CPP)
         if (PORTAUDIO_INCDIR)
@@ -579,23 +577,21 @@ if (APPLE)
 else(APPLE)
    if (MINGW OR MSVC)
       set(SNDFILE_LIB sndfile-1)
-      if (MSVC)
-         include(FindVorbis)
-         add_library(vorbisdll SHARED IMPORTED)
-         set_target_properties(vorbisdll PROPERTIES IMPORTED_IMPLIB ${VORBIS_LIBRARY})
-
-         include(FindSndFile)
-         add_library(sndfiledll SHARED IMPORTED)
-         set_target_properties(sndfiledll PROPERTIES IMPORTED_IMPLIB ${SNDFILE_LIBRARY})
-
-         include(FindVorbisfile)
-         add_library(vorbisfiledll SHARED IMPORTED)
-         set_target_properties(vorbisfiledll PROPERTIES IMPORTED_IMPLIB ${VORBISFILE_LIBRARY})
-
-         include(FindOgg)
-         add_library(oggdll SHARED IMPORTED)
-         set_target_properties(oggdll PROPERTIES IMPORTED_IMPLIB ${OGG_LIBRARY})
-      endif(MSVC)
+      include(FindVorbis)
+      add_library(vorbisdll SHARED IMPORTED)
+      set_target_properties(vorbisdll PROPERTIES IMPORTED_IMPLIB ${VORBIS_LIBRARY})
+
+      include(FindSndFile)
+      add_library(sndfiledll SHARED IMPORTED)
+      set_target_properties(sndfiledll PROPERTIES IMPORTED_IMPLIB ${SNDFILE_LIBRARY})
+
+      include(FindVorbisfile)
+      add_library(vorbisfiledll SHARED IMPORTED)
+      set_target_properties(vorbisfiledll PROPERTIES IMPORTED_IMPLIB ${VORBISFILE_LIBRARY})
+
+      include(FindOgg)
+      add_library(oggdll SHARED IMPORTED)
+      set_target_properties(oggdll PROPERTIES IMPORTED_IMPLIB ${OGG_LIBRARY})
    else (MINGW OR MSVC)
       set(SNDFILE_LIB sndfile)
    endif (MINGW OR MSVC)

diff --git a/build/FindLame.cmake b/build/FindLame.cmake
@@ -1,14 +1,9 @@
-find_path(LAME_INCLUDE_DIR lame/lame.h PATHS /opt/local/include /usr/local/Cellar/lame/*/include)
+find_path(LAME_INCLUDE_DIR lame/lame.h PATHS /opt/local/include /usr/local/Cellar/lame/*/include ${PROJECT_SOURCE_DIR}/dependencies/include)
 find_path(LAME_INCLUDE_DIR lame/lame.h)
 
-find_library(LAME_LIBRARY NAMES mp3lame PATHS /opt/local/lib /usr/local/Cellar/lame/*/lib NO_DEFAULT_PATH)
+find_library(LAME_LIBRARY NAMES mp3lame PATHS /opt/local/lib /usr/local/Cellar/lame/*/lib ${DEPENDENCIES_DIR} NO_DEFAULT_PATH)
 find_library(LAME_LIBRARY NAMES mp3lame)
 
-if (MINGW)
-  set(LAME_INCLUDE_DIR "")
-  set(LAME_LIBRARY "")
-endif(MINGW)
-
 if (LAME_INCLUDE_DIR AND LAME_LIBRARY)
       set(LAME_FOUND TRUE)
 endif (LAME_INCLUDE_DIR AND LAME_LIBRARY)

diff --git a/build/FindLameMSVC.cmake b/build/FindLameMSVC.cmake
@@ -2,10 +2,6 @@ find_path(LAMEMSVC_INCLUDE_DIR lame.h PATHS ${PROJECT_SOURCE_DIR}/dependencies/i
 
 set(CMAKE_FIND_LIBRARY_SUFFIXES ".lib")
 find_library(LAMEMSVC_LIBRARY NAMES lame_enc PATHS ${DEPENDENCIES_DIR} NO_DEFAULT_PATH)
-if (MINGW)
-  set(LAMEMSVC_INCLUDE_DIR "")
-  set(LAMEMSVC_LIBRARY "")
-endif(MINGW)
 
 message(STATUS ${LAMEMSVC_LIBRARY})
 

diff --git a/build/FindOgg.cmake b/build/FindOgg.cmake
@@ -1,12 +1,11 @@
 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 PATHS ${DEPENDENCIES_DIR} NO_DEFAULT_PATH)
-
 if (MINGW)
-  set(OGG_INCLUDE_DIR "")
-  set(OGG_LIBRARY "")
-endif(MINGW)
+      set(CMAKE_FIND_LIBRARY_SUFFIXES ".dll")
+else (MINGW)
+      set(CMAKE_FIND_LIBRARY_SUFFIXES ".lib")
+endif (MINGW)
+find_library(OGG_LIBRARY NAMES libogg PATHS ${DEPENDENCIES_DIR} NO_DEFAULT_PATH)
 
 message(STATUS ${OGG_LIBRARY})
 

diff --git a/build/FindPortAudio.cmake b/build/FindPortAudio.cmake
@@ -1,12 +1,11 @@
 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 PATHS ${DEPENDENCIES_DIR} NO_DEFAULT_PATH)
-
 if (MINGW)
-  set(PORTAUDIO_INCLUDE_DIR "")
-  set(PORTAUDIO_LIBRARY "")
-endif(MINGW)
+      set(CMAKE_FIND_LIBRARY_SUFFIXES ".dll")
+else (MINGW)
+      set(CMAKE_FIND_LIBRARY_SUFFIXES ".lib")
+endif (MINGW)
+find_library(PORTAUDIO_LIBRARY NAMES portaudio PATHS ${DEPENDENCIES_DIR} NO_DEFAULT_PATH)
 
 message(STATUS ${PORTAUDIO_LIBRARY})
 

diff --git a/build/FindSndFile.cmake b/build/FindSndFile.cmake
@@ -1,12 +1,11 @@
 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 PATHS ${DEPENDENCIES_DIR} NO_DEFAULT_PATH)
-
 if (MINGW)
-  set(SNDFILE_INCLUDE_DIR "")
-  set(SNDFILE_LIBRARY "")
-endif(MINGW)
+      set(CMAKE_FIND_LIBRARY_SUFFIXES ".dll")
+else (MINGW)
+      set(CMAKE_FIND_LIBRARY_SUFFIXES ".lib")
+endif (MINGW)
+find_library(SNDFILE_LIBRARY NAMES libsndfile-1 PATHS ${DEPENDENCIES_DIR} NO_DEFAULT_PATH)
 
 message(STATUS ${SNDFILE_LIBRARY})
 

diff --git a/build/FindVorbis.cmake b/build/FindVorbis.cmake
@@ -1,12 +1,11 @@
 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 PATHS ${DEPENDENCIES_DIR} NO_DEFAULT_PATH)
-
 if (MINGW)
-  set(VORBIS_INCLUDE_DIR "")
-  set(VORBIS_LIBRARY "")
-endif(MINGW)
+      set(CMAKE_FIND_LIBRARY_SUFFIXES ".dll")
+else (MINGW)
+      set(CMAKE_FIND_LIBRARY_SUFFIXES ".lib")
+endif (MINGW)
+find_library(VORBIS_LIBRARY NAMES libvorbis PATHS ${DEPENDENCIES_DIR} NO_DEFAULT_PATH)
 
 message(STATUS ${VORBIS_LIBRARY})
 

diff --git a/build/FindVorbisfile.cmake b/build/FindVorbisfile.cmake
@@ -1,12 +1,11 @@
 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 PATHS ${DEPENDENCIES_DIR} NO_DEFAULT_PATH)
-
 if (MINGW)
-  set(VORBISFILE_INCLUDE_DIR "")
-  set(VORBISFILE_LIBRARY "")
-endif(MINGW)
+      set(CMAKE_FIND_LIBRARY_SUFFIXES ".dll")
+else (MINGW)
+      set(CMAKE_FIND_LIBRARY_SUFFIXES ".lib")
+endif (MINGW)
+find_library(VORBISFILE_LIBRARY NAMES libvorbisfile PATHS ${DEPENDENCIES_DIR} NO_DEFAULT_PATH)
 
 message(STATUS ${VORBISFILE_LIBRARY})
 

diff --git a/mscore/CMakeLists.txt b/mscore/CMakeLists.txt
@@ -487,11 +487,11 @@ add_executable ( ${ExecutableName}
 
 
 
-if (MSVC)
+if (MSVC OR MINGW)
 	target_link_libraries(mscore vorbisfiledll)
-else (MSVC)
+else (MSVC OR MINGW)
 	target_link_libraries(mscore vorbisfile)
-endif (MSVC)
+endif (MSVC OR MINGW)
 
 target_link_libraries(mscore
       awl
@@ -542,19 +542,19 @@ if (AEOLUS)
       target_link_libraries(mscore aeolus)
 endif (AEOLUS)
 if (SOUNDFONT3)
-      if (MSVC)
+      if (MSVC OR MINGW)
           target_link_libraries(mscore vorbisdll oggdll)
-      else (MSVC)
+      else (MSVC OR MINGW)
           target_link_libraries(mscore ${VORBIS_LIB} ${OGG_LIB})
-      endif (MSVC)
+      endif (MSVC OR MINGW)
 endif (SOUNDFONT3)
 
 if (HAS_AUDIOFILE)
-      if (MSVC)
+      if (MSVC OR MINGW)
          target_link_libraries(mscore audiofile sndfiledll)
-      else (MSVC)
+      else (MSVC OR MINGW)
          target_link_libraries(mscore audiofile ${SNDFILE_LIB})
-      endif (MSVC)
+      endif (MSVC OR MINGW)
 endif (HAS_AUDIOFILE)
 
 if (APPLE)
@@ -602,7 +602,7 @@ if (MINGW)
    endif(CMAKE_BUILD_TYPE MATCHES "DEBUG")
 
    target_link_libraries(mscore
-      portaudio
+      portaudiodll
       portmidi
       winmm
       mscore_freetype
@@ -640,23 +640,23 @@ if (MINGW)
          ${MINGW_ROOT}/bin/libgcc_s_seh-1.dll
          DESTINATION bin)
       install( FILES
-         ${MINGW_ROOT}/lib/portaudio.dll RENAME libportaudio-x86_64-w64-mingw32.static.dll
+         ${DEPENDENCIES_DIR}/portaudio.dll RENAME libportaudio-x86_64-w64-mingw32.static.dll
          DESTINATION bin)
    else (BUILD_64)
       install( FILES
          ${MINGW_ROOT}/bin/libgcc_s_dw2-1.dll
-         ${MINGW_ROOT}/lib/portaudio.dll
+         ${DEPENDENCIES_DIR}/portaudio.dll
          DESTINATION bin)
    endif (BUILD_64)
 
    install( FILES
       ${MINGW_ROOT}/bin/libstdc++-6.dll
       ${MINGW_ROOT}/bin/libwinpthread-1.dll
-      ${MINGW_ROOT}/lib/libogg.dll
-      ${MINGW_ROOT}/lib/libsndfile-1.dll
+      ${DEPENDENCIES_DIR}/libogg.dll
+      ${DEPENDENCIES_DIR}/libsndfile-1.dll
       ${MINGW_ROOT}/opt/bin/libeay32.dll
-      ${MINGW_ROOT}/lib/libvorbis.dll
-      ${MINGW_ROOT}/lib/libvorbisfile.dll
+      ${DEPENDENCIES_DIR}/libvorbis.dll
+      ${DEPENDENCIES_DIR}/libvorbisfile.dll
       ${MINGW_ROOT}/opt/bin/ssleay32.dll
       ${QT_INSTALL_BINS}/libEGL.dll
       ${QT_INSTALL_BINS}/libGLESv2.dll
@@ -665,7 +665,7 @@ if (MINGW)
       DESTINATION bin)
 
    install (FILES
-      ${MINGW_ROOT}/lib/lame_enc.dll
+      ${DEPENDENCIES_DIR}/lame_enc.dll
       DESTINATION bin
       OPTIONAL)