Allow build with Qt 5.12 and its 64bit MinGW

musescore · Oct 31, 2018 · b79faef · b79faef
1 parent 77b832b
commit b79faef
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,6 +9,8 @@ build.debug
 build.qtc
 win32build
 win32install
+win64build
+win64install
 build.xcode
 applebuild
 /*.config

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -206,7 +206,9 @@ else (APPLE)
       if (MINGW)
          # -mno-ms-bitfields see #22048
          set(CMAKE_CXX_FLAGS         "${CMAKE_CXX_FLAGS} -mno-ms-bitfields")
-         set(CMAKE_EXE_LINKER_FLAGS "-Wl,--large-address-aware")
+         if (NOT BUILD_64)
+             set(CMAKE_EXE_LINKER_FLAGS "-Wl,--large-address-aware")
+         endif (NOT BUILD_64)
       else (MINGW)
          set(CMAKE_CXX_FLAGS         "${CMAKE_CXX_FLAGS} -fPIC")
          set(CMAKE_CXX_FLAGS_DEBUG   "${CMAKE_CXX_FLAGS_DEBUG} -Wall -Wextra -Woverloaded-virtual")

diff --git a/mscore/CMakeLists.txt b/mscore/CMakeLists.txt
@@ -581,13 +581,25 @@ if (MINGW)
 
    install( TARGETS mscore RUNTIME DESTINATION bin )
 
+   if (BUILD_64)
+      install( FILES
+         ${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
+         DESTINATION bin)
+   else (BUILD_64)
+      install( FILES
+         ${MINGW_ROOT}/bin/libgcc_s_dw2-1.dll
+         ${MINGW_ROOT}/lib/portaudio.dll
+         DESTINATION bin)
+   endif (BUILD_64)
+
    install( FILES
-      ${MINGW_ROOT}/bin/libgcc_s_dw2-1.dll
       ${MINGW_ROOT}/bin/libstdc++-6.dll
       ${MINGW_ROOT}/bin/libwinpthread-1.dll
       ${MINGW_ROOT}/lib/libogg.dll
       ${MINGW_ROOT}/lib/libsndfile-1.dll
-      ${MINGW_ROOT}/lib/portaudio.dll
       ${MINGW_ROOT}/opt/bin/libeay32.dll
       ${MINGW_ROOT}/lib/libvorbis.dll
       ${MINGW_ROOT}/lib/libvorbisfile.dll
@@ -866,11 +878,6 @@ else (MINGW)
       add_dependencies(mscore lrelease)
 
       install( FILES
-#        ${MINGW_ROOT}/bin/libgcc_s_dw2-1.dll
-#		 ${MINGW_ROOT}/bin/libstdc++-6.dll
-#		 ${MINGW_ROOT}/bin/libwinpthread-1.dll
-#		 ${MINGW_ROOT}/opt/bin/libeay32.dll
-#		 ${MINGW_ROOT}/opt/bin/ssleay32.dll
 		 ${dll_ogg}
 		 ${dll_lame}
 		 ${dll_sndfile}