rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-21 11:54:15 +01:00
Code Issues Releases Activity

Windows copy data: Use the environmental $$(QTMINGW) variable to locate

Browse Source 
files to copy into the package.  This makes it more robust against various
relative locations of mingw and qt.

It may be necessary to move all SDL-related files (SDL.dll, static libraries
and include files) from, for instance, .\QtSDK\Desktop\Qt\4.8.1\mingw\bin
to .\QtSDK\mingw\bin to be found.

Conflicts:

	ground/gcs/copydata.pro
	ground/gcs/src/plugins/hitl/aerosimrc/src/plugin.pro
This commit is contained in:
James Cotton 2012-12-22 12:26:25 -06:00 committed by Oleg Semyonov
parent 153db89663
commit 5e20705347
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ground/openpilotgcs/copydata.pro
View File

@ -6,6 +6,7 @@ TEMPLATE = subdirs
equals(copydata, 1) { equals(copydata, 1) {
# Windows release only, no debug target DLLs ending with 'd' # Windows release only, no debug target DLLs ending with 'd'
# It is assumed that SDL.dll can be found in the same directory as mingw32-make.exe
win32:CONFIG(release, debug|release) { win32:CONFIG(release, debug|release) {
# copy Qt DLLs and phonon4 # copy Qt DLLs and phonon4
@ -29,7 +30,7 @@ equals(copydata, 1) {
MINGW_DLLS = libgcc_s_dw2-1.dll \ MINGW_DLLS = libgcc_s_dw2-1.dll \
mingwm10.dll mingwm10.dll
for(dll, MINGW_DLLS) { for(dll, MINGW_DLLS) {
data_copy.commands += $(COPY_FILE) $$targetPath(\"$$[QT_INSTALL_BINS]/../../../../../mingw/bin/$$dll\") $$targetPath(\"$$GCS_APP_PATH/$$dll\") $$addNewline() data_copy.commands += $(COPY_FILE) $$targetPath(\"$$(QTMINGW)/$$dll\") $$targetPath(\"$$GCS_APP_PATH/$$dll\") $$addNewline()
} }
# copy iconengines # copy iconengines
@ -74,7 +75,7 @@ equals(copydata, 1) {
# xcopy /s /e <SDL>\include\SDL\* C:\QtSDK\Desktop\Qt\4.7.3\mingw\include\SDL # xcopy /s /e <SDL>\include\SDL\* C:\QtSDK\Desktop\Qt\4.7.3\mingw\include\SDL
# xcopy /s /e <SDL>\lib\* C:\QtSDK\Desktop\Qt\4.7.3\mingw\lib # xcopy /s /e <SDL>\lib\* C:\QtSDK\Desktop\Qt\4.7.3\mingw\lib
SDL_DLL = SDL.dll SDL_DLL = SDL.dll
data_copy.commands += $(COPY_FILE) $$targetPath(\"$$[QT_INSTALL_BINS]/../../mingw/bin/$$SDL_DLL\") $$targetPath(\"$$GCS_APP_PATH/$$SDL_DLL\") $$addNewline() data_copy.commands += $(COPY_FILE) $$targetPath(\"$$(QTMINGW)/$$SDL_DLL\") $$targetPath(\"$$GCS_APP_PATH/$$SDL_DLL\") $$addNewline()
data_copy.target = FORCE data_copy.target = FORCE
QMAKE_EXTRA_TARGETS += data_copy QMAKE_EXTRA_TARGETS += data_copy

2
ground/openpilotgcs/src/plugins/hitl/aerosimrc/src/plugin.pro
View File

@ -62,7 +62,7 @@ equals(copydata, 1) {
libgcc_s_dw2-1.dll \ libgcc_s_dw2-1.dll \
mingwm10.dll mingwm10.dll
for(dll, MINGW_DLLS) { for(dll, MINGW_DLLS) {
data_copy.commands += $(COPY_FILE) $$targetPath(\"$$[QT_INSTALL_BINS]/../../../../../mingw/bin/$$dll\") $$targetPath(\"$$SIM_DIR/$$dll\") $$addNewline() data_copy.commands += $(COPY_FILE) $$targetPath(\"$$(QTMINGW)/$$dll\") $$targetPath(\"$$SIM_DIR/$$dll\") $$addNewline()
} }
data_copy.target = FORCE data_copy.target = FORCE