Merge pull request #149 from TheOneRing/fix_windows

Fix native windows build

CMakeModules/NSIS.template.in

@@ -276,7 +276,6 @@ Section "Tomahawk Player" SEC_TOMAHAWK_PLAYER
         File "${INSTALL_PATH}\bin\tomahawk_crash_reporter.exe"
         File "${INSTALL_PATH}\bin\libtomahawk_breakpad.dll"
 
-        File "${INSTALL_PATH}\bin\libqxtweb-standalone.dll"
         File "${INSTALL_PATH}\bin\libtomahawk_portfwd.dll"
         File "${INSTALL_PATH}\bin\libtomahawklib.dll"
         ; plugins
@@ -290,7 +289,6 @@ Section "Tomahawk Player" SEC_TOMAHAWK_PLAYER
         File "${BUILD_PATH}\libtomahawk_breakpad.dll"
 
         File "${BUILD_PATH}\libtomahawklib.dll"
-        File "${BUILD_PATH}\libqxtweb-standalone.dll"
         File "${BUILD_PATH}\libtomahawk_portfwd.dll"
         ; plugins
         File "${BUILD_PATH}\libtomahawk_*_*.dll"

thirdparty/qxt/qxtweb-standalone/CMakeLists.txt

@@ -58,25 +58,11 @@ SET( sources
 )
 
 
-# DLL on windows due to linker issues, otherwise static
-IF(WIN32)
-	ADD_LIBRARY(qxtweb-standalone SHARED
-			${mocstuff}
-			${headers}
-			${sources}
-	)
-    INSTALL( TARGETS qxtweb-standalone
-             RUNTIME DESTINATION bin
-             LIBRARY DESTINATION lib
-             ARCHIVE DESTINATION lib
-    )
-ELSE()
-	ADD_LIBRARY(qxtweb-standalone STATIC
-			${mocstuff}
-			${headers}
-			${sources}
-	)
-ENDIF()
+ADD_LIBRARY(qxtweb-standalone STATIC
+        ${mocstuff}
+        ${headers}
+        ${sources}
+)
 
 
 target_link_libraries( qxtweb-standalone

thirdparty/qxt/qxtweb-standalone/qxtweb/qxtglobal.h

@@ -51,6 +51,8 @@
 
 #define QXT_DLLEXPORT DO_NOT_USE_THIS_ANYMORE
 
+#define QXT_STATIC
+
 #if !defined(QXT_STATIC) && !defined(QXT_DOXYGEN_RUN)
 #    if defined(BUILD_QXT_CORE)
 #        define QXT_CORE_EXPORT Q_DECL_EXPORT