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

LP-109 cleanup copydata.pro files

Browse Source 
to bring them up to par with gstreamer's copydata.pro file
This commit is contained in:
Philippe Renon 2017-07-05 23:55:20 +02:00
parent 8f17f14400
commit 6929e3407b
2 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ground/gcs/copydata.pro
View File

@ -91,7 +91,7 @@ win32 {
for(dll, QT_DLLS) { for(dll, QT_DLLS) {
addCopyFileTarget($${dll},$$[QT_INSTALL_BINS],$${GCS_APP_PATH}) addCopyFileTarget($${dll},$$[QT_INSTALL_BINS],$${GCS_APP_PATH})
win32:addCopyDependenciesTarget($${dll},$$[QT_INSTALL_BINS],$${GCS_APP_PATH}) addCopyDependenciesTarget($${dll},$$[QT_INSTALL_BINS],$${GCS_APP_PATH})
} }
# copy OpenSSL DLLs # copy OpenSSL DLLs

32
ground/gcs/src/libs/osgearth/copydata.pro
View File

@ -13,24 +13,24 @@ contains(QT_ARCH, x86_64) {
# set debug suffix if needed # set debug suffix if needed
win32:CONFIG(debug, debug|release):DS = "d" win32:CONFIG(debug, debug|release):DS = "d"
osg:linux { linux:osg {
# copy osg libraries # copy osg libraries
data_copy.commands += $(MKDIR) $$GCS_LIBRARY_PATH/osg $$addNewline() data_copy.commands += $(MKDIR) $$GCS_LIBRARY_PATH/osg $$addNewline()
data_copy.commands += $(COPY_DIR) $$shell_quote($$OSG_SDK_DIR/$$LIB_DIR_NAME/)* $$shell_quote($$GCS_LIBRARY_PATH/osg/) $$addNewline() data_copy.commands += $(COPY_DIR) $$shell_quote($$OSG_SDK_DIR/$$LIB_DIR_NAME/)* $$shell_quote($$GCS_LIBRARY_PATH/osg/) $$addNewline()
} }
osgearth:linux { linux:osgearth {
# copy osgearth libraries # copy osgearth libraries
data_copy.commands += $(MKDIR) $$GCS_LIBRARY_PATH/osg $$addNewline() data_copy.commands += $(MKDIR) $$GCS_LIBRARY_PATH/osg $$addNewline()
data_copy.commands += $(COPY_DIR) $$shell_quote($$OSGEARTH_SDK_DIR/$$LIB_DIR_NAME/)* $$shell_quote($$GCS_LIBRARY_PATH/osg/) $$addNewline() data_copy.commands += $(COPY_DIR) $$shell_quote($$OSGEARTH_SDK_DIR/$$LIB_DIR_NAME/)* $$shell_quote($$GCS_LIBRARY_PATH/osg/) $$addNewline()
} }
osg:macx { macx:osg {
# copy osg libraries # copy osg libraries
data_copy.commands += $(COPY_DIR) $$shell_quote($$OSG_SDK_DIR/lib/)* $$shell_quote($$GCS_LIBRARY_PATH/) $$addNewline() data_copy.commands += $(COPY_DIR) $$shell_quote($$OSG_SDK_DIR/lib/)* $$shell_quote($$GCS_LIBRARY_PATH/) $$addNewline()
} }
osgearth:macx { macx:osgearth {
# copy osgearth libraries # copy osgearth libraries
data_copy.commands += $(COPY_DIR) $$shell_quote($$OSGEARTH_SDK_DIR/lib/)* $$shell_quote($$GCS_LIBRARY_PATH/) $$addNewline() data_copy.commands += $(COPY_DIR) $$shell_quote($$OSGEARTH_SDK_DIR/lib/)* $$shell_quote($$GCS_LIBRARY_PATH/) $$addNewline()
} }
@ -43,8 +43,8 @@ linux|macx {
QMAKE_EXTRA_TARGETS += data_copy QMAKE_EXTRA_TARGETS += data_copy
} }
osg:win32 { win32:osg {
# osg and osgearth dependencies OSG_PLUGINS_DIR = $${OSG_SDK_DIR}/bin/osgPlugins-$${OSG_VERSION}
# osg libraries # osg libraries
OSG_LIBS += \ OSG_LIBS += \
@ -71,7 +71,7 @@ osg:win32 {
for(lib, OSG_LIBS) { for(lib, OSG_LIBS) {
addCopyFileTarget($${lib},$${OSG_SDK_DIR}/bin,$${GCS_APP_PATH}) addCopyFileTarget($${lib},$${OSG_SDK_DIR}/bin,$${GCS_APP_PATH})
win32:addCopyDependenciesTarget($${lib},$${OSG_SDK_DIR}/bin,$${GCS_APP_PATH}) addCopyDependenciesTarget($${lib},$${OSG_SDK_DIR}/bin,$${GCS_APP_PATH})
} }
# osg plugins # osg plugins
@ -85,7 +85,8 @@ osg:win32 {
mingw_osgdb_zip$${DS}.dll \ mingw_osgdb_zip$${DS}.dll \
mingw_osgdb_serializers_osg$${DS}.dll mingw_osgdb_serializers_osg$${DS}.dll
osg_extra:OSG_PLUGINS = \ # more osg plugins
osg_more_plugins:OSG_PLUGINS = \
mingw_osgdb_3dc$${DS}.dll \ mingw_osgdb_3dc$${DS}.dll \
mingw_osgdb_ac$${DS}.dll \ mingw_osgdb_ac$${DS}.dll \
mingw_osgdb_bmp$${DS}.dll \ mingw_osgdb_bmp$${DS}.dll \
@ -151,12 +152,12 @@ osg:win32 {
mingw_osgdb_serializers_osgvolume$${DS}.dll mingw_osgdb_serializers_osgvolume$${DS}.dll
for(lib, OSG_PLUGINS) { for(lib, OSG_PLUGINS) {
addCopyFileTarget($${lib},$${OSG_SDK_DIR}/bin/osgPlugins-$${OSG_VERSION},$${GCS_LIBRARY_PATH}/osg/osgPlugins-$${OSG_VERSION}) addCopyFileTarget($${lib},$${OSG_PLUGINS_DIR},$${GCS_LIBRARY_PATH}/osg/osgPlugins-$${OSG_VERSION})
win32:addCopyDependenciesTarget($${lib},$${OSG_SDK_DIR}/bin/osgPlugins-$${OSG_VERSION},$${GCS_APP_PATH}) addCopyDependenciesTarget($${lib},$${OSG_PLUGINS_DIR},$${GCS_APP_PATH})
} }
} }
osgearth:win32 { win32:osgearth {
# osgearth libraries # osgearth libraries
OSGEARTH_LIBS = \ OSGEARTH_LIBS = \
libosgEarth$${DS}.dll \ libosgEarth$${DS}.dll \
@ -174,7 +175,7 @@ osgearth:win32 {
for(lib, OSGEARTH_LIBS) { for(lib, OSGEARTH_LIBS) {
addCopyFileTarget($${lib},$${OSGEARTH_SDK_DIR}/bin,$${GCS_APP_PATH}) addCopyFileTarget($${lib},$${OSGEARTH_SDK_DIR}/bin,$${GCS_APP_PATH})
win32:addCopyDependenciesTarget($${lib},$${OSGEARTH_SDK_DIR}/bin,$${GCS_APP_PATH}) addCopyDependenciesTarget($${lib},$${OSGEARTH_SDK_DIR}/bin,$${GCS_APP_PATH})
} }
# osgearth plugins # osgearth plugins
@ -187,7 +188,8 @@ osgearth:win32 {
mingw_osgdb_osgearth_xyz$${DS}.dll \ mingw_osgdb_osgearth_xyz$${DS}.dll \
mingw_osgdb_osgearth_cache_filesystem$${DS}.dll mingw_osgdb_osgearth_cache_filesystem$${DS}.dll
osgearth_extra:OSGEARTH_PLUGINS += \ # more osgearth plugins
more_osgearth_plugins:OSGEARTH_PLUGINS += \
mingw_osgdb_kml$${DS}.dll \ mingw_osgdb_kml$${DS}.dll \
mingw_osgdb_osgearth_agglite$${DS}.dll \ mingw_osgdb_osgearth_agglite$${DS}.dll \
mingw_osgdb_osgearth_arcgis_map_cache$${DS}.dll \ mingw_osgdb_osgearth_arcgis_map_cache$${DS}.dll \
@ -225,7 +227,7 @@ osgearth:win32 {
mingw_osgdb_osgearth_yahoo$${DS}.dll mingw_osgdb_osgearth_yahoo$${DS}.dll
for(lib, OSGEARTH_PLUGINS) { for(lib, OSGEARTH_PLUGINS) {
addCopyFileTarget($${lib},$${OSGEARTH_SDK_DIR}/bin/osgPlugins-$${OSG_VERSION},$${GCS_LIBRARY_PATH}/osg/osgPlugins-$${OSG_VERSION}) addCopyFileTarget($${lib},$${OSG_PLUGINS_DIR},$${GCS_LIBRARY_PATH}/osg/osgPlugins-$${OSG_VERSION})
win32:addCopyDependenciesTarget($${lib},$${OSGEARTH_SDK_DIR}/bin/osgPlugins-$${OSG_VERSION},$${GCS_APP_PATH}) addCopyDependenciesTarget($${lib},$${OSG_PLUGINS_DIR},$${GCS_APP_PATH})
} }
} }