Merge pull request #611 from DonLakeFlyer/WindowsSetup2

Fix Windows installs

QGCInstaller.pri

@@ -23,6 +23,10 @@ installer {
     }
     
     WindowsBuild {
+		QMAKE_POST_LINK += $$escape_expand(\\n) $$quote(del /F "$$DESTDIR_WIN\\$${TARGET}.exp")
+		QMAKE_POST_LINK += $$escape_expand(\\n) $$quote(del /F "$$DESTDIR_WIN\\$${TARGET}.ilk")
+		QMAKE_POST_LINK += $$escape_expand(\\n) $$quote(del /F "$$DESTDIR_WIN\\$${TARGET}.lib")
+		QMAKE_POST_LINK += $$escape_expand(\\n) $$quote(del /F "$$DESTDIR_WIN\\$${TARGET}.pdb")
         QMAKE_POST_LINK += $$escape_expand(\\n) $$quote("\"C:\\Program Files \(x86\)\\NSIS\\makensis.exe\"" /NOCD "\"/XOutFile $${DESTDIR_WIN}\\qgroundcontrol-installer-win32.exe\"" "$$BASEDIR_WIN\\deploy\\qgroundcontrol_installer.nsi")
     }
 }

QGCSetup.pri

@@ -23,28 +23,30 @@ QMAKE_POST_LINK += $$quote(echo "Copying files")
 # Copy the application resources to the associated place alongside the application
 #
 
-COPY_RESOURCE_LIST = \
-    $$BASEDIR/files \
-    $$BASEDIR/qml \
-    $$BASEDIR/data
-    
-WindowsBuild {
-	DESTDIR_COPY_RESOURCE_LIST = $$replace(DESTDIR,"/","\\")
-    COPY_RESOURCE_LIST = $$replace(COPY_RESOURCE_LIST, "/","\\")
-    CONCATCMD = $$escape_expand(\\n)
-}
-
 LinuxBuild {
     DESTDIR_COPY_RESOURCE_LIST = $$DESTDIR
-    CONCATCMD = &&
 }
 
 MacBuild {
     DESTDIR_COPY_RESOURCE_LIST = $$DESTDIR/$${TARGET}.app/Contents/MacOS
-    CONCATCMD = &&
 }
-    
-for(COPY_DIR, COPY_RESOURCE_LIST):QMAKE_POST_LINK += $$CONCATCMD $$QMAKE_COPY_DIR $${COPY_DIR} $$DESTDIR_COPY_RESOURCE_LIST
+
+# Windows version of QMAKE_COPY_DIR of course doesn't work the same as Mac/Linux. It will only
+# copy the contents of the source directory. It doesn't create the top level source directory
+# in the target.
+WindowsBuild {
+    # Make sure to keep both side of this if using the same set of directories
+	DESTDIR_COPY_RESOURCE_LIST = $$replace(DESTDIR,"/","\\")
+	BASEDIR_COPY_RESOURCE_LIST = $$replace(BASEDIR,"/","\\")
+    QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY_DIR $$BASEDIR_COPY_RESOURCE_LIST\\files $$DESTDIR_COPY_RESOURCE_LIST\\files
+    QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY_DIR $$BASEDIR_COPY_RESOURCE_LIST\\qml $$DESTDIR_COPY_RESOURCE_LIST\\qml
+    QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY_DIR $$BASEDIR_COPY_RESOURCE_LIST\\data $$DESTDIR_COPY_RESOURCE_LIST\\data
+} else {
+    # Make sure to keep both side of this if using the same set of directories
+    QMAKE_POST_LINK += && $$QMAKE_COPY_DIR $$BASEDIR/files $$DESTDIR_COPY_RESOURCE_LIST
+    QMAKE_POST_LINK += && $$QMAKE_COPY_DIR $$BASEDIR/qml $$DESTDIR_COPY_RESOURCE_LIST
+    QMAKE_POST_LINK += && $$QMAKE_COPY_DIR $$BASEDIR/data $$DESTDIR_COPY_RESOURCE_LIST
+}
 
 #
 # Perform platform specific setup
@@ -185,8 +187,6 @@ WindowsBuild {
     }
 
 	ReleaseBuild {
-		QMAKE_POST_LINK += $$escape_expand(\\n) $$quote(del /F "$$DESTDIR_WIN\\$${TARGET}.exp")
-
 		# Copy Visual Studio DLLs
 		# Note that this is only done for release because the debugging versions of these DLLs cannot be redistributed.
 		# This currently only works for VS2010.

qgroundcontrol.pro

@@ -147,6 +147,7 @@ MacBuild | LinuxBuild {
 WindowsBuild {
 	QMAKE_CXXFLAGS_WARN_ON += /W3 \
         /wd4996 \   # silence warnings about deprecated strcpy and whatnot
+        /wd4005 \   # silence warnings about macro redefinition
         /wd4290     # ignore exception specifications
     WarningsAsErrorsOn {
         QMAKE_CXXFLAGS_WARN_ON += /WX