Archive/azahar
0
0
Fork 0
mirror of https://github.com/azahar-emu/azahar.git synced 2025-04-28 13:47:59 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Removed redundant cmake options related to the compatibility list

Browse source
This commit is contained in:
OpenSauce04 2024-08-18 18:11:25 +01:00
parent 8efd959847
commit f0d22a9800
7 changed files with 1 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.ci/ios.sh
View file

@ -7,9 +7,7 @@ cmake .. -GNinja \
-DCMAKE_OSX_ARCHITECTURES=arm64 \ -DCMAKE_OSX_ARCHITECTURES=arm64 \
-DCMAKE_C_COMPILER_LAUNCHER=ccache \ -DCMAKE_C_COMPILER_LAUNCHER=ccache \
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
-DENABLE_QT_TRANSLATION=ON \ -DENABLE_QT_TRANSLATION=ON
-DCITRA_ENABLE_COMPATIBILITY_REPORTING=ON \
-DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON
ninja ninja
ccache -s -v ccache -s -v

2
.ci/linux.sh
View file

@ -18,8 +18,6 @@ cmake .. -G Ninja \
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
"${EXTRA_CMAKE_FLAGS[@]}" \ "${EXTRA_CMAKE_FLAGS[@]}" \
-DENABLE_QT_TRANSLATION=ON \ -DENABLE_QT_TRANSLATION=ON \
-DCITRA_ENABLE_COMPATIBILITY_REPORTING=ON \
-DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON \
-DUSE_DISCORD_PRESENCE=ON -DUSE_DISCORD_PRESENCE=ON
ninja ninja
strip -s bin/Release/* strip -s bin/Release/*

2
.ci/macos.sh
View file

@ -7,8 +7,6 @@ cmake .. -GNinja \
-DCMAKE_C_COMPILER_LAUNCHER=ccache \ -DCMAKE_C_COMPILER_LAUNCHER=ccache \
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
-DENABLE_QT_TRANSLATION=ON \ -DENABLE_QT_TRANSLATION=ON \
-DCITRA_ENABLE_COMPATIBILITY_REPORTING=ON \
-DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON \
-DUSE_DISCORD_PRESENCE=ON -DUSE_DISCORD_PRESENCE=ON
ninja ninja
ninja bundle ninja bundle

2
.ci/windows.sh
View file

@ -6,8 +6,6 @@ cmake .. -G Ninja \
-DCMAKE_C_COMPILER_LAUNCHER=ccache \ -DCMAKE_C_COMPILER_LAUNCHER=ccache \
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
-DENABLE_QT_TRANSLATION=ON \ -DENABLE_QT_TRANSLATION=ON \
-DCITRA_ENABLE_COMPATIBILITY_REPORTING=ON \
-DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON \
-DUSE_DISCORD_PRESENCE=ON -DUSE_DISCORD_PRESENCE=ON
ninja ninja
ninja bundle ninja bundle

6
CMakeLists.txt
View file

@ -157,12 +157,6 @@ endif()
configure_file(${PROJECT_SOURCE_DIR}/dist/compatibility_list/compatibility_list.qrc configure_file(${PROJECT_SOURCE_DIR}/dist/compatibility_list/compatibility_list.qrc
${PROJECT_BINARY_DIR}/dist/compatibility_list/compatibility_list.qrc ${PROJECT_BINARY_DIR}/dist/compatibility_list/compatibility_list.qrc
COPYONLY) 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) if (EXISTS ${PROJECT_SOURCE_DIR}/dist/compatibility_list/compatibility_list.json)
file(COPY "${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/") DESTINATION "${PROJECT_BINARY_DIR}/dist/compatibility_list/")

4
src/citra_qt/CMakeLists.txt
View file

@ -343,10 +343,6 @@ target_compile_definitions(citra-qt PRIVATE
-DQT_NO_CAST_TO_ASCII -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) if (USE_DISCORD_PRESENCE)
target_sources(citra-qt PUBLIC target_sources(citra-qt PUBLIC
discord_impl.cpp discord_impl.cpp

3
src/citra_qt/main.cpp
View file

@ -335,9 +335,6 @@ GMainWindow::~GMainWindow() {
} }
void GMainWindow::InitializeWidgets() { 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); render_window = new GRenderWindow(this, emu_thread.get(), system, false);
secondary_window = new GRenderWindow(this, emu_thread.get(), system, true); secondary_window = new GRenderWindow(this, emu_thread.get(), system, true);
render_window->hide(); render_window->hide();