From 2d73551af23b064e8ef70abe6e3afabb7b5eee75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Mon, 3 Apr 2023 10:46:38 +0200 Subject: [PATCH] Makefile/readme updates --- libretro/Makefile.common | 2 +- libretro/README_WINDOWS.txt | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/libretro/Makefile.common b/libretro/Makefile.common index 325571d3cf..7ee35ba80f 100644 --- a/libretro/Makefile.common +++ b/libretro/Makefile.common @@ -907,7 +907,7 @@ SOURCES_C += $(LIBRETROCOMMONDIR)/compat/compat_posix_string.c \ endif GIT_VERSION_SRC = $(CORE_DIR)/git-version.cpp -GIT_VERSION := $(shell git describe --always || echo v1.7.0-git) +GIT_VERSION := $(shell git describe --always || echo v-1.unknown) GIT_VERSION_NO_UPDATE = $(findstring 1,$(shell grep -s PPSSPP_GIT_VERSION_NO_UPDATE $(GIT_VERSION_SRC))) ifneq (,$(findstring $(GIT_VERSION),$(shell grep -s char $(GIT_VERSION_SRC)))) GIT_VERSION_NO_UPDATE = 1 diff --git a/libretro/README_WINDOWS.txt b/libretro/README_WINDOWS.txt index b126a8f9af..61322ba004 100644 --- a/libretro/README_WINDOWS.txt +++ b/libretro/README_WINDOWS.txt @@ -19,6 +19,8 @@ make platform=windows_msvc2019_desktop_x64 -j32 && cp ppsspp_libretro.* /d/retro Note that the latter part copies the DLL/PDB into wherever retroarch reads it from. Might need to adjust the path, and adjust -j32 depending on your number of logical CPUs - might not need that many threads (or you might need more...). +Also, the "2019" part has no significance, it seems - it's fine even if you're on MSVC 2022. + (plain make without a platform parameter doesn't work - g++ isn't able to build the D3D11 stuff, or at least it fails to link). To debug from within MSVC, open retroarch.exe (or retroarch_debug.exe) as a Project/Solution, then open a few of the cpp files,