From be4c4575673a3a03134cce58003e7fe2f86ed4ea Mon Sep 17 00:00:00 2001
From: "craig.p.drummond@gmail.com"
 <craig.p.drummond@gmail.com@b1e49159-3266-923f-9c3e-04f16369770a>
Date: Mon, 12 Nov 2012 12:11:56 +0000
Subject: [PATCH] Fix windows build.

---
 CMakeLists.txt | 22 +++++++++++++---------
 README         |  2 +-
 application.h  |  2 +-
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 980959f23..d147242e3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -428,15 +428,6 @@ IF( ENABLE_KDE_SUPPORT )
     install( FILES cantataui.rc DESTINATION ${DATA_INSTALL_DIR}/cantata )
     install( FILES cantata.notifyrc DESTINATION ${DATA_INSTALL_DIR}/cantata )
 ELSE( ENABLE_KDE_SUPPORT )
-    SET( CANTATA_SRCS ${CANTATA_SRCS} network/networkproxyfactory.cpp network/proxysettings.cpp )
-    SET( CANTATA_MOC_HDRS ${CANTATA_MOC_HDRS} network/proxysettings.h )
-    SET( CANTATA_UIS ${CANTATA_UIS} network/proxysettings.ui )
-    SET( CANTATA_RCS ${CANTATA_RCS} cantata_qt.qrc )
-    QT4_ADD_RESOURCES( CANTATA_RC_SRCS ${CANTATA_RCS} )
-    QT4_WRAP_UI( CANTATA_UI_HDRS ${CANTATA_UIS} )
-    INCLUDE( ${QT_USE_FILE} )
-    QT4_WRAP_CPP( CANTATA_MOC_SRCS ${CANTATA_MOC_HDRS} )
-
     if (WIN32)
         SET( CANTATA_MOC_HDRS ${CANTATA_MOC_HDRS} application.h )
         IF( MINGW )
@@ -448,6 +439,19 @@ ELSE( ENABLE_KDE_SUPPORT )
         ELSE( MINGW )
             SET(CANTATA_SRCS ${CANTATA_SRCS} icons/cantataico.rc)
         ENDIF( MINGW )
+    endif (WIN32)
+
+    SET( CANTATA_SRCS ${CANTATA_SRCS} network/networkproxyfactory.cpp network/proxysettings.cpp )
+    SET( CANTATA_MOC_HDRS ${CANTATA_MOC_HDRS} network/proxysettings.h )
+    SET( CANTATA_UIS ${CANTATA_UIS} network/proxysettings.ui )
+    SET( CANTATA_RCS ${CANTATA_RCS} cantata_qt.qrc )
+    QT4_ADD_RESOURCES( CANTATA_RC_SRCS ${CANTATA_RCS} )
+    QT4_WRAP_UI( CANTATA_UI_HDRS ${CANTATA_UIS} )
+    INCLUDE( ${QT_USE_FILE} )
+    QT4_WRAP_CPP( CANTATA_MOC_SRCS ${CANTATA_MOC_HDRS} )
+
+    if (WIN32)
+        SET(CMAKE_BUILD_TYPE "Release")
         ADD_EXECUTABLE( cantata WIN32 ${CANTATA_SRCS} ${CANTATA_MOC_SRCS} ${CANTATA_RC_SRCS} ${CANTATA_UI_HDRS} ${CANTATA_PO})
     else (WIN32)
         ADD_EXECUTABLE( cantata ${CANTATA_SRCS} ${CANTATA_MOC_SRCS} ${CANTATA_RC_SRCS} ${CANTATA_UI_HDRS})
diff --git a/README b/README
index 536221a36..1e98c92e1 100644
--- a/README
+++ b/README
@@ -365,7 +365,7 @@ To compile for windows:
 
 1. Install Qt, MinGW, cmake, TagLib. TagLib will probably need compiling.
 2. Call cmake (e.g.):
-     cmake ../src -G "MinGW Makefiles" -DTAGLIB_INCLUDES=z:\taglibtaglib\include -DTAGLIB_LIBRARIES=z:\taglib\lib\libtag.dll.a -DTAGLIB_MP4_FOUND=1 -DTAGLIB_ASF_FOUND=1
+     cmake ../src -G "MinGW Makefiles" -DTAGLIB_INCLUDES=z:\taglib\include -DTAGLIB_LIBRARIES=z:\taglib\lib\libtag.dll.a -DTAGLIB_MP4_FOUND=1 -DTAGLIB_ASF_FOUND=1
 3. make! :-)
 
 This build is as per Qt-only, but does not have support for dbus, local dynamic
diff --git a/application.h b/application.h
index 201a17cc8..f50725d06 100644
--- a/application.h
+++ b/application.h
@@ -48,7 +48,7 @@ private Q_SLOTS:
 private:
     MainWindow *w;
 };
-#elif defined Q_OS_WIN
+#elif defined Q_OS_WIN || defined WIN32   // moc does not seem to see Q_OS_WIN, but will see WIN32 :-(
 #include "qtsingleapplication/qtsingleapplication.h"
 class Application : public QtSingleApplication
 {