Use Vcpkg manifest mode and add arm64 mac support #29
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| name: vcpkg-export | ||
| inputs: | ||
| export-type: | ||
| description: 'Either raw or 7zip' | ||
| required: true | ||
| output-name: | ||
| required: true | ||
| runs: | ||
| using: 'composite' | ||
| steps: | ||
| - name: Export installed vcpkg packages | ||
| run: > | ||
| vcpkg export | ||
| --x-all-installed | ||
| --raw | ||
| --output-dir ./ | ||
| --output ${{ inputs.output-name }} | ||
| if: ${{ inputs.export-type == 'raw' }} | ||
| shell: bash | ||
| - name: Export installed vcpkg packages | ||
| run: > | ||
| vcpkg export | ||
| --x-all-installed | ||
| --7zip | ||
| --output-dir ./ | ||
| --output ${{ inputs.output-name }} | ||
| if: ${{ inputs.export-type == '7zip' }} | ||
| shell: bash | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| vcpkg_installed | ||
| vcpkg-*-test |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,56 @@ | ||
| # openmw-deps-build | ||
|
|
||
| This is a repository to host CI jobs to build dependencies for OpenMW via vcpkg to be cached as binary artifacts at [https://gitlab.com/OpenMW/openmw-deps](https://gitlab.com/OpenMW/openmw-deps). | ||
|
|
||
| Jobs start automatically on push to master and automatically push archived artifacts to another git repository. | ||
|
|
||
| [Vcpkg has system requirements](https://learn.microsoft.com/en-us/vcpkg/concepts/supported-hosts) | ||
|
|
||
| ## Secret Setup in CI for Testing | ||
|
|
||
| You can test the repo is working on your own fork using a deploy key and a gpg key you generate. | ||
|
|
||
| To make this work properly multiple [**secrets**](https://docs.github.com/en/actions/security-guides/using-secrets-in-github-actions) have to be configured: | ||
|
|
||
| * `SSH_PRIVATE_KEY` with private SSH key allowed to push changes to repository specified via `PUSH_URL` variable (e.g. generated by `ssh-keygen`). | ||
| * You should use a deploy key setup on your fork of [https://gitlab.com/OpenMW/openmw-dep](https://gitlab.com/OpenMW/openmw-dep) | ||
| * `GPG_PRIVATE_KEY` with private GPG key to sign commits with GPG signature (e.g. generated with `gpg --full-generate-key`). | ||
| * `GPG_PRIVATE_KEY_PASSPHRASE` a passphrase for the `GPG_PRIVATE_KEY` to make it possible to use the GPG key (e.g. the value used during `gpg --full-generate-key`). | ||
| * You can generate a gpg key with the git author information used in CI. It does not need to be associated with any account. | ||
|
|
||
| Also the following [**variable**](https://docs.github.com/en/actions/learn-github-actions/variables) has to be set: | ||
|
|
||
| * `PUSH_URL` with target SSH-based URL for `git push` command (e.g. `[email protected]:OpenMW/openmw-deps.git` or your fork). | ||
|
|
||
| Any pushes should create a branch/commit on the openmw-dep repo. However, the manifest file links will not work. You will need to create a tag/release for that to work. | ||
|
|
||
| ## Testing OpenMW with MacOS (for building on arm64 for arm64) | ||
|
|
||
| You need to install the following: `brew install autoconf autoconf-archive automake` | ||
|
|
||
| 1. `vcpkg install --overlay-ports=ports --overlay-triplets=triplets --triplet arm64-osx-dynamic` | ||
| 1. `vcpkg export --x-all-installed --raw --output vcpkg-macos-test --output-dir DIRECTORY` | ||
|
|
||
| You will need to change the variables towards the top of the OpenMW `before_script.macos.sh` file to: | ||
|
|
||
| ``` | ||
| DEPENDENCIES_ROOT_PATH="/DIRECTORY/vcpkg-macos-test" | ||
| DEPENDENCIES_INSTALLED_PATH="$DEPENDENCIES_ROOT_PATH/installed/arm64-osx-dynamic" | ||
| ``` | ||
|
|
||
| You will also need to change the options to: | ||
|
|
||
| ``` | ||
| declare -a CMAKE_CONF_OPTS=( | ||
| -D CMAKE_PREFIX_PATH="$DEPENDENCIES_INSTALLED_PATH;$QT_PATH" | ||
| -D CMAKE_C_COMPILER_LAUNCHER="ccache" | ||
| -D CMAKE_CXX_COMPILER_LAUNCHER="ccache" | ||
| -D CMAKE_CXX_FLAGS="-stdlib=libc++" | ||
| -D CMAKE_C_COMPILER="clang" | ||
| -D CMAKE_CXX_COMPILER="clang++" | ||
| -D CMAKE_OSX_DEPLOYMENT_TARGET="15.6" | ||
| -D OPENMW_USE_SYSTEM_RECASTNAVIGATION=TRUE | ||
| -D OPENMW_OSX_DEPLOYMENT=TRUE | ||
| -D collada_dom_DIR="$DEPENDENCIES_INSTALLED_PATH/share/collada-dom" | ||
| ) | ||
| ``` |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| --- myguin/CMake/Utils/MyGUIConfigTargets.bak 2023-08-07 11:39:13 | ||
| +++ myguin/CMake/Utils/MyGUIConfigTargets.cmake 2023-08-07 11:39:26 | ||
| @@ -421,15 +421,6 @@ | ||
| # add GCC visibility flags to shared library build | ||
| target_compile_options(${PROJECTNAME} PRIVATE ${MYGUI_GCC_VISIBILITY_OPTIONS}) | ||
| target_compile_definitions(${PROJECTNAME} PRIVATE ${MYGUI_GCC_VISIBILITY_DEFINITIONS}) | ||
| - if (APPLE) | ||
| - # deal with Mac OS X's framework system | ||
| - set_target_properties(${PROJECTNAME} PROPERTIES FRAMEWORK TRUE) | ||
| - set_target_properties(${PROJECTNAME} PROPERTIES PUBLIC_HEADER "${${PROJECTNAME}_HEADERS}") | ||
| - set_target_properties(${PROJECTNAME} PROPERTIES OUTPUT_NAME ${PROJECTNAME}) | ||
| - set_target_properties(${PROJECTNAME} PROPERTIES BUILD_WITH_INSTALL_RPATH TRUE) | ||
| - set_target_properties(${PROJECTNAME} PROPERTIES BUILD_WITH_INSTALL_NAME_DIR TRUE) | ||
| - set_target_properties(${PROJECTNAME} PROPERTIES INSTALL_NAME_DIR "@executable_path/../lib") | ||
| - endif (APPLE) | ||
| endif () | ||
| endif (MYGUI_STATIC) | ||
| mygui_install_target(${PROJECTNAME} "") |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| vcpkg_from_github( | ||
|
Contributor
Author
There was a problem hiding this comment. One day will test if this is even needed for mac
Member
There was a problem hiding this comment. I think the patch just makes it so that MyGUI gets built as a regular library in a regular directory rather than a framework. In general, we want to upstream as many of our ports to mainline vcpkg (it's just openmw-osg being an application-specific fork that means it survived the last round of upstreaming), so if not being a framework is a good thing, we'll probably want to upstream this eventually. |
||
| OUT_SOURCE_PATH SOURCE_PATH | ||
| REPO MyGUI/mygui | ||
| REF MyGUI3.4.3 | ||
| SHA512 88c69ca2e706af364b72d425f95013eb285501881d8094f8d67e31a54c45ca11b0eb5b62c382af0d4c43f69aa8197648259ac306b72efa7ef3e25eecb9b039cb | ||
| PATCHES | ||
| "mygui.patch" | ||
| ) | ||
|
|
||
| set(CMAKE_BUILD_TYPE "Release") | ||
|
|
||
| vcpkg_cmake_configure( | ||
| SOURCE_PATH "${SOURCE_PATH}" | ||
| OPTIONS | ||
| -DMYGUI_RENDERSYSTEM=1 | ||
| -DMYGUI_BUILD_DEMOS=OFF | ||
| -DMYGUI_BUILD_TOOLS=OFF | ||
| -DMYGUI_BUILD_PLUGINS=OFF | ||
| -DMYGUI_DONT_USE_OBSOLETE=ON | ||
| ) | ||
|
|
||
| vcpkg_cmake_install() | ||
| vcpkg_fixup_pkgconfig() | ||
| file(REMOVE_RECURSE | ||
| "${CURRENT_PACKAGES_DIR}/debug/include" | ||
| "${CURRENT_PACKAGES_DIR}/debug/share" | ||
| ) | ||
| vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING.MIT") | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| { | ||
| "name": "openmw-mygui-osx", | ||
| "version": "3.4.3", | ||
| "description": "MyGUI patched/setup for Openmw on OSX", | ||
| "port-version": 1, | ||
| "homepage": "https://github.com/MyGUI/mygui", | ||
| "dependencies": [ | ||
| { | ||
| "name": "vcpkg-cmake", | ||
| "host": true | ||
| } | ||
| ] | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| index b44ef8b..85c29cd 100644 | ||
| --- a/CMakeLists.txt | ||
| +++ b/CMakeLists.txt | ||
| @@ -799,6 +799,8 @@ IF(NOT ANDROID) | ||
| ENDIF() | ||
|
|
||
| ELSE() | ||
| + FIND_PACKAGE(JPEG) | ||
| + FIND_PACKAGE(PNG) | ||
| FIND_PACKAGE(TIFF) | ||
| FIND_PACKAGE(QuickTime) | ||
| FIND_PACKAGE(QTKit) | ||
| diff --git a/src/osgDB/Registry.cpp b/src/osgDB/Registry.cpp | ||
| index 14a8d04..83bacf2 100644 | ||
| --- a/src/osgDB/Registry.cpp | ||
| +++ b/src/osgDB/Registry.cpp | ||
| @@ -308,18 +308,6 @@ Registry::Registry() | ||
|
|
||
| addFileExtensionAlias("js", "V8"); | ||
|
|
||
| -#if defined(DARWIN_IMAGEIO) | ||
| - addFileExtensionAlias("jpg", "imageio"); | ||
| - addFileExtensionAlias("jpe", "imageio"); | ||
| - addFileExtensionAlias("jpeg", "imageio"); | ||
| - addFileExtensionAlias("tif", "imageio"); | ||
| - addFileExtensionAlias("tiff", "imageio"); | ||
| - addFileExtensionAlias("gif", "imageio"); | ||
| - addFileExtensionAlias("png", "imageio"); | ||
| - addFileExtensionAlias("psd", "imageio"); | ||
| - addFileExtensionAlias("tga", "imageio"); | ||
| - | ||
| -#endif | ||
|
|
||
| #if defined(USE_QTKIT) | ||
| addFileExtensionAlias("mov", "QTKit"); | ||
| diff --git a/src/osgPlugins/CMakeLists.txt b/src/osgPlugins/CMakeLists.txt | ||
| index f2ca656..dbeb39c 100644 | ||
| --- a/src/osgPlugins/CMakeLists.txt | ||
| +++ b/src/osgPlugins/CMakeLists.txt | ||
| @@ -239,8 +239,5 @@ ENDIF() | ||
| # ADD_SUBDIRECTORY(OpenAL) | ||
| # ENDIF() | ||
|
|
||
| -IF(APPLE AND NOT ANDROID) | ||
| - ADD_PLUGIN_DIRECTORY(imageio) | ||
| -ENDIF() | ||
|
|
||
| IF(AV_FOUNDATION_FOUND) | ||
| ADD_PLUGIN_DIRECTORY(avfoundation) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.