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.

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

Use Qt 5.12.3 to work around macOS issues. #1558

Draft
wants to merge 48 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
125841a
Remove the HiFiAC codec
daleglass Sep 27, 2020
61ba1f3
Reinstate partial backwards compatibility with Qt 5.12.3
JulianGro Dec 30, 2021
2275c61
Use Qt 5.12.3 for macOS to work around issue https://github.com/virca…
JulianGro Dec 30, 2021
058b903
Fix Qt 5.12.3 type errors
ctrlaltdavid Dec 30, 2021
28c736e
Add old Qt packages for manual selection.
JulianGro Dec 31, 2021
5a09064
Add metaverse server field on the login screen
Apr 11, 2021
b5258ea
Fix height, tabbing, and other stuff
Apr 11, 2021
3d0c5e2
Fix some anchors and add logging
Apr 12, 2021
d2f8780
Tell the AccountManager that the auth URL changed
Apr 12, 2021
d2f0583
Remove duplicate setAuthURL declaration
Dec 18, 2021
4e399ed
Merge remote-tracking branch 'origin/master' into remove-hifiac
ksuprynowicz Jan 18, 2022
bf48bf0
Merge branch 'vircadia:master' into tell-accountmanager-url-changed
ksuprynowicz Jan 18, 2022
ee77811
Fixed build error due to lack of hifiac
ksuprynowicz Jan 18, 2022
30806ce
Inform AccountManager about metaverse server change
ksuprynowicz Jan 22, 2022
000166b
Update Metaverse server URL on focus change
ksuprynowicz Jan 22, 2022
7db3017
Adding "Places" application
AleziaKurdis Jan 23, 2022
53d1824
Replace "Explore" by "Places" application.
AleziaKurdis Jan 23, 2022
df68f5c
Merge branch 'master' into remove-hifiac
ksuprynowicz Jan 23, 2022
e2d7e55
Merge branch 'master' into tell-accountmanager-url-changed
ksuprynowicz Jan 23, 2022
a91e026
Copyright Adjustment
AleziaKurdis Jan 23, 2022
f8083ee
Copyright adjustment
AleziaKurdis Jan 23, 2022
7af288c
Update domain-server/resources/describe-settings.json
daleglass Jan 27, 2022
3bda3af
typo on function name filterSearchField
AleziaKurdis Jan 28, 2022
b262546
Merge pull request #1 from overte-org/remove-hifiac
ksuprynowicz Jan 28, 2022
8ff6e9a
Merge pull request #3 from AleziaKurdis/feature/Places-app
ksuprynowicz Jan 28, 2022
dc29dc4
Clear password on metaverse server change
ksuprynowicz Jan 28, 2022
6a81255
Merge branch 'tell-accountmanager-url-changed' of https://github.com/…
ksuprynowicz Jan 28, 2022
e6b78fd
Merge pull request #2 from overte-org/tell-accountmanager-url-changed
ksuprynowicz Jan 28, 2022
0e69da9
update teh MS for Overte
AleziaKurdis Jan 31, 2022
79ecad6
Merge pull request #5 from AleziaKurdis/fix/OverteInFederation
ksuprynowicz Feb 5, 2022
f97b1df
Ressources rebranding for Overte
AleziaKurdis Feb 6, 2022
990b4f2
Replace by brand-banner.svg
AleziaKurdis Feb 6, 2022
9b1958e
Replaced by brand-logo.svg
AleziaKurdis Feb 6, 2022
ae3f241
Delete VircadiaLogo.fbx
AleziaKurdis Feb 6, 2022
b10d7af
Delete vircadia.png
AleziaKurdis Feb 6, 2022
43b5e83
Delete vircadia-logo-1880.png
AleziaKurdis Feb 6, 2022
c6f1e64
Updated some URLs, rebranded documentation and changed default metave…
ksuprynowicz Feb 9, 2022
1ab6f17
Replaced the rest of metaverse addresses
ksuprynowicz Feb 10, 2022
55dac33
Merge remote-tracking branch 'origin/master' into overte_rebranding
ksuprynowicz Feb 10, 2022
c214d56
Rebranded Resources for the installer
AleziaKurdis Feb 11, 2022
026cc62
New Overte logo in a better size and spacing
AleziaKurdis Feb 12, 2022
1191168
Fix server-console and ICE server address
ksuprynowicz Feb 12, 2022
2400bc9
Adjustment for Logo ratio
AleziaKurdis Feb 12, 2022
bd457cc
Revert "Adjustment for Logo ratio"
ksuprynowicz Feb 12, 2022
ceb5456
Logo ratio adjustment
AleziaKurdis Feb 12, 2022
7e6fcda
Merge pull request #13 from AleziaKurdis/overte_rebranding
ksuprynowicz Feb 18, 2022
92907bd
Clean up Qt compatibility code
JulianGro Feb 19, 2022
0e8e691
Merge branch 'master' into macOS_old_Qt
JulianGro Feb 19, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/master_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@ jobs:
echo "CMAKE_EXTRA=-DVIRCADIA_CPU_ARCHITECTURE= -DCMAKE_OSX_SYSROOT=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED=OFF -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DOPENSSL_LIBRARIES=/usr/local/opt/openssl/lib -G Xcode" >> $GITHUB_ENV
echo "::set-output name=symbols_archive::${BUILD_NUMBER}-${{ matrix.build_type }}-mac-symbols.zip"
echo "APP_TARGET_NAME=Vircadia" >> $GITHUB_ENV
# Build with old Qt to work around incompatibility with newer Qt versions and macOSXSDK10.12. See https://github.com/vircadia/vircadia/issues/1516
echo "VIRCADIA_USE_QT_VERSION=5.12.3" >> $GITHUB_ENV
fi
# Windows build variables
if [ "${{ matrix.os }}" = "windows-latest" ]; then
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/pr_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,8 @@ jobs:
echo "CMAKE_EXTRA=-DVIRCADIA_CPU_ARCHITECTURE= -DCMAKE_OSX_SYSROOT=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk -DCLIENT_ONLY=1 -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED=OFF -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DOPENSSL_LIBRARIES=/usr/local/opt/openssl/lib -G Xcode" >> $GITHUB_ENV
fi
echo "APP_TARGET_NAME=Vircadia" >> $GITHUB_ENV
# Build with old Qt to work around incompatibility with newer Qt versions and macOSXSDK10.12. See https://github.com/vircadia/vircadia/issues/1516
echo "VIRCADIA_USE_QT_VERSION=5.12.3" >> $GITHUB_ENV
fi
# Windows build variables
if [ "${{ matrix.os }}" = "windows-latest" ]; then
Expand Down
6 changes: 3 additions & 3 deletions BUILD.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ These are not placed in your normal build tree when doing an out of source build

### CMake

Vircadia uses CMake to generate build files and project files for your platform.
Overte uses CMake to generate build files and project files for your platform.

### Qt

Expand Down Expand Up @@ -73,7 +73,7 @@ Note: Installing Qt Creator is optional but recommended if you will be editing Q

### VCPKG

Vircadia uses vcpkg to download and build dependencies.
Overte uses vcpkg to download and build dependencies.
You do not need to install vcpkg.

Building the dependencies can be lengthy and the resulting files will be stored in your OS temp directory.
Expand Down Expand Up @@ -177,7 +177,7 @@ In the examples below the variable $NAME would be replaced by the name of the de

* $NAME_ROOT_DIR - pass this variable to Cmake with the -DNAME_ROOT_DIR= flag when running Cmake to generate build files
* $NAME_ROOT_DIR - set this variable in your ENV
* HIFI_LIB_DIR - set this variable in your ENV to your Vircadia lib folder, should contain a folder '$name'
* HIFI_LIB_DIR - set this variable in your ENV to your Overte lib folder, should contain a folder '$name'

## Optional Components

Expand Down
2 changes: 1 addition & 1 deletion BUILD_ANDROID.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ SUPPRESS_QUEST_FRAME_PLAYER

### Clone the repository

`git clone https://github.com/vircadia/vircadia.git`
`git clone https://github.com/overte-org/overte.git`

## Building & Running

Expand Down
6 changes: 3 additions & 3 deletions BUILD_LINUX.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

Please read the [general build guide](BUILD.md) for information on dependencies required for all platforms. Only Linux specific instructions are found in this file.

You can use the [Vircadia Builder](https://github.com/vircadia/vircadia-builder) to build on Linux more easily. Alternatively, you can follow the manual steps below.
You can use the [Overte Builder](https://github.com/overte-org/overte-builder) to build on Linux more easily. Alternatively, you can follow the manual steps below.

## Ubuntu 18.04

Expand Down Expand Up @@ -84,7 +84,7 @@ sudo apt-get install nodejs

Clone this repository:
```bash
git clone https://github.com/vircadia/vircadia.git
git clone https://github.com/overte-org/overte.git
```

Then checkout the master branch with:
Expand Down Expand Up @@ -127,7 +127,7 @@ Setting `VIRCADIA_CPU_ARCHITECTURE` to an empty string will use the default comp

Create the build directory:
```bash
cd vircadia
cd overte
mkdir build
cd build
```
Expand Down
9 changes: 8 additions & 1 deletion BUILD_OSX.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Please read the [general build guide](BUILD.md) for information on dependencies

### CMake, OpenSSL, and NPM

[Homebrew](https://brew.sh/) is an excellent package manager for macOS. It makes the installation of some Vircadia dependencies very simple.
[Homebrew](https://brew.sh/) is an excellent package manager for macOS. It makes the installation of some Overte dependencies very simple.

```bash
brew install cmake openssl npm
Expand All @@ -29,6 +29,13 @@ You will need version `10.12` of the macOS SDK for building, otherwise you may e
cp -rp ~/Downloads/MacOSX10.12.sdk /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/
```

When using macOSXSDK10.12, you also need to use an older Qt package to avoid compatibility issues on Big Sur and newer.
To do this, set the appropriate environment variable:
```bash
VIRCADIA_USE_QT_VERSION=5.12.3
```
See https://github.com/vircadia/vircadia/issues/1516.

### OpenSSL

Assuming you've installed OpenSSL using the homebrew instructions above, you'll need to set `OPENSSL_ROOT_DIR` so CMake can find your installations.
Expand Down
12 changes: 6 additions & 6 deletions BUILD_WIN.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

*Last Updated on 15 Apr 2021*

This is a stand-alone guide for creating your first Vircadia build for Windows 64-bit.
This is a stand-alone guide for creating your first Overte build for Windows 64-bit.

Note: We are now using Visual Studio 2019 and Qt 5.15.2.
If you are upgrading from previous versions, do a clean uninstall of those versions before going through this guide.
Expand Down Expand Up @@ -68,7 +68,7 @@ To create this variable:
* Set "Variable value" to `%QT_INSTALL_DIR%\5.15.2\msvc2019_64\lib\cmake`, where `%QT_INSTALL_DIR%` is the directory you specified for Qt's installation. The default is `C:\Qt`.

## Step 6. Create VCPKG environment variable
In the next step, you will use CMake to build Vircadia. By default, the CMake process builds dependency files in Windows' `%TEMP%` directory, which is periodically cleared by the operating system. To prevent you from having to re-build the dependencies in the event that Windows clears that directory, we recommend that you create a `HIFI_VCPKG_BASE` environment variable linked to a directory somewhere on your machine. That directory will contain all dependency files until you manually remove them.
In the next step, you will use CMake to build Overte. By default, the CMake process builds dependency files in Windows' `%TEMP%` directory, which is periodically cleared by the operating system. To prevent you from having to re-build the dependencies in the event that Windows clears that directory, we recommend that you create a `HIFI_VCPKG_BASE` environment variable linked to a directory somewhere on your machine. That directory will contain all dependency files until you manually remove them.

To create this variable:
* Navigate to 'Edit the System Environment Variables' Through the Start menu.
Expand Down Expand Up @@ -96,7 +96,7 @@ Run Command Prompt from Start and run the following commands:
### Visual Studio 2019
Run `cmake .. -G "Visual Studio 16 2019" -A x64`.

Where `%VIRCADIA_DIR%` is the directory for the Vircadia repository.
Where `%VIRCADIA_DIR%` is the directory for the Overte repository.

## Step 8. Making a Build

Expand All @@ -116,16 +116,16 @@ Restart Visual Studio again.

In Visual Studio, right-click "interface" under the Apps folder in Solution Explorer and select "Set as Startup Project". Run from the menu bar `Debug > Start Debugging`.

Now, you should have a full build of Vircadia and be able to run the Interface using Visual Studio.
Now, you should have a full build of Overte and be able to run the Interface using Visual Studio.

Note: You can also run Interface by launching it from command line or File Explorer from `%VIRCADIA_DIR%\build\interface\Release\interface.exe`

# Troubleshooting

For any problems after Step #7, first try this:
* Delete your locally cloned copy of the Vircadia repository
* Delete your locally cloned copy of the Overte repository
* Restart your computer
* Redownload the [repository](https://github.com/vircadia/vircadia)
* Redownload the [repository](https://github.com/overte.org/overte)
* Restart directions from Step #7

## CMake gives you the same error message repeatedly after the build fails
Expand Down
14 changes: 7 additions & 7 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -75,14 +75,14 @@ if ((NOT "${RELEASE_TYPE}" STREQUAL "PRODUCTION") AND (NOT "${RELEASE_TYPE}" STR
endif()

# VIRCADIA_OPTIMIZE
# Variable determining vircadia optimization. If not set, it defaults to true.
# Variable determining Overte optimization. If not set, it defaults to true.
# It's used to determine build flags for main codebase and for VCPKG dependencies.
# Should be set to false to get completely unoptimized build for easier line-by-line debugging

if( NOT WIN32 )
if(NOT DEFINED VIRCADIA_OPTIMIZE)
message("Enabling code optimization for Vircadia and compiled dependencies")
set(VIRCADIA_OPTIMIZE true CACHE BOOL "Enable code optimization for Vircadia and compiled dependencies")
message("Enabling code optimization for Overte and compiled dependencies")
set(VIRCADIA_OPTIMIZE true CACHE BOOL "Enable code optimization for Overte and compiled dependencies")
endif()

#compiler needs to be detected before building VCPKG dependencies
Expand All @@ -107,8 +107,8 @@ if( NOT WIN32 )
MESSAGE(STATUS "VIRCADIA_OPTIMIZE: ${VIRCADIA_OPTIMIZE}")

# VIRCADIA_CPU_ARCHITECTURE
# Variable determining CPU architecture for which Vircadia will be built.
# If defined, it's appended to CXXFLAGS and CFLAGS for both Vircadia and VCPKG dependencies
# Variable determining CPU architecture for which Overte will be built.
# If defined, it's appended to CXXFLAGS and CFLAGS for both Overte and VCPKG dependencies

#Assume -march=native for compilers that allow it if architecture is not specified
if(NOT DEFINED VIRCADIA_CPU_ARCHITECTURE)
Expand Down Expand Up @@ -349,7 +349,7 @@ GroupSources("scripts")
GroupSources("unpublishedScripts")
unset(JS_SRC)

# Include Vircadia Web app files if cloned into a subdirectory.
# Include Overte Web app files if cloned into a subdirectory.
if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/vircadia-web")
file(GLOB_RECURSE WEB_APP_SRC vircadia-web/*.*)
list(FILTER WEB_APP_SRC EXCLUDE REGEX "vircadia-web/(dist|node_modules|public)/*" )
Expand All @@ -358,7 +358,7 @@ if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/vircadia-web")
unset(WEB_APP_SRC)
endif()

# Include Vircadia Web SDK files if cloned into a subdirectory.
# Include Overte Web SDK files if cloned into a subdirectory.
if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/vircadia-web-sdk")
file(GLOB_RECURSE WEB_SDK_SRC vircadia-web-sdk/*.*)
list(FILTER WEB_SDK_SRC EXCLUDE REGEX "vircadia-web-sdk/(dist|node_modules|public)/*" )
Expand Down
6 changes: 3 additions & 3 deletions CODING_STANDARD.md
Original file line number Diff line number Diff line change
Expand Up @@ -976,9 +976,9 @@ while (true) {

#### [4.3.4] Source files (header and implementation) must include a boilerplate.

Boilerplates should include the filename, creator, copyright Vircadia contributors, and Apache 2.0 License information.
This should be placed at the top of the file. If editing an existing file that is copyright High Fidelity, add a second
copyright line, copyright Vircadia contributors.
Boilerplates should include the filename, creator, copyright Overte e.V., and Apache 2.0 License information.
This should be placed at the top of the file. If editing an existing file that is copyright High Fidelity or
Vircadia contributors, add an additional copyright line, copyright Overte e.V.

```cpp
//
Expand Down
12 changes: 6 additions & 6 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Contributing
2. Clone your fork of the repository locally

```
git clone git://github.com/USERNAME/vircadia.git
git clone git://github.com/USERNAME/overte.git
```
3. Create a new branch

Expand All @@ -21,7 +21,7 @@ Contributing
6. Update your branch

```
git remote add upstream https://github.com/vircadia/vircadia
git remote add upstream https://github.com/overte-org/overte
git pull upstream master
```

Expand All @@ -48,10 +48,10 @@ To make the QA process go as smoothly as possible.
Reporting Bugs
===
1. Always update to the latest code on master, we make many merges every day and it is possible the bug has already been fixed!
2. Search [issues](https://github.com/vircadia/vircadia/issues) to make sure that somebody has not already reported the same bug.
3. [Add](https://github.com/vircadia/vircadia/issues/new) your report to the issues list!
2. Search [issues](https://github.com/overte-org/overte/issues) to make sure that somebody has not already reported the same bug.
3. [Add](https://github.com/overte-org/overte/issues/new) your report to the issues list!

Requesting a Feature
===
1. Search [issues](https://github.com/vircadia/vircadia/issues) to make sure that somebody has not already requested the same feature.
2. [Add](https://github.com/vircadia/vircadia/issues/new) your request to the issues list!
1. Search [issues](https://github.com/overte-org/overte/issues) to make sure that somebody has not already requested the same feature.
2. [Add](https://github.com/overte-org/overte/issues/new) your request to the issues list!