flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-22 14:55:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Install crashpad binaries

Browse Source 
refs #490
This commit is contained in:
Roland Winklmeier
2016-08-01 22:36:56 +02:00
parent 080e22fa4a
commit a87a4a7ef1
4 changed files with 35 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
install.pri
View File

@@ -230,10 +230,10 @@ win32-g++ {
############### Install externals ############## ############### Install externals ##############
win32: externals_target.path = $${PREFIX}/bin win32: externals_lib_target.path = $${PREFIX}/bin
else: externals_target.path = $${PREFIX}/lib else: externals_lib_target.path = $${PREFIX}/lib
!win32-g++: externals_target.files *= $${EXTERNALSDIR}/*.$${QMAKE_EXTENSION_SHLIB} !win32-g++: externals_lib_target.files *= $${EXTERNALS_LIB_DIR}/*.$${QMAKE_EXTENSION_SHLIB}
INSTALLS += externals_target INSTALLS += externals_lib_target
# win32-g++ needs a workaround since copy does not accept a filepath with '+' in it # win32-g++ needs a workaround since copy does not accept a filepath with '+' in it
# we also need to make it dependent on vc_runtime_target since this target has no # we also need to make it dependent on vc_runtime_target since this target has no
@@ -241,12 +241,17 @@ INSTALLS += externals_target
win32-g++ { win32-g++ {
vc_runtime_target.depends += copy_externals vc_runtime_target.depends += copy_externals
copy_externals.target = copy_externals copy_externals.target = copy_externals
source_path = $${EXTERNALSDIR}//*.dll source_path = $${EXTERNALS_LIB_DIR}//*.dll
dest_path = $${externals_target.path} dest_path = $${externals_target.path}
copy_externals.commands += xcopy /Y $$shell_path($$source_path) $$shell_path($$dest_path) $$escape_expand(\n\t) copy_externals.commands += xcopy /Y $$shell_path($$source_path) $$shell_path($$dest_path) $$escape_expand(\n\t)
QMAKE_EXTRA_TARGETS += copy_externals QMAKE_EXTRA_TARGETS += copy_externals
} }
win32: externals_bin_target.path = $${PREFIX}/bin
else: externals_bin_target.path = $${PREFIX}/bin
!win32-g++: externals_bin_target.files *= $${EXTERNALS_BIN_DIR}/*
INSTALLS += externals_bin_target
############### Installbuilder ############## ############### Installbuilder ##############
bitrock_customize_bin = $$(BITROCK_CUSTOMIZE) bitrock_customize_bin = $$(BITROCK_CUSTOMIZE)

14
installer/installbuilder/swift-externals.xml
View File

@@ -35,6 +35,20 @@
<allowWildcards>1</allowWildcards> <allowWildcards>1</allowWildcards>
<origin>../../dist/bin/*opus*.dll</origin> <origin>../../dist/bin/*opus*.dll</origin>
</distributionFile> </distributionFile>
<distributionFile>
<origin>../../dist/bin/swift_crashpad_handler.exe</origin>
</distributionFile>
</distributionFileList>
</folder>
<folder>
<description>bin</description>
<destination>${installdir}/bin</destination>
<name>bin_osx</name>
<platforms>osx</platforms>
<distributionFileList>
<distributionFile>
<origin>../../dist/bin/swift_crashpad_handler</origin>
</distributionFile>
</distributionFileList> </distributionFileList>
</folder> </folder>
<folder> <folder>

2
mkspecs/features/common_post.prf
View File

@@ -16,7 +16,7 @@ equals (TEMPLATE, app) {
# Add rpath to externals to run tests without installing. # Add rpath to externals to run tests without installing.
# DYLD_LIBRARY_PATH isn't working anymore since OS X 10.11. # DYLD_LIBRARY_PATH isn't working anymore since OS X 10.11.
unix: QMAKE_LFLAGS *= '-Wl,-rpath,\'$$EXTERNALSDIR\'' unix: QMAKE_LFLAGS *= '-Wl,-rpath,\'$$EXTERNALS_LIB_DIR\''
macx { macx {
contains(CONFIG, app_bundle): QMAKE_LFLAGS *= -Wl,-rpath,@executable_path/../../../../lib/ contains(CONFIG, app_bundle): QMAKE_LFLAGS *= -Wl,-rpath,@executable_path/../../../../lib/

14
mkspecs/features/common_pre.prf
View File

@@ -126,11 +126,17 @@ INCLUDEPATH *= $$EXTERNALSROOT/$$basename(QMAKESPEC)/include
INCLUDEPATH *= $$EXTERNALSROOT/common/include/crashpad INCLUDEPATH *= $$EXTERNALSROOT/common/include/crashpad
INCLUDEPATH *= $$EXTERNALSROOT/common/include/mini_chromium INCLUDEPATH *= $$EXTERNALSROOT/common/include/mini_chromium
equals(WORD_SIZE,64): EXTERNALSDIR = $$EXTERNALSROOT/$$basename(QMAKESPEC)/lib64 equals(WORD_SIZE,64) {
equals(WORD_SIZE,32): EXTERNALSDIR = $$EXTERNALSROOT/$$basename(QMAKESPEC)/lib32 EXTERNALS_BIN_DIR = $$EXTERNALSROOT/$$basename(QMAKESPEC)/bin64
EXTERNALS_LIB_DIR = $$EXTERNALSROOT/$$basename(QMAKESPEC)/lib64
}
equals(WORD_SIZE,32) {
EXTERNALS_BIN_DIR = $$EXTERNALSROOT/$$basename(QMAKESPEC)/bin32
EXTERNALS_LIB_DIR = $$EXTERNALSROOT/$$basename(QMAKESPEC)/lib32
}
LIBS *= -L$$EXTERNALSDIR LIBS *= -L$$EXTERNALS_LIB_DIR
macx: LIBS *= -F$$EXTERNALSDIR macx: LIBS *= -F$$EXTERNALS_LIB_DIR
win32: LIBS *= -luser32 win32: LIBS *= -luser32
INCLUDEPATH *= $$EXTERNALDIR/common/include INCLUDEPATH *= $$EXTERNALDIR/common/include