Skip to content

Commit

Permalink
Fix #109
Browse files Browse the repository at this point in the history
  • Loading branch information
JesseTG committed Nov 1, 2023
1 parent 764924b commit 1035628
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
6 changes: 3 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,16 @@ set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake" "${CMAKE_MODULE_PATH}")
find_package(Git REQUIRED)
include(GitInfo)

message(STATUS "Git revision: ${GIT_REVISION}")
message(STATUS "Git state: ${GIT_STATE}")

option(TRACY_ENABLE "Build with Tracy support." OFF)

include(cmake/utils.cmake)
include(cmake/FetchDependencies.cmake)
include(cmake/ConfigureFeatures.cmake)
include(cmake/ConfigureDependencies.cmake)

set(MELONDSDS_VERSION "${MELONDSDS_INFO_display_version} (${GIT_STATE}, upstream ${MELONDS_REPOSITORY_TAG}, ${CMAKE_BUILD_TYPE})")
message(STATUS "${MELONDSDS_INFO_corename} Version: ${MELONDSDS_VERSION}")

# Disabled by default due to https://github.com/JesseTG/melonds-ds/issues/81
# Enable it if you're going to work on it.
option(ENABLE_THREADED_RENDERER "Enable the threaded software renderer." OFF)
Expand Down
3 changes: 2 additions & 1 deletion src/libretro/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -206,8 +206,9 @@ if (WIN32 AND MINGW)
endif()

target_compile_definitions(libretro PUBLIC
MELONDSDS_VERSION="${CMAKE_PROJECT_VERSION}"
MELONDSDS_VERSION="${MELONDSDS_VERSION}"
MELONDSDS_NAME="${CMAKE_PROJECT_NAME}"
MELONDSDS_VERSION_STRING="${CMAKE_PROJECT_NAME} ${MELONDSDS_VERSION}"
PNTR_ENABLE_DEFAULT_FONT
PNTR_ENABLE_FILTER_SMOOTH
PNTR_ENABLE_TTF
Expand Down
3 changes: 2 additions & 1 deletion src/libretro/libretro.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -142,10 +142,11 @@ PUBLIC_SYMBOL void retro_init(void) {
#ifdef HAVE_TRACY
tracy::StartupProfiler();
#endif
TracySetProgramName(MELONDSDS_NAME);
TracySetProgramName(MELONDSDS_VERSION_STRING);
ZoneScopedN("retro_init");
retro::env::init();
retro::debug("retro_init");
retro::info("{} {}", MELONDSDS_NAME, MELONDSDS_VERSION);
retro_assert(NDSCart::Cart == nullptr);
retro_assert(GBACart::Cart == nullptr);
retro_assert(retro::content::get_loaded_nds_info() == nullopt);
Expand Down

0 comments on commit 1035628

Please sign in to comment.