diff --git a/CMakeLists.txt b/CMakeLists.txt index 42717c496d..74365e2edb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -66,6 +66,26 @@ if (YUZU_STATIC_ROOM) set(fmt_FORCE_BUNDLED ON) endif() +# my unity/jumbo build +option(ENABLE_UNITY_BUILD "Enable Unity/Jumbo build" OFF) + +# 0 compiles all files in +# not ideal, but if you're going gung-ho with a unity build, expect failure +# MSVC physically can't compile that many files into one TU, so we limit it to 100. +if (MSVC) + set(_unity_default 100) +else() + set(_unity_default 0) +endif() + +set(UNITY_BATCH_SIZE ${_unity_default} CACHE STRING "Unity build batch size") + +if(MSVC AND ENABLE_UNITY_BUILD) + message(STATUS "Unity build") + # Unity builds need big objects for MSVC... + add_compile_options(/bigobj) +endif() + # qt stuff option(ENABLE_QT "Enable the Qt frontend" ON) option(ENABLE_QT_TRANSLATION "Enable translations for the Qt frontend" OFF) diff --git a/dist/dev.eden_emu.eden.svg b/dist/dev.eden_emu.eden.svg index 7711945aa4..f88b52f625 100644 --- a/dist/dev.eden_emu.eden.svg +++ b/dist/dev.eden_emu.eden.svg @@ -1,21 +1,203 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + inkscape:current-layer="svg7" /> + + diff --git a/dist/eden.bmp b/dist/eden.bmp index cffc04b308..888138ccf7 100644 Binary files a/dist/eden.bmp and b/dist/eden.bmp differ diff --git a/dist/eden.ico b/dist/eden.ico index 106742c9ba..45120ef312 100644 Binary files a/dist/eden.ico and b/dist/eden.ico differ diff --git a/dist/qt_themes/default/icons/256x256/eden.png b/dist/qt_themes/default/icons/256x256/eden.png index d7286ac4c6..3c4bd566a1 100644 Binary files a/dist/qt_themes/default/icons/256x256/eden.png and b/dist/qt_themes/default/icons/256x256/eden.png differ diff --git a/docs/Deps.md b/docs/Deps.md index a34e838534..80caf1685f 100644 --- a/docs/Deps.md +++ b/docs/Deps.md @@ -334,7 +334,7 @@ pacman -Syuu --needed --noconfirm $packages HaikuOS ```sh -pkgman install git cmake patch libfmt_devel nlohmann_json lz4_devel opus_devel boost1.89_devel vulkan_devel qt6_base_devel qt6_declarative_devel libsdl2_devel ffmpeg7_devel libx11_devel enet_devel catch2_devel quazip1_qt5_devel qt6_5compat_devel glslang qt6_devel qt6_charts_devel +pkgman install git cmake patch libfmt_devel nlohmann_json lz4_devel opus_devel boost1.90_devel vulkan_devel qt6_base_devel qt6_declarative_devel libsdl2_devel ffmpeg7_devel libx11_devel enet_devel catch2_devel quazip1_qt5_devel qt6_5compat_devel glslang qt6_devel qt6_charts_devel ``` [Caveats](./Caveats.md#haikuos). diff --git a/docs/Options.md b/docs/Options.md index 3eb6effe92..adb401eaf1 100644 --- a/docs/Options.md +++ b/docs/Options.md @@ -40,6 +40,7 @@ These options control dependencies. - This option is subject for removal. - `YUZU_TESTS` (ON) Compile tests - requires Catch2 - `ENABLE_LTO` (OFF) Enable link-time optimization +- `ENABLE_UNITY_BUILD` (OFF) Enables "Unity/Jumbo" builds - Not recommended on Windows - UNIX may be better off appending `-flto=thin` to compiler args - `USE_FASTER_LINKER` (OFF) Check if a faster linker is available diff --git a/docs/README.md b/docs/README.md index 4ea532be8e..68775f99d8 100644 --- a/docs/README.md +++ b/docs/README.md @@ -16,6 +16,7 @@ This contains documentation created by developers. This contains build instructi - **[Dynarmic](./dynarmic)** - **[Cross compilation](./CrossCompile.md)** - **[Driver Bugs](./DriverBugs.md)** +- **[Building Older Commits](./build/OlderCommits.md)** ## Policies diff --git a/docs/build/OlderCommits.md b/docs/build/OlderCommits.md new file mode 100644 index 0000000000..91e267213e --- /dev/null +++ b/docs/build/OlderCommits.md @@ -0,0 +1,40 @@ +# Building Older Commits + +Bisecting and debugging older versions of Eden can be difficult, as many of our submodules have been deleted or removed. However, work has been done to make this process as simple as possible for users. + +## Script + +Copy the following script and store it in `fix.sh`: + +```sh +#!/bin/sh -e + +git -C externals/discord-rpc checkout 0d8b2d6a37c6e47d62b37caa14708bf747c883bb +git add externals/discord-rpc + +git -C externals/dynarmic checkout 05b7ba50588d1004e23ef91f1bda8be234be68f4 +git add externals/dynarmic + +git -C externals/mbedtls checkout ce4f81f4a926a0e0dcadd0128e016baba416e8ea +git add externals/mbedtls + +git -C externals/oboe checkout e4f06f2143eb0173bf4a2bd15aae5e8cc3179405 +git add externals/oboe + +git -C externals/sirit checkout b870b062998244231a4f08004d3b25151732c5c5 +git add externals/sirit +``` + +Then, run `chmod +x fix.sh` + +## Submodules + +To check out submodules successfully, use this order of operations: + +```sh +git submodule update --init --recursive --depth 1 --jobs 8 --progress +./fix.sh +git submodule update --init --recursive --depth 1 --jobs 8 --progress +``` + +And you should be good to go! If you check out a different commit that changes submodule commits, run the above command list again. diff --git a/docs/user/Multiplayer.md b/docs/user/Multiplayer.md index a501ba1d02..57c4495f46 100644 --- a/docs/user/Multiplayer.md +++ b/docs/user/Multiplayer.md @@ -56,7 +56,7 @@ Use this when you need to connect to a multiplayer room for LDN functionality in - Multiplayer Options Configured in Eden Settings - Network Access -## Steps +### Steps There are 2 primary methods that you can use to connect to an existing room, depending on how the room is hosted. - Joining a Public Lobby @@ -70,7 +70,7 @@ There are 2 primary methods that you can use to connect to an existing room, dep -### Joining a Public Lobby +## Joining a Public Lobby 1. Open Eden and navigate to *Multiplayer → Browse Public Game Lobby*. 2. The **Public Room Browser** will now open and display a list of publicly accessible rooms. Find one you want to connect to and double click it. @@ -90,7 +90,7 @@ If the hoster has not made the lobby public, or you don't want to find it in the --- -# Hosting a Multiplayer Room +## Hosting a Multiplayer Room Use this guide for when you want to host a multiplayer lobby to play with others in Eden. In order to have someone access the room from outside your local network, see the *Access Your Multiplayer Room Externally* section for next steps. **Click [Here](https://evilperson1337.notion.site/Hosting-a-Multiplayer-Room-2c357c2edaf6819481dbe8a99926cea2) for a version of this guide with images & visual elements.** @@ -100,7 +100,7 @@ Use this guide for when you want to host a multiplayer lobby to play with others - Network Access - Ability to allow programs through the firewall on your device. -## Steps +### Steps 1. Open Eden and navigate to *Emulation → Multiplayer → Create Room.* 2. Fill out the following information in the popup dialog box. @@ -120,7 +120,7 @@ Use this guide for when you want to host a multiplayer lobby to play with others --- -# Access Your Multiplayer Room Externally +## Access Your Multiplayer Room Externally Quite often the person with whom you want to play is located off of your internal network (LAN). If you want to host a room and play with them you will need to get your devices to communicate with each other. This guide will go over your options on how to do this so that you can play together. **Click [Here](https://evilperson1337.notion.site/Access-Your-Multiplayer-Room-Externally-2c357c2edaf681c0ab2ce2ee624d809d) for a version of this guide with images & visual elements.** @@ -129,9 +129,9 @@ Quite often the person with whom you want to play is located off of your interna - Eden set up and Functioning - Network Access -## Options +### Options -### Port Forwarding +#### Port Forwarding - **Difficulty Level**: High @@ -148,8 +148,9 @@ The process works by creating a static mapping—often called a “port-forward For our purposes we would pick the port we want to expose (*e.g. 24872*) and we would access our router's configuration and create a port-forward rule to send the traffic from an external connection to your local machine over our specified port (*24872)*. The exact way to do so, varies greatly by router manufacturer - and sometimes require contacting your ISP to do so depending on your agreement. You can look up your router on [*portforward.com*](https://portforward.com/router.htm) which may have instructions on how to do so for your specific equipment. If it is not there, you will have to use Google/ChatGPT to determine the steps for your equipment. +Remember you can't have one port open for multiple devices at the same time - you must only host from one device (or do more convoluted networking which we will not cover here). -### Use a Tunnelling Service +#### Use a Tunnelling Service - **Difficulty Level**: Easy