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

refactor: Move externals/ to third_party/

Browse Source
This commit is contained in:
Lars Toenning
2023-12-17 11:32:53 +01:00
parent 3d79451e7a
commit 52cb97c222
20 changed files with 110 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/xswiftbus/CMakeLists.txt
View File

@@ -111,11 +111,11 @@ target_link_libraries(xswiftbus PUBLIC externals_event externals_dbus externals_
if(SWIFT_WIN32)
set(PNG_LIBRARIES ${swift_SOURCE_DIR}/externals/win32-msvc/32/lib/png.lib)
set(ZLIB_LIBRARIES ${swift_SOURCE_DIR}/externals/win32-msvc/32/lib/z.lib)
set(PNG_LIBRARIES ${swift_SOURCE_DIR}/third_party/externals/win32-msvc/32/lib/png.lib)
set(ZLIB_LIBRARIES ${swift_SOURCE_DIR}/third_party/externals/win32-msvc/32/lib/z.lib)
elseif(SWIFT_WIN64)
set(PNG_LIBRARIES ${swift_SOURCE_DIR}/externals/win32-msvc/64/lib/png.lib)
set(ZLIB_LIBRARIES ${swift_SOURCE_DIR}/externals/win32-msvc/64/lib/z.lib)
set(PNG_LIBRARIES ${swift_SOURCE_DIR}/third_party/externals/win32-msvc/64/lib/png.lib)
set(ZLIB_LIBRARIES ${swift_SOURCE_DIR}/third_party/externals/win32-msvc/64/lib/z.lib)
else()
find_package(PNG REQUIRED)
@@ -190,8 +190,8 @@ if(WIN32)
configure_file(${swift_SOURCE_DIR}/src/blackmisc/share/dbus-1/session.conf.in ${CMAKE_CURRENT_BINARY_DIR}/session.conf)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/session.conf DESTINATION xswiftbus/64/share/dbus-1/)
install(FILES ${swift_SOURCE_DIR}/externals/win32-msvc/64/bin/dbus-daemon.exe DESTINATION xswiftbus/64/)
install(FILES ${swift_SOURCE_DIR}/externals/win32-msvc/64/lib/expat.dll DESTINATION xswiftbus/64/)
install(FILES ${swift_SOURCE_DIR}/third_party/externals/win32-msvc/64/bin/dbus-daemon.exe DESTINATION xswiftbus/64/)
install(FILES ${swift_SOURCE_DIR}/third_party/externals/win32-msvc/64/lib/expat.dll DESTINATION xswiftbus/64/)
endif()
install(DIRECTORY LegacyData DESTINATION xswiftbus)