From c9a85a5faeb7694ed25a7abcf207bb8eb9db169d Mon Sep 17 00:00:00 2001 From: pixhawk Date: Wed, 8 Dec 2010 10:15:30 +0100 Subject: [PATCH] Fixed build command for Windows 32bit GNU --- qgroundcontrol.pri | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/qgroundcontrol.pri b/qgroundcontrol.pri index 3038fefcd..4a0b34d76 100644 --- a/qgroundcontrol.pri +++ b/qgroundcontrol.pri @@ -374,17 +374,15 @@ win32-g++ { RC_FILE = $$BASEDIR/qgroundcontrol.rc # Copy dependencies - debug { - QMAKE_PRE_LINK += && cp -f $$BASEDIR/lib/sdl/win32/SDL.dll $$BUILDDIR/debug/. - QMAKE_PRE_LINK += && cp -rf $$BASEDIR/audio $$TARGETDIR/debug/. - QMAKE_PRE_LINK += && cp -rf $$BASEDIR/models $$TARGETDIR/debug/. - } - - release { - QMAKE_PRE_LINK += && cp -f $$BASEDIR/lib/sdl/win32/SDL.dll $$BUILDDIR/release/. - QMAKE_PRE_LINK += && cp -rf $$BASEDIR/audio $$TARGETDIR/release/. - QMAKE_PRE_LINK += && cp -rf $$BASEDIR/models $$TARGETDIR/release/. - } + 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\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 + QMAKE_PRE_LINK += && xcopy \"$$BASEDIR_WIN\models\" \"$$TARGETDIR_WIN\debug\models\" /S /E /Y + QMAKE_PRE_LINK += && xcopy \"$$BASEDIR_WIN\models\" \"$$TARGETDIR_WIN\release\models\" /S /E /Y # osg/osgEarth dynamic casts might fail without this compiler option. # see http://osgearth.org/wiki/FAQ for details. -- 2.22.0