mirrors/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-04-20 19:44:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into add-build-steps

Browse source
This commit is contained in:
Camden 2024-12-15 01:30:11 -06:00 • committed by GitHub
commit 538691e67b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 55 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
CMakeLists.txt
View file

@ -890,3 +890,43 @@ list(APPEND CPACK_SOURCE_IGNORE_FILES "${CMAKE_BINARY_DIR}")
# CPack must be included after the CPACK_* variables are set in order for those
# variables to take effect.
Include(CPack)
# print out flags
message(STATUS "USE_SYSTEM_LIBS: ${USE_SYSTEM_LIBS}")
message(STATUS "USE_UPNP: ${USE_UPNP}")
message(STATUS "ENABLE_NOGUI: ${ENABLE_NOGUI}")
message(STATUS "ENABLE_QT: ${ENABLE_QT}")
message(STATUS "ENABLE_LTO: ${ENABLE_LTO}")
message(STATUS "ENABLE_GENERIC: ${ENABLE_GENERIC}")
message(STATUS "ENABLE_HEADLESS: ${ENABLE_HEADLESS}")
message(STATUS "ENABLE_ALSA: ${ENABLE_ALSA}")
message(STATUS "ENABLE_PULSEAUDIO: ${ENABLE_PULSEAUDIO}")
message(STATUS "ENABLE_LLVM: ${ENABLE_LLVM}")
message(STATUS "ENABLE_TESTS: ${ENABLE_TESTS}")
message(STATUS "ENABLE_VULKAN: ${ENABLE_VULKAN}")
message(STATUS "USE_DISCORD_PRESENCE: ${USE_DISCORD_PRESENCE}")
message(STATUS "USE_MGBA: ${USE_MGBA}")
message(STATUS "ENABLE_AUTOUPDATE: ${ENABLE_AUTOUPDATE}")
message(STATUS "USE_RETRO_ACHIEVEMENTS: ${USE_RETRO_ACHIEVEMENTS}")
message(STATUS "ENABLE_DRM: ${ENABLE_DRM}")
message(STATUS "ENABLE_X11: ${ENABLE_X11}")
message(STATUS "ENABLE_EGL: ${ENABLE_EGL}")
message(STATUS "ENABLE_SDL: ${ENABLE_SDL}")
message(STATUS "ENABLE_ANALYTICS: ${ENABLE_ANALYTICS}")
message(STATUS "ENCODE_FRAMEDUMPS: ${ENCODE_FRAMEDUMPS}")
message(STATUS "ENABLE_GPROF: ${ENABLE_GPROF}")
message(STATUS "FASTLOG: ${FASTLOG}")
message(STATUS "OPROFILING: ${OPROFILING}")
message(STATUS "DSPTOOL: ${DSPTOOL}")
message(STATUS "MACOS_USE_DEFAULT_SEARCH_PATH: ${MACOS_USE_DEFAULT_SEARCH_PATH}")
message(STATUS "SKIP_POSTPROCESS_BUNDLE: ${SKIP_POSTPROCESS_BUNDLE}")
message(STATUS "MACOS_CODE_SIGNING: ${MACOS_CODE_SIGNING}")
message(STATUS "MACOS_CODE_SIGNING_IDENTITY: ${MACOS_CODE_SIGNING_IDENTITY}")
message(STATUS "USE_BUNDLED_MOLTENVK: ${USE_BUNDLED_MOLTENVK}")
message(STATUS "ENABLE_VTUNE: ${ENABLE_VTUNE}")
message(STATUS "LINUX_LOCAL_DEV: ${LINUX_LOCAL_DEV}")
message(STATUS "OpenGL_GL_PREFERENCE: ${OpenGL_GL_PREFERENCE}")
message(STATUS "CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
message(STATUS "CMAKE_INSTALL_PREFIX: ${CMAKE_INSTALL_PREFIX}")

4
Readme.md
View file

@ -3,13 +3,13 @@
### Debug Build steps
1. `mkdir build`
2. `cd build`
3. `cmake .. -DENABLE_NOGUI=ON -DENABLE_QT=OFF -DENABLE_HEADLESS=ON -DENABLE_ALSA=OFF -DENABLE_PULSEAUDIO=OFF -DENABLE_VULKAN=ON -DFASTLOG=ON -DENABLE_AUTOUPDATE=OFF -DENABLE_SDL=OFF -DENCODE_FRAMEDUMPS=OFF -DENABLE_LLVM=OFF -DENABLE_X11=OFF -DENABLE_ANALYTICS=OFF -DCMAKE_BUILD_TYPE=Debug -DENABLE_EGL=OFF -DUSE_RETRO_ACHIEVEMENTS=OFF -DUSE_DISCORD_PRESENCE=OFF`
3. `cmake .. -G Ninja -DENABLE_NOGUI=ON -DENABLE_QT=OFF -DENABLE_HEADLESS=ON -DENABLE_ALSA=OFF -DENABLE_PULSEAUDIO=OFF -DENABLE_VULKAN=ON -DFASTLOG=ON -DENABLE_AUTOUPDATE=OFF -DENABLE_SDL=OFF -DENCODE_FRAMEDUMPS=OFF -DENABLE_LLVM=OFF -DENABLE_X11=OFF -DENABLE_ANALYTICS=OFF -DCMAKE_BUILD_TYPE=Debug -DENABLE_EGL=OFF -DUSE_RETRO_ACHIEVEMENTS=OFF -DUSE_DISCORD_PRESENCE=OFF`
4. `ninja -j $(nproc)`
### Performance Build steps
1. `mkdir build`
2. `cd build`
3. `cmake .. -DENABLE_NOGUI=ON -DENABLE_QT=OFF -DENABLE_HEADLESS=ON -DENABLE_ALSA=OFF -DENABLE_PULSEAUDIO=OFF -DENABLE_VULKAN=ON -DFASTLOG=OFF -DENABLE_AUTOUPDATE=OFF -DENABLE_SDL=OFF -DENCODE_FRAMEDUMPS=ON -DENABLE_LLVM=OFF -DENABLE_X11=OFF -DCMAKE_BUILD_TYPE=Release -DENABLE_EGL=OFF -DENABLE_ANALYTICS=OFF -DUSE_RETRO_ACHIEVEMENTS=OFF -DUSE_DISCORD_PRESENCE=OFF -DCMAKE_CXX_FLAGS="-march=native -mtune=native -flto -O3" -DCMAKE_C_FLAGS="-march=native -mtune=native -flto -O3"`
3. `cmake .. -G Ninja -DENABLE_NOGUI=ON -DENABLE_QT=OFF -DENABLE_HEADLESS=ON -DENABLE_ALSA=OFF -DENABLE_PULSEAUDIO=OFF -DENABLE_VULKAN=ON -DFASTLOG=OFF -DENABLE_AUTOUPDATE=OFF -DENABLE_SDL=OFF -DENCODE_FRAMEDUMPS=ON -DENABLE_LLVM=OFF -DENABLE_X11=OFF -DCMAKE_BUILD_TYPE=Release -DENABLE_EGL=OFF -DENABLE_ANALYTICS=OFF -DUSE_RETRO_ACHIEVEMENTS=OFF -DUSE_DISCORD_PRESENCE=OFF -DCMAKE_CXX_FLAGS="-march=native -mtune=native -flto -O3" -DCMAKE_C_FLAGS="-march=native -mtune=native -flto -O3"`
4. `ninja -j $(nproc)`

10
Source/Core/Core/AchievementManager.h
View file

@ -275,6 +275,16 @@ private:
#include <string>
namespace Gecko
{
class GeckoCode;
} // namespace Gecko
namespace ActionReplay
{
struct ARCode;
} // namespace ActionReplay
namespace DiscIO
{
class Volume;

3
Source/Core/DolphinTool/VerifyCommand.cpp
View file

@ -163,11 +163,14 @@ int VerifyCommand(const std::vector<std::string>& args)
verifier.Finish();
const DiscIO::VolumeVerifier::Result& result = verifier.GetResult();
#ifdef USE_RETRO_ACHIEVEMENTS
// Calculate rcheevos hash
if (rc_hash_calculate)
{
rc_hash_result = AchievementManager::CalculateHash(input_file_path);
}
#endif
// Print the report
if (!algorithm_is_set)