Commit 72a41511 authored by pixhawk's avatar pixhawk

Fixed compile errors on MINGW Windows

parent 12746a8b
......@@ -27,3 +27,7 @@ deploy/linux
controller_log*
user_config.pri
*.app
*.ncb
*.vcproj
*.sln
\ No newline at end of file
......@@ -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.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment