Merge pull request #3961 from Jojo-Schmitz/MinGW-64bit

Allow build with 64bit MinGW (from Qt 5.12)

Author: anatoly-os

.gitignore

@@ -9,6 +9,8 @@ build.debug
 build.qtc
 win32build
 win32install
+win64build
+win64install
 build.xcode
 applebuild
 /*.config

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")

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}

mscore/seq.cpp

@@ -46,6 +46,7 @@
 
 #include "click.h"
 
+#define OV_EXCLUDE_STATIC_CALLBACKS
 #include <vorbis/vorbisfile.h>
 
 #ifdef USE_PORTMIDI

mscore/waveview.cpp

@@ -15,6 +15,7 @@
 #include "libmscore/audio.h"
 #include "libmscore/score.h"
 
+#define OV_EXCLUDE_STATIC_CALLBACKS
 #include <vorbis/vorbisfile.h>
 
 namespace Ms {

thirdparty/poppler/CMakeLists.txt

@@ -137,7 +137,11 @@ if (APPLE)
    set ( POPPLER_COMPILE_FLAGS "-O2 -Wno-unknown-warning-option -Wno-write-strings -ansi -Wnon-virtual-dtor -Woverloaded-virtual -Wno-unused-private-field -Wno-return-stack-address -Wno-shift-negative-value -std=c++11")
 else (APPLE)
    if (MINGW)
-      set (POPPLER_COMPILE_FLAGS "-O2 -Wall -Wextra -Wno-write-strings -ansi -Wnon-virtual-dtor -Woverloaded-virtual -Wno-unused-parameter -Wno-missing-field-initializers -Wno-unused-but-set-variable -Wno-format -std=c++11")
+       if (BUILD_64)
+          set (POPPLER_COMPILE_FLAGS "-O2 -Wall -Wextra -Wno-write-strings -ansi -Wnon-virtual-dtor -Woverloaded-virtual -Wno-unused-parameter -Wno-missing-field-initializers -Wno-unused-but-set-variable -Wno-format -Wno-shift-negative-value -Wno-stringop-overflow -std=c++11")
+       else (BUILD_64)
+          set (POPPLER_COMPILE_FLAGS "-O2 -Wall -Wextra -Wno-write-strings -ansi -Wnon-virtual-dtor -Woverloaded-virtual -Wno-unused-parameter -Wno-missing-field-initializers -Wno-unused-but-set-variable -Wno-format -std=c++11")
+       endif (BUILD_64)
    else (MINGW)
       if (NOT MSVC)
          set (POPPLER_COMPILE_FLAGS "-O2 -Wno-write-strings -ansi -Wnon-virtual-dtor -Woverloaded-virtual -Wno-unused-parameter -Wno-missing-field-initializers -Wno-unused-but-set-variable -std=c++11")

thirdparty/portmidi/CMakeLists.txt

@@ -52,6 +52,14 @@ if (MSVC)
   set_target_properties( portmidi PROPERTIES
     COMPILE_FLAGS "/wd4028 /wd4057 /wd4100 /wd4133 /wd4189 /wd4206 /wd4244 /wd4267 /wd4311 /wd4312 /wd4456 /wd4706"
   )
+else (MSVC)
+  if (MINGW)
+    if (BUILD_64)
+      set_target_properties( portmidi PROPERTIES
+        COMPILE_FLAGS "-Wno-int-to-pointer-cast -Wno-pointer-to-int-cast -Wno-incompatible-pointer-types"
+      )
+    endif (BUILD_64)
+  endif (MINGW)
 endif (MSVC)
 
 include_directories(