diff --git a/CMakeLists.txt b/CMakeLists.txt index 92f0bd625..4261364c8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,6 +37,10 @@ message(STATUS "Target architecture: XE_TARGET_AARCH64=${XE_TARGET_AARCH64} XE_T option(XENIA_BUILD_TESTS "Build test suites" OFF) option(XENIA_BUILD_MISC "Build misc subprojects (trace viewers, shader compiler, vfs-dump, demos)" OFF) +# Toggle profiler +add_compile_definitions(XE_OPTION_PROFILING=1) +add_compile_definitions(XE_OPTION_PROFILING_UI=1) + if(XENIA_BUILD_TESTS) enable_testing() include(${PROJECT_SOURCE_DIR}/third_party/catch/contrib/Catch.cmake) diff --git a/src/xenia/app/emulator_window.cc b/src/xenia/app/emulator_window.cc index baa7bd99b..788fc65ac 100644 --- a/src/xenia/app/emulator_window.cc +++ b/src/xenia/app/emulator_window.cc @@ -805,6 +805,7 @@ bool EmulatorWindow::Initialize() { MenuItem::Type::kString, "Time Scalar *= 2", "Numpad +", std::bind(&EmulatorWindow::CpuTimeScalarSetDouble, this))); } +#if XE_OPTION_PROFILING cpu_menu->AddChild(MenuItem::Create(MenuItem::Type::kSeparator)); { cpu_menu->AddChild(MenuItem::Create(MenuItem::Type::kString, @@ -814,6 +815,7 @@ bool EmulatorWindow::Initialize() { "&Pause/Resume Profiler", "`", []() { Profiler::TogglePause(); })); } +#endif cpu_menu->AddChild(MenuItem::Create(MenuItem::Type::kSeparator)); { cpu_menu->AddChild(MenuItem::Create( diff --git a/src/xenia/base/profiling.h b/src/xenia/base/profiling.h index b754bcf31..01644baa1 100644 --- a/src/xenia/base/profiling.h +++ b/src/xenia/base/profiling.h @@ -20,12 +20,13 @@ #include "xenia/ui/virtual_key.h" #include "xenia/ui/window_listener.h" -#if XE_PLATFORM_WIN32 && 0 -#define XE_OPTION_PROFILING 1 -#define XE_OPTION_PROFILING_UI 1 -#else +#ifndef XE_OPTION_PROFILING #define XE_OPTION_PROFILING 0 -#endif // XE_PLATFORM_WIN32 +#endif + +#ifndef XE_OPTION_PROFILING_UI +#define XE_OPTION_PROFILING_UI 0 +#endif #if XE_OPTION_PROFILING // Pollutes the global namespace. Yuck.