-
-
Notifications
You must be signed in to change notification settings - Fork 50
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.
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
🚀 Replace vcpkg with conan #641
Open
AnotherFoxGuy
wants to merge
72
commits into
overte-org:master
Choose a base branch
from
AnotherFoxGuy:conan
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
72 commits
Select commit
Hold shift + click to select a range
90c2741
:construction: Replace vcpkg with conan
AnotherFoxGuy 9d6b6e8
:package: Added scribe pkg
AnotherFoxGuy a4f5336
:package: Added nvidia-texture-tools pkg
AnotherFoxGuy c2ad1a3
:package: Added polyvox pkg
AnotherFoxGuy 1de0e40
:package: Added liblo pkg
AnotherFoxGuy 8e04f4e
:wrench: Add conan profiles
AnotherFoxGuy a334bf6
:package: Added qt config
AnotherFoxGuy 77a0069
:package: Added libnode pkg
AnotherFoxGuy 9976d39
:package: Added openvr pkg
AnotherFoxGuy be48266
:wrench: Updated conanfile
AnotherFoxGuy 55ffdce
:package: Added quazip pkg
AnotherFoxGuy 888516b
:bug: Fixed libnode pkg build
AnotherFoxGuy 69214da
:wrench: Added older version of polyvox
AnotherFoxGuy 240cab1
:construction: WIP build with conan
AnotherFoxGuy b107140
:bug: Fixed libnode conan pkg build
AnotherFoxGuy 1dbb94c
:wrench: Downgrade draco
AnotherFoxGuy a8debb1
:bug: Fixed shadergen unable to find tools
AnotherFoxGuy 3347a2f
:bug: Fixed package_libraries_for_deployment()
AnotherFoxGuy 71622ef
:bug: Fixed nvidia-texture-tools build settings
AnotherFoxGuy 2210302
:bug: Fixed polyvox includedirs on linux
AnotherFoxGuy 3c001ca
:bug: Fixed broken libnode package
AnotherFoxGuy c277656
:construction_worker: Disabled gh-actions for now
AnotherFoxGuy 12aeee3
:wrench: Added tool to automatically update conan packages
AnotherFoxGuy 74224dd
:bug: Fixed FixupBundlePostBuild failing to find QT dlls
AnotherFoxGuy e7f53e4
:bug: Fixed domain-server build
AnotherFoxGuy d9c2907
:bug: Fixed texturetest build
AnotherFoxGuy 4e70513
:bug: Fixed ktx-tool build
AnotherFoxGuy 2147275
:bug: Fixed nitpick build
AnotherFoxGuy a549bbf
:bug: Fixed render-texture-load build
AnotherFoxGuy 76da3cc
:wrench: Disabled gpu-frame-player and vhacd-util
AnotherFoxGuy 0a71392
:construction_worker: Added a simple CI build
AnotherFoxGuy f959738
:wrench: Removed unused bullet components
AnotherFoxGuy 9228f8a
:construction_worker: Add missing QT install step
AnotherFoxGuy cb2b316
:bug: Fixed build failing when using Ninja
AnotherFoxGuy f85d7b0
:wrench: Disabled webrtc completely
AnotherFoxGuy d7c1d5e
:green_heart: Fixed CI
AnotherFoxGuy af69d40
:wrench: Move conan generated files to a subfolder
AnotherFoxGuy 443dfb4
:wrench: Disabled unused SDL2 features
AnotherFoxGuy 0fb9090
:wrench: Let cmake find the python3 executable
AnotherFoxGuy 42c9814
Update OpenEXR to 3.1.9 and fix deprecation warnings
JulianGro 9b10784
Use python3 instead of python binary for configuring libnode on Linux
JulianGro 97112d1
Allow building libnode on aarch64
JulianGro b50e2f1
:bug: Fixed missing discord-rpc package
AnotherFoxGuy 76448ab
:bug: Fixed missing lib in liblo conan pkg
AnotherFoxGuy 6706841
:bug: Fixed missing WIN32 definition when building with ninja
AnotherFoxGuy dc0f03f
:bug: Fixed OpenVR failing to link on windows
AnotherFoxGuy 7943457
:wrench: Reenabled build with WebRTC
AnotherFoxGuy a31b78d
:package: Added SteamWorks Conan package
AnotherFoxGuy 6998f72
:package: Added OVR Conan package
AnotherFoxGuy 259030b
:package: Added NeuronDataReader Conan package
AnotherFoxGuy 8dcec58
:package: Added GifCreator Conan package
AnotherFoxGuy d3e441f
:fire: Removed external cmake packages
AnotherFoxGuy 79daf1f
:wrench: Use conan packages instead of cmake external projects
AnotherFoxGuy 727681b
:bug: Fixed dependencies on Linux
AnotherFoxGuy b733a6e
:wrench: Don't generate a qt.conf on Linux
AnotherFoxGuy f8e64b2
:construction_worker: Updated gh actions
AnotherFoxGuy 5181ba3
:bug: Fixed building manual tests
AnotherFoxGuy d11aa3f
:bug: Fixed building tests
AnotherFoxGuy 346092c
:package: Added cgltf Conan package
AnotherFoxGuy b5cf984
:bug: Fixed polyvox trying to build bindings
AnotherFoxGuy eb05679
:bug: Fixed missing libraries on Linux
AnotherFoxGuy db44995
:wrench: Simplify FixupBundlePostBuild
AnotherFoxGuy 2688256
:arrow_up: Updated liblo and node package
AnotherFoxGuy df05172
:arrow_down: Downgraded GLM
AnotherFoxGuy 071c177
:wrench: Disable WebRTC by default
AnotherFoxGuy 3aaef6e
Fix hang on Linux due to some sort of bug in Qt's SSL initialization …
daleglass 1f5900d
:arrow_up: Updated SDL to 2.30.3
AnotherFoxGuy 9251c71
:arrow_up: Updated cgltf to 1.14
AnotherFoxGuy e35e1bc
:wrench: Added artery-font-format
AnotherFoxGuy a9190fc
:arrow_up: Updated google-webrtc to 124
AnotherFoxGuy 35f2231
:wrench: Use system OpenSSL on Linux
AnotherFoxGuy e26b0c6
:wrench: Switch back to prebuild WebRTC for now
AnotherFoxGuy File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains 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,134 @@ | ||
--- | ||
name: Build game | ||
|
||
on: [ push, pull_request ] | ||
|
||
jobs: | ||
build-gcc: | ||
name: Linux build on Ubuntu | ||
runs-on: ubuntu-latest | ||
steps: | ||
- uses: actions/checkout@v4 | ||
with: | ||
submodules: false | ||
fetch-depth: 1 | ||
|
||
- name: Cache conan | ||
id: cache-conan | ||
uses: actions/cache@v4 | ||
with: | ||
key: conan-ubuntu-${{ hashFiles('conanfile.py') }} | ||
restore-keys: | | ||
conan-ubuntu- | ||
path: ~/.conan2/ | ||
|
||
- name: Install dependencies | ||
run: | | ||
curl "https://raw.githubusercontent.com/AnotherFoxGuy/ci-scripts/main/install-conan.sh" | sudo bash | ||
sudo apt-get update | ||
sudo apt-get -y install \ | ||
pkg-config \ | ||
ninja-build \ | ||
qtbase5-dev \ | ||
qtbase5-private-dev \ | ||
qtwebengine5-dev \ | ||
qtwebengine5-dev-tools \ | ||
qtmultimedia5-dev \ | ||
libqt5opengl5-dev \ | ||
qtscript5-dev \ | ||
libqt5scripttools5 \ | ||
libqt5webchannel5-dev \ | ||
libqt5websockets5-dev \ | ||
qtxmlpatterns5-dev-tools \ | ||
qttools5-dev \ | ||
libqt5xmlpatterns5-dev \ | ||
libqt5svg5-dev \ | ||
qml-module-qtwebchannel \ | ||
qml-module-qtquick-controls \ | ||
qml-module-qtquick-controls2 \ | ||
qml-module-qt-labs-settings \ | ||
qml-module-qtquick-dialogs \ | ||
qml-module-qtwebengine | ||
shell: bash | ||
|
||
- name: Fix broken mpg123 lib | ||
if: steps.cache-conan.outputs.cache-hit != 'true' | ||
run: | | ||
conan profile detect --force | ||
echo "tools.system.package_manager:mode = install" > ~/.conan2/global.conf | ||
echo "tools.system.package_manager:sudo = True" >> ~/.conan2/global.conf | ||
conan remote add overte https://git.anotherfoxguy.com/api/packages/overte/conan -f | ||
conan install --requires mpg123/1.31.2 -b mpg123/1.31.2 -b missing | ||
|
||
- name: Install conan pkgs | ||
run: | | ||
conan install . \ | ||
-s build_type=Release \ | ||
-b missing \ | ||
-pr:b=default \ | ||
-c tools.cmake.cmaketoolchain:generator="Ninja" \ | ||
-of build | ||
conan cache clean "*" -sbd | ||
shell: bash | ||
|
||
- name: Configure | ||
run: cmake --preset conan-release | ||
shell: bash | ||
|
||
- name: Build | ||
run: | | ||
cd build | ||
ninja | ||
shell: bash | ||
|
||
build-msvc: | ||
name: Windows build | ||
runs-on: windows-2019 | ||
env: | ||
BUILD_TOOLS_PATH: C:\apps\build-tools\ | ||
steps: | ||
- run: echo $env:BUILD_TOOLS_PATH | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append | ||
|
||
- uses: actions/checkout@v4 | ||
with: | ||
submodules: false | ||
fetch-depth: 1 | ||
|
||
- name: Install Build tools | ||
run: git clone https://git.anotherfoxguy.com/AnotherFoxGuy/build-tools.git %BUILD_TOOLS_PATH% | ||
shell: cmd | ||
|
||
- name: Install Qt5 | ||
uses: jurplel/install-qt-action@v3 | ||
with: | ||
cache: true | ||
cache-key-prefix: windows-QtCache | ||
modules: qtwebengine | ||
|
||
- name: Cache conan packages | ||
uses: actions/cache@v4 | ||
with: | ||
key: conan-windows-${{ hashFiles('conanfile.py') }} | ||
restore-keys: | | ||
conan-windows- | ||
path: ~/.conan2 | ||
|
||
- name: Install conan pkgs | ||
run: | | ||
conan remote add overte https://git.anotherfoxguy.com/api/packages/overte/conan -f | ||
conan install . -b missing -pr:b=tools/conan-profiles/vs-19-release-ninja -pr=tools/conan-profiles/vs-19-release-ninja -of build | ||
conan cache clean "*" -sbd | ||
shell: cmd | ||
|
||
- name: Enable Developer Command Prompt | ||
uses: ilammy/msvc-dev-cmd@v1 | ||
|
||
- name: Configure | ||
run: cmake --preset conan-release | ||
shell: cmd | ||
|
||
- name: Build | ||
run: | | ||
cd build | ||
ninja | ||
shell: cmd |
This file contains 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 |
---|---|---|
|
@@ -131,3 +131,7 @@ interface/compiledResources | |
# Act local GitHub Actions | ||
.secret | ||
|
||
|
||
_build/ | ||
|
||
CMakeUserPresets.json |
This file contains 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 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,23 @@ | ||
# | ||
# FixupBundlePostBuild.cmake | ||
# cmake | ||
# | ||
# Copyright 2015 High Fidelity, Inc. | ||
# Created by Stephen Birarda on February 13, 2014 | ||
# | ||
# Distributed under the Apache License, Version 2.0. | ||
# See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html | ||
# | ||
|
||
include(BundleUtilities) | ||
|
||
if (APPLE) | ||
set(PLUGIN_EXTENSION "dylib") | ||
elseif (WIN32) | ||
set(PLUGIN_EXTENSION "dll") | ||
else() | ||
set(PLUGIN_EXTENSION "so") | ||
endif() | ||
|
||
file(GLOB EXTRA_PLUGINS "${BUNDLE_PLUGIN_DIR}/*.${PLUGIN_EXTENSION}") | ||
fixup_bundle("${BUNDLE_EXECUTABLE}" "${EXTRA_PLUGINS}" "${LIB_PATHS}" IGNORE_ITEM "vcredist_x86.exe;vcredist_x64.exe") |
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Our screenshare is supposed to be completely removed at some point. Just FYI.