diff --git a/.ci/ios.sh b/.ci/ios.sh index 92e1776c8..321871808 100755 --- a/.ci/ios.sh +++ b/.ci/ios.sh @@ -7,9 +7,7 @@ cmake .. -GNinja \ -DCMAKE_OSX_ARCHITECTURES=arm64 \ -DCMAKE_C_COMPILER_LAUNCHER=ccache \ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ - -DENABLE_QT_TRANSLATION=ON \ - -DCITRA_ENABLE_COMPATIBILITY_REPORTING=ON \ - -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON + -DENABLE_QT_TRANSLATION=ON ninja ccache -s -v diff --git a/.ci/linux.sh b/.ci/linux.sh index 47aa73733..552dafe39 100755 --- a/.ci/linux.sh +++ b/.ci/linux.sh @@ -18,8 +18,6 @@ cmake .. -G Ninja \ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ "${EXTRA_CMAKE_FLAGS[@]}" \ -DENABLE_QT_TRANSLATION=ON \ - -DCITRA_ENABLE_COMPATIBILITY_REPORTING=ON \ - -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON \ -DUSE_DISCORD_PRESENCE=ON ninja strip -s bin/Release/* diff --git a/.ci/macos.sh b/.ci/macos.sh index c4e2a284b..c598fab85 100755 --- a/.ci/macos.sh +++ b/.ci/macos.sh @@ -7,8 +7,6 @@ cmake .. -GNinja \ -DCMAKE_C_COMPILER_LAUNCHER=ccache \ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ -DENABLE_QT_TRANSLATION=ON \ - -DCITRA_ENABLE_COMPATIBILITY_REPORTING=ON \ - -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON \ -DUSE_DISCORD_PRESENCE=ON ninja ninja bundle diff --git a/.ci/windows.sh b/.ci/windows.sh index db7ea6255..ddcf5867f 100644 --- a/.ci/windows.sh +++ b/.ci/windows.sh @@ -6,8 +6,6 @@ cmake .. -G Ninja \ -DCMAKE_C_COMPILER_LAUNCHER=ccache \ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ -DENABLE_QT_TRANSLATION=ON \ - -DCITRA_ENABLE_COMPATIBILITY_REPORTING=ON \ - -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON \ -DUSE_DISCORD_PRESENCE=ON ninja ninja bundle diff --git a/CMakeLists.txt b/CMakeLists.txt index 7deea7d51..9364e52a6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -157,12 +157,6 @@ endif() configure_file(${PROJECT_SOURCE_DIR}/dist/compatibility_list/compatibility_list.qrc ${PROJECT_BINARY_DIR}/dist/compatibility_list/compatibility_list.qrc COPYONLY) -if (ENABLE_COMPATIBILITY_LIST_DOWNLOAD AND NOT EXISTS ${PROJECT_BINARY_DIR}/dist/compatibility_list/compatibility_list.json) - message(STATUS "Downloading compatibility list for citra...") - file(DOWNLOAD - https://api.citra-emu.org/gamedb/ - "${PROJECT_BINARY_DIR}/dist/compatibility_list/compatibility_list.json" SHOW_PROGRESS) -endif() if (EXISTS ${PROJECT_SOURCE_DIR}/dist/compatibility_list/compatibility_list.json) file(COPY "${PROJECT_SOURCE_DIR}/dist/compatibility_list/compatibility_list.json" DESTINATION "${PROJECT_BINARY_DIR}/dist/compatibility_list/") diff --git a/src/citra_qt/CMakeLists.txt b/src/citra_qt/CMakeLists.txt index edbf17686..8213a9e0f 100644 --- a/src/citra_qt/CMakeLists.txt +++ b/src/citra_qt/CMakeLists.txt @@ -343,10 +343,6 @@ target_compile_definitions(citra-qt PRIVATE -DQT_NO_CAST_TO_ASCII ) -if (CITRA_ENABLE_COMPATIBILITY_REPORTING) - target_compile_definitions(citra-qt PRIVATE -DCITRA_ENABLE_COMPATIBILITY_REPORTING) -endif() - if (USE_DISCORD_PRESENCE) target_sources(citra-qt PUBLIC discord_impl.cpp diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp index 05de55a76..bb1531ce4 100644 --- a/src/citra_qt/main.cpp +++ b/src/citra_qt/main.cpp @@ -335,9 +335,6 @@ GMainWindow::~GMainWindow() { } void GMainWindow::InitializeWidgets() { -#ifdef CITRA_ENABLE_COMPATIBILITY_REPORTING - ui->action_Report_Compatibility->setVisible(true); -#endif render_window = new GRenderWindow(this, emu_thread.get(), system, false); secondary_window = new GRenderWindow(this, emu_thread.get(), system, true); render_window->hide();