Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[x-plane] Update to 3.0.3 #15244

Merged
merged 8 commits into from
Dec 23, 2020
Merged

[x-plane] Update to 3.0.3 #15244

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
be891c1
[x-plane] Update to 3.0.3
siavee Dec 21, 2020
ae35dc4
[x-plane] macOS lib deployment includes framework directory
siavee Dec 22, 2020
f733191
[x-plane] CI fixes
siavee Dec 22, 2020
438e89c
[x-plane] Updated supported architectures for 3.0.3 update
siavee Dec 22, 2020
2869bba
Updated supported architectures on ports/x-plane/vcpkg.json
siavee Dec 22, 2020
135d589
[x-plane] CI requested fixes
siavee Dec 22, 2020
8f5c6a1
[x-plane] Using $PORT variable instead of hardcoded one - ports/x-pla…
siavee Dec 22, 2020
61695da
Merge remote-tracking branch 'origin/master' into HEAD
BillyONeal Dec 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions ports/x-plane/CONTROL
View file
Open in desktop

This file was deleted.

34 changes: 18 additions & 16 deletions ports/x-plane/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,37 +1,39 @@
if (VCPKG_TARGET_ARCHITECTURE STREQUAL x86)
message(FATAL_ERROR "the x-plane SDK cannot be built for the x86 architecture")
endif()
vcpkg_fail_port_install(MESSAGE "The X-Plane SDK cannot be built for the x86 architecture" ON_ARCH "x86")

vcpkg_download_distfile(ARCHIVE
URLS http://developer.x-plane.com/wp-content/plugins/code-sample-generation/sample_templates/XPSDK301.zip
FILENAME XPSDK301.zip
SHA512 3044d606039be8230f35a5992d322d4c009b4056f8fb17e929a9f5c2204c084e2c83ddad10801b21727645ec957c8942b83938f81256ec3778dbe75df525e62a
URLS "http://developer.x-plane.com/wp-content/plugins/code-sample-generation/sample_templates/XPSDK303.zip"
FILENAME "XPSDK303.zip"
SHA512 23a1efc893fdb838ce90307ac2e1bf592b03880e9c7bf7aac51cf0d358816931b56a3d603e266f3c9041620190c689dc4d3b28b288bc39cf6e653db6f2125395
)

vcpkg_extract_source_archive_ex(
OUT_SOURCE_PATH SOURCE_PATH
ARCHIVE ${ARCHIVE}
)

file(MAKE_DIRECTORY
${CURRENT_PACKAGES_DIR}/lib
${CURRENT_PACKAGES_DIR}/debug/lib
)
# create lib dir
if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_OSX)
file(MAKE_DIRECTORY
${CURRENT_PACKAGES_DIR}/lib
${CURRENT_PACKAGES_DIR}/debug/lib
)
endif()

# copy headers & sources
file(COPY ${SOURCE_PATH}/CHeaders/Widgets/ DESTINATION ${CURRENT_PACKAGES_DIR}/include)
file(COPY ${SOURCE_PATH}/CHeaders/Wrappers/ DESTINATION ${CURRENT_PACKAGES_DIR}/include)
file(COPY ${SOURCE_PATH}/CHeaders/XPLM/ DESTINATION ${CURRENT_PACKAGES_DIR}/include)

if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
# copy prebuilt libs
if(VCPKG_TARGET_IS_WINDOWS)
file(COPY ${SOURCE_PATH}/Libraries/Win/XPLM_64.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib/)
file(COPY ${SOURCE_PATH}/Libraries/Win/XPWidgets_64.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib/)
file(COPY ${SOURCE_PATH}/Libraries/Win/XPLM_64.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/)
file(COPY ${SOURCE_PATH}/Libraries/Win/XPWidgets_64.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/)
elseif (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin")
file(COPY ${SOURCE_PATH}/Libraries/Mac/XPLM.framework/ DESTINATION ${CURRENT_PACKAGES_DIR}/lib/)
file(COPY ${SOURCE_PATH}/Libraries/Mac/XPWidgets.framework/ DESTINATION ${CURRENT_PACKAGES_DIR}/lib/)
file(COPY ${SOURCE_PATH}/Libraries/Mac/XPLM.framework/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/)
file(COPY ${SOURCE_PATH}/Libraries/Mac/XPWidgets.framework/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/)
elseif (VCPKG_TARGET_IS_OSX)
file(COPY ${SOURCE_PATH}/Libraries/Mac/ DESTINATION ${CURRENT_PACKAGES_DIR}/lib/)
file(COPY ${SOURCE_PATH}/Libraries/Mac/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/)
endif()

# Handle copyright
file(INSTALL ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/x-plane/ RENAME copyright)
7 changes: 7 additions & 0 deletions ports/x-plane/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"name": "x-plane",
"version-string": "3.0.3",
"description": "The X-Plane Plugin SDK",
"homepage": "https://developer.x-plane.com/sdk/",
"supports": "!x86"
}