Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[submodule "libs/rcheevos"]
path = libs/rcheevos
url = https://github.com/RetroAchievements/rcheevos.git
[submodule "thirdparty/SQLiteCpp"]
path = thirdparty/SQLiteCpp
url = https://github.com/SRombauts/SQLiteCpp.git
[submodule "libs/rcheevos"]
path = libs/rcheevos
url = https://github.com/RetroAchievements/rcheevos.git
2 changes: 2 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,8 @@ add_library(firelight_lib
src/app/achievements/models/achievement_progress.hpp
src/gui/qt_achievement_service_proxy.cpp
src/gui/qt_achievement_service_proxy.hpp
src/app/achievements/gui/retro_achievements_game_item.cpp
src/app/achievements/gui/retro_achievements_game_item.hpp
)

target_include_directories(firelight_lib PUBLIC ${SDL2_INCLUDE_DIRS} ${FFMPEG_INCLUDE_DIRS} include ${CMAKE_SOURCE_DIR}/src/app)
Expand Down
8 changes: 7 additions & 1 deletion cmake/rcheevos.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,17 @@ cmake_minimum_required(VERSION 3.22.1)
project(rcheevos)

add_compile_definitions(RC_DISABLE_LUA)
#add_compile_definitions(RC_CLIENT_SUPPORTS_EXTERNAL)

set(CMAKE_CXX_STANDARD 20)

file(GLOB RCHEEVOS_SOURCES
${CMAKE_SOURCE_DIR}/libs/rcheevos/src/*.c
${CMAKE_SOURCE_DIR}/libs/rcheevos/src/rc_client.c
${CMAKE_SOURCE_DIR}/libs/rcheevos/src/rc_client_raintegration.c
${CMAKE_SOURCE_DIR}/libs/rcheevos/src/rc_compat.c
${CMAKE_SOURCE_DIR}/libs/rcheevos/src/rc_libretro.c
${CMAKE_SOURCE_DIR}/libs/rcheevos/src/rc_util.c
${CMAKE_SOURCE_DIR}/libs/rcheevos/src/rc_version.c
${CMAKE_SOURCE_DIR}/libs/rcheevos/src/**/*.c)
Comment on lines 9 to 16
Copy link

Copilot AI Feb 22, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This mixes explicit source entries with a recursive glob that likely matches the same files again (rc_client.c, rc_util.c, etc.). Depending on generator/tooling, duplicate source paths can cause build issues or at minimum make the build definition harder to reason about. Prefer either a fully explicit source list (recommended for reproducible builds) or a glob without manually listed files (and consider CONFIGURE_DEPENDS if you keep globs).

Copilot uses AI. Check for mistakes.

add_library(rcheevos STATIC ${RCHEEVOS_SOURCES})
Expand Down
141 changes: 70 additions & 71 deletions include/rcheevos/module.modulemap
Original file line number Diff line number Diff line change
@@ -1,71 +1,70 @@
module rcheevos {
umbrella header "rcheevos.h"

module rapi {
module rc_api_editor {
header "rc_api_editor.h"
export *
}

module rc_api_info {
header "rc_api_info.h"
export *
}

module rc_api_request {
header "rc_api_request.h"
export *
}

module rc_api_runtime {
header "rc_api_runtime.h"
export *
}

module rc_api_user {
header "rc_api_user.h"
export *
}

export *
}

module rc_client {
header "rc_client.h"
export *
}

module rc_consoles {
header "rc_consoles.h"
export *
}

module rc_error {
header "rc_error.h"
export *
}

module rc_runtime {
header "rc_runtime.h"
export *
}

module rc_runtime_types {
header "rc_runtime_types.h"
export *
}

module rc_hash {
header "rc_hash.h"
export *
}

export *
module * { export * }

//rurl is deprecated
explicit module rc_url {
header "rc_url.h"
export *
}
}
module rcheevos {
umbrella header "rcheevos.h"

module rapi {
module rc_api_editor {
header "rc_api_editor.h"
export *
}

module rc_api_info {
header "rc_api_info.h"
export *
}

module rc_api_request {
header "rc_api_request.h"
export *
}

module rc_api_runtime {
header "rc_api_runtime.h"
export *
}

module rc_api_user {
header "rc_api_user.h"
export *
}

export *
}

module rc_client {
header "rc_client.h"
export *
}

explicit module rc_client_raintegration {
header "rc_client_raintegration.h"
export *
}

module rc_consoles {
header "rc_consoles.h"
export *
}

module rc_error {
header "rc_error.h"
export *
}

module rc_runtime {
header "rc_runtime.h"
export *
}

module rc_runtime_types {
header "rc_runtime_types.h"
export *
}

module rc_hash {
header "rc_hash.h"
export *
}

export *
module * { export * }
}
Loading
Loading