From 72a4151152fcb6584b697b6827d27e59de8d3218 Mon Sep 17 00:00:00 2001
From: pixhawk <tv@.(none)>
Date: Fri, 10 Dec 2010 10:30:16 +0100
Subject: [PATCH] Fixed compile errors on MINGW Windows

---
 .gitignore         |  4 ++++
 qgroundcontrol.pri | 14 +++++++-------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index fe553de6c..ef46a13f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,7 @@ deploy/linux
 controller_log*
 user_config.pri
 *.app
+
+*.ncb
+*.vcproj
+*.sln
\ No newline at end of file
diff --git a/qgroundcontrol.pri b/qgroundcontrol.pri
index c5103cabd..ddef64e86 100644
--- a/qgroundcontrol.pri
+++ b/qgroundcontrol.pri
@@ -325,7 +325,7 @@ exists($$BASEDIR/lib/osgEarth123) {
     BASEDIR_WIN = $$replace(BASEDIR,"/","\\")
     TARGETDIR_WIN = $$replace(TARGETDIR,"/","\\")
 
-    QMAKE_PRE_LINK += && copy /Y \"$$BASEDIR_WIN\lib\sdl\win32\SDL.dll\" \"$$TARGETDIR_WIN\debug\SDL.dll\"
+    QMAKE_PRE_LINK += && copy /Y \"$$BASEDIR_WIN\\lib\\sdl\\win32\\SDL.dll\" \"$$TARGETDIR_WIN\\debug\\SDL.dll\"
     QMAKE_PRE_LINK += && copy /Y \"$$BASEDIR_WIN\lib\sdl\win32\SDL.dll\" \"$$TARGETDIR_WIN\release\SDL.dll\"
     QMAKE_PRE_LINK += && xcopy \"$$BASEDIR_WIN\audio\" \"$$TARGETDIR_WIN\debug\audio\" /S /E /Y
     QMAKE_PRE_LINK += && xcopy \"$$BASEDIR_WIN\audio\" \"$$TARGETDIR_WIN\release\audio\" /S /E /Y
@@ -367,12 +367,12 @@ win32-g++ {
 
     # Copy dependencies
 
-    QMAKE_PRE_LINK += && cp $$BASEDIR_WIN/lib/sdl/win32/SDL.dll $$TARGETDIR_WIN/debug/SDL.dll
-    QMAKE_PRE_LINK += && cp $$BASEDIR_WIN/lib/sdl/win32/SDL.dll $$TARGETDIR_WIN/release/SDL.dll
-    QMAKE_PRE_LINK += && cp -r $$BASEDIR_WIN/audio $$TARGETDIR_WIN/debug/audio
-    QMAKE_PRE_LINK += && cp -r $$BASEDIR_WIN/audio $$TARGETDIR_WIN/release/audio
-    QMAKE_PRE_LINK += && cp -r $$BASEDIR_WIN/models $$TARGETDIR_WIN/debug/models
-    QMAKE_PRE_LINK += && cp -r $$BASEDIR_WIN/models $$TARGETDIR_WIN/release/models
+    QMAKE_PRE_LINK += && cp $$BASEDIR/lib/sdl/win32/SDL.dll $$TARGETDIR/debug/SDL.dll
+    QMAKE_PRE_LINK += && cp $$BASEDIR/lib/sdl/win32/SDL.dll $$TARGETDIR/release/SDL.dll
+    QMAKE_PRE_LINK += && cp -r $$BASEDIR/audio $$TARGETDIR/debug/audio
+    QMAKE_PRE_LINK += && cp -r $$BASEDIR/audio $$TARGETDIR/release/audio
+    QMAKE_PRE_LINK += && cp -r $$BASEDIR/models $$TARGETDIR/debug/models
+    QMAKE_PRE_LINK += && cp -r $$BASEDIR/models $$TARGETDIR/release/models
 
     # osg/osgEarth dynamic casts might fail without this compiler option.
     # see http://osgearth.org/wiki/FAQ for details.
-- 
2.22.0