From db7f146cab836ceeb3fcc09d032f716eea0808c7 Mon Sep 17 00:00:00 2001
From: Ivan Mahonin <bh@icystar.com>
Date: Sep 09 2019 04:36:13 +0000
Subject: #mingw #win32: disable quicktime


---

diff --git a/toonz/sources/CMakeLists.txt b/toonz/sources/CMakeLists.txt
index d9b0c34..053b622 100644
--- a/toonz/sources/CMakeLists.txt
+++ b/toonz/sources/CMakeLists.txt
@@ -382,9 +382,6 @@ elseif(BUILD_ENV_APPLE)
     pkg_check_modules(MYPAINT_LIB REQUIRED libmypaint)
 elseif(BUILD_ENV_UNIXLIKE)
     if(BUILD_TARGET_WIN)
-        if(PLATFORM EQUAL 32)
-            set(QT_LIB ${SDKROOT}/quicktime/QT73SDK/Libraries/QTMLClient.lib)
-        endif()
         find_library(GL_LIB opengl32)
         find_library(GLU_LIB glu32)
         find_library(GLUT_LIB NAMES glut freeglut)
@@ -588,7 +585,7 @@ if(BUILD_ENV_APPLE)
     add_subdirectory(mousedragfilter)
 endif()
 
-if((PLATFORM EQUAL 32) AND (BUILD_TARGET_WIN OR BUILD_TARGET_APPLE))
+if((PLATFORM EQUAL 32) AND ((BUILD_TARGET_WIN AND BUILD_ENV_MSVC) OR BUILD_TARGET_APPLE))
     add_subdirectory(t32bitsrv)
 endif()
 
diff --git a/toonz/sources/common/tiio/movsettings.cpp b/toonz/sources/common/tiio/movsettings.cpp
index e8cb9c2..4b095fb 100644
--- a/toonz/sources/common/tiio/movsettings.cpp
+++ b/toonz/sources/common/tiio/movsettings.cpp
@@ -7,7 +7,7 @@
 #include "tproperty.h"
 #include "tiio.h"
 
-#if !(defined(x64) || defined(__LP64__) || defined(LINUX))
+#if !defined(x64) && !defined(__LP64__) && !defined(LINUX) && !(defined(__GNUC__) && defined(_WIN32))
 
 //*******************************************************************************
 //    32-bit version
diff --git a/toonz/sources/image/3gp/tiio_3gp.h b/toonz/sources/image/3gp/tiio_3gp.h
index 631dfbe..6d11800 100644
--- a/toonz/sources/image/3gp/tiio_3gp.h
+++ b/toonz/sources/image/3gp/tiio_3gp.h
@@ -3,7 +3,7 @@
 #ifndef TIIO_3GP_H
 #define TIIO_3_H
 
-#ifdef x64
+#if defined(x64) || (defined(__GNUC__) && defined(_WIN32))
 #include "tiio_3gp_proxy.h"
 #else
 
diff --git a/toonz/sources/image/3gp/tiio_3gpW.cpp b/toonz/sources/image/3gp/tiio_3gpW.cpp
index 0a7472f..669bdec 100644
--- a/toonz/sources/image/3gp/tiio_3gpW.cpp
+++ b/toonz/sources/image/3gp/tiio_3gpW.cpp
@@ -1,6 +1,6 @@
 
 
-#ifndef x64
+#if !defined(x64) && !(defined(__GNUC__) && defined(_WIN32))
 
 #include <cstdint>
 
diff --git a/toonz/sources/image/3gp/tiio_3gp_proxy.cpp b/toonz/sources/image/3gp/tiio_3gp_proxy.cpp
index 76c82a5..4fba3d8 100644
--- a/toonz/sources/image/3gp/tiio_3gp_proxy.cpp
+++ b/toonz/sources/image/3gp/tiio_3gp_proxy.cpp
@@ -1,6 +1,6 @@
 
 
-#if (defined(x64) || defined(__LP64__) || defined(LINUX))
+#if defined(x64) || defined(__LP64__) || defined(LINUX) || (defined(_WIN32) && defined(__GNUC__))
 
 // Toonz includes
 #include "tfilepath.h"
diff --git a/toonz/sources/image/3gp/tiio_3gp_proxy.h b/toonz/sources/image/3gp/tiio_3gp_proxy.h
index db8a539..744769e 100644
--- a/toonz/sources/image/3gp/tiio_3gp_proxy.h
+++ b/toonz/sources/image/3gp/tiio_3gp_proxy.h
@@ -3,7 +3,7 @@
 #ifndef TIIO_3GP_PROXY_H
 #define TIIO_3GP_PROXY_H
 
-#if defined(x64) || defined(__LP64__) || defined(LINUX)
+#if defined(x64) || defined(__LP64__) || defined(LINUX) || (defined(_WIN32) && defined(__GNUC__))
 
 // Qt includes
 #include <QString>
diff --git a/toonz/sources/image/mov/tiio_mov.h b/toonz/sources/image/mov/tiio_mov.h
index 2e58cd8..37990f6 100644
--- a/toonz/sources/image/mov/tiio_mov.h
+++ b/toonz/sources/image/mov/tiio_mov.h
@@ -3,7 +3,7 @@
 #ifndef TIIO_MOV_H
 #define TIIO_MOV_H
 
-#ifdef x64
+#if defined(x64) || (defined(__GNUC__) && defined(_WIN32))
 #include "tiio_mov_proxy.h"
 #else
 
diff --git a/toonz/sources/image/mov/tiio_movW.cpp b/toonz/sources/image/mov/tiio_movW.cpp
index 0b07b7c..f026920 100644
--- a/toonz/sources/image/mov/tiio_movW.cpp
+++ b/toonz/sources/image/mov/tiio_movW.cpp
@@ -1,6 +1,6 @@
 
 
-#ifndef x64
+#if !defined(x64) && !(defined(__GNUC__) && defined(_WIN32))
 
 #include "texception.h"
 #include "tsound.h"
diff --git a/toonz/sources/image/mov/tiio_mov_proxy.cpp b/toonz/sources/image/mov/tiio_mov_proxy.cpp
index f8fa95f..816171d 100644
--- a/toonz/sources/image/mov/tiio_mov_proxy.cpp
+++ b/toonz/sources/image/mov/tiio_mov_proxy.cpp
@@ -1,6 +1,6 @@
 
 
-#if (defined(x64) || defined(__LP64__) || defined(LINUX))
+#if defined(x64) || defined(__LP64__) || defined(LINUX) || (defined(_WIN32) && defined(__GNUC__))
 
 // Toonz includes
 #include "tfilepath.h"
diff --git a/toonz/sources/image/mov/tiio_mov_proxy.h b/toonz/sources/image/mov/tiio_mov_proxy.h
index 386c79d..68d0c88 100644
--- a/toonz/sources/image/mov/tiio_mov_proxy.h
+++ b/toonz/sources/image/mov/tiio_mov_proxy.h
@@ -3,7 +3,7 @@
 #ifndef TIIO_MOV_PROXY_H
 #define TIIO_MOV_PROXY_H
 
-#if defined(x64) || defined(__LP64__) || defined(LINUX)
+#if defined(x64) || defined(__LP64__) || defined(LINUX) || (defined(_WIN32) && defined(__GNUC__))
 
 // Qt includes
 #include <QString>
diff --git a/toonz/sources/image/tiio.cpp b/toonz/sources/image/tiio.cpp
index dfbd74d..4433ba5 100644
--- a/toonz/sources/image/tiio.cpp
+++ b/toonz/sources/image/tiio.cpp
@@ -20,7 +20,7 @@
 // Platform-specific includes
 #if defined(_WIN32)
 
-#ifndef x64
+#if !defined(x64) && !defined(__GNUC__)
 
 #define list QuickTime_list
 #define map QuickTime_map
@@ -169,7 +169,7 @@ void initImageIo(bool lightVersion) {
                                new Tiio::SpriteWriterProperties());
 
 // ffmpeg
-#if !defined(_WIN32) || defined(x64)
+#if !defined(_WIN32) || defined(x64) || (defined(_WIN32) && defined(__GNUC__))
   if (Ffmpeg::checkFfmpeg()) {
     bool ffprobe = Ffmpeg::checkFfprobe();
     if (Ffmpeg::checkFormat("webm")) {
diff --git a/toonz/sources/include/movsettings.h b/toonz/sources/include/movsettings.h
index 591d538..a152d18 100644
--- a/toonz/sources/include/movsettings.h
+++ b/toonz/sources/include/movsettings.h
@@ -13,7 +13,7 @@
 #define DVVAR DV_IMPORT_VAR
 #endif
 
-#if !(defined(x64) || defined(__LP64__) || defined(LINUX))
+#if !defined(x64) && !defined(__LP64__) && !defined(LINUX) && !(defined(__GNUC__) && defined(_WIN32))
 
 #ifdef _WIN32