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

refactor: Disable crashpad

Browse Source
This commit is contained in:
Lars Toenning
2024-12-11 16:05:48 +01:00
parent 497ff56438
commit 29b3224eec
4 changed files with 3 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@@ -140,7 +140,6 @@ add_subdirectory(cmake/vatsimauth)
add_subdirectory(cmake/dbus) add_subdirectory(cmake/dbus)
add_subdirectory(cmake/sodium) add_subdirectory(cmake/sodium)
add_subdirectory(cmake/opus) add_subdirectory(cmake/opus)
add_subdirectory(cmake/crashpad)
add_subdirectory(cmake/simconnect) add_subdirectory(cmake/simconnect)
add_subdirectory(cmake/dplay) add_subdirectory(cmake/dplay)
add_subdirectory(third_party) add_subdirectory(third_party)

6
CMakePresets.json
View File

@@ -7,7 +7,7 @@
"cacheVariables": { "cacheVariables": {
"CMAKE_BUILD_TYPE": "RelWithDebInfo", "CMAKE_BUILD_TYPE": "RelWithDebInfo",
"SWIFT_MINIFY_DEBUG_SYMBOLS": "ON", "SWIFT_MINIFY_DEBUG_SYMBOLS": "ON",
"SWIFT_USE_CRASHPAD": "ON", "SWIFT_USE_CRASHPAD": "OFF",
"SWIFT_BUILD_SAMPLES": "OFF", "SWIFT_BUILD_SAMPLES": "OFF",
"VATSIM_KEY_JSON": "vatsim.json", "VATSIM_KEY_JSON": "vatsim.json",
"CMAKE_INSTALL_PREFIX": "${sourceDir}/dist" "CMAKE_INSTALL_PREFIX": "${sourceDir}/dist"
@@ -24,7 +24,7 @@
"rhs": "Windows" "rhs": "Windows"
}, },
"cacheVariables": { "cacheVariables": {
"SWIFT_USE_CRASHPAD": "ON" "SWIFT_USE_CRASHPAD": "OFF"
} }
}, },
{ {
@@ -38,7 +38,7 @@
"rhs": "Darwin" "rhs": "Darwin"
}, },
"cacheVariables": { "cacheVariables": {
"SWIFT_USE_CRASHPAD": "ON" "SWIFT_USE_CRASHPAD": "OFF"
} }
}, },
{ {

51
cmake/crashpad/CMakeLists.txt
View File

@@ -1,51 +0,0 @@
# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors
# SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
add_library(externals_crashpad INTERFACE)
target_include_directories(externals_crashpad INTERFACE
${PROJECT_SOURCE_DIR}/third_party/externals/common/include
${PROJECT_SOURCE_DIR}/third_party/externals/common/include/crashpad
${PROJECT_SOURCE_DIR}/third_party/externals/common/include/crashpad/mini_chromium
)
if(SWIFT_WIN32)
if(CMAKE_BUILD_TYPE STREQUAL "DEBUG")
target_link_libraries(externals_crashpad INTERFACE
${PROJECT_SOURCE_DIR}/third_party/externals/win32-msvc/32/lib/based.lib
${PROJECT_SOURCE_DIR}/third_party/externals/win32-msvc/32/lib/clientd.lib
${PROJECT_SOURCE_DIR}/third_party/externals/win32-msvc/32/lib/utild.lib
)
else()
target_link_libraries(externals_crashpad INTERFACE
${PROJECT_SOURCE_DIR}/third_party/externals/win32-msvc/32/lib/base.lib
${PROJECT_SOURCE_DIR}/third_party/externals/win32-msvc/32/lib/client.lib
${PROJECT_SOURCE_DIR}/third_party/externals/win32-msvc/32/lib/util.lib
)
endif()
elseif(SWIFT_WIN64)
if(${CMAKE_BUILD_TYPE} STREQUAL "Debug")
target_link_libraries(externals_crashpad INTERFACE
${PROJECT_SOURCE_DIR}/third_party/externals/win32-msvc/64/lib/based.lib
${PROJECT_SOURCE_DIR}/third_party/externals/win32-msvc/64/lib/clientd.lib
${PROJECT_SOURCE_DIR}/third_party/externals/win32-msvc/64/lib/utild.lib
)
else()
target_link_libraries(externals_crashpad INTERFACE
${PROJECT_SOURCE_DIR}/third_party/externals/win32-msvc/64/lib/base.lib
${PROJECT_SOURCE_DIR}/third_party/externals/win32-msvc/64/lib/client.lib
${PROJECT_SOURCE_DIR}/third_party/externals/win32-msvc/64/lib/util.lib
)
endif()
elseif(APPLE)
target_link_libraries(externals_crashpad INTERFACE
${PROJECT_SOURCE_DIR}/third_party/externals/macx-clang/64/lib/libbase.a
${PROJECT_SOURCE_DIR}/third_party/externals/macx-clang/64/lib/libclient.a
${PROJECT_SOURCE_DIR}/third_party/externals/macx-clang/64/lib/libutil.a
)
else()
target_link_libraries(externals_crashpad INTERFACE
${PROJECT_SOURCE_DIR}/third_party/externals/linux-g++/64/lib/libbase.a
${PROJECT_SOURCE_DIR}/third_party/externals/linux-g++/64/lib/libclient.a
${PROJECT_SOURCE_DIR}/third_party/externals/linux-g++/64/lib/libutil.a
)
endif()

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

@@ -36,10 +36,6 @@
<allowWildcards>1</allowWildcards> <allowWildcards>1</allowWildcards>
<origin>../../dist/bin/*opus*.dll</origin> <origin>../../dist/bin/*opus*.dll</origin>
</distributionFile> </distributionFile>
<distributionFile>
<allowWildcards>1</allowWildcards>
<origin>../../dist/bin/*swift_crashpad_handler.exe</origin>
</distributionFile>
<distributionFile> <distributionFile>
<allowWildcards>1</allowWildcards> <allowWildcards>1</allowWildcards>
<origin>../../dist/bin/*7za.exe</origin> <origin>../../dist/bin/*7za.exe</origin>
@@ -52,9 +48,6 @@
<name>bin_linux</name> <name>bin_linux</name>
<platforms>linux linux-x64</platforms> <platforms>linux linux-x64</platforms>
<distributionFileList> <distributionFileList>
<distributionFile>
<origin>../../dist/bin/swift_crashpad_handler</origin>
</distributionFile>
</distributionFileList> </distributionFileList>
</folder> </folder>
<folder> <folder>
@@ -63,9 +56,6 @@
<name>bin_osx</name> <name>bin_osx</name>
<platforms>osx</platforms> <platforms>osx</platforms>
<distributionFileList> <distributionFileList>
<distributionFile>
<origin>../../dist/bin/swift_crashpad_handler</origin>
</distributionFile>
<distributionFile> <distributionFile>
<origin>../../dist/bin/7za</origin> <origin>../../dist/bin/7za</origin>
</distributionFile> </distributionFile>