From 43f10e281e8266dffa3cffff567953ce4f908724 Mon Sep 17 00:00:00 2001
From: Joona Heimonen <99501993+joohei@users.noreply.github.com>
Date: Thu, 20 Jul 2023 14:33:07 +0000
Subject: [PATCH 1/2] Fix cores not copying to retro/cores in some cases
 (openai/retro#260)

---
 CMakeLists.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 932a1a082..86098e6fd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -189,17 +189,17 @@ function(add_core platform core_name)
     DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/retro/cores/${core_name}-version")
   unset(core_ldflags)
   add_custom_command(
-    OUTPUT "${CMAKE_CURRENT_SOURCE_DIR}/retro/cores/${core_name}.json"
+    OUTPUT "${PYLIB_DIRECTORY}/retro/cores/${core_name}.json"
     COMMAND
       ${CMAKE_COMMAND} -E copy
       "${CMAKE_CURRENT_SOURCE_DIR}/cores/${platform}.json"
-      "${CMAKE_CURRENT_SOURCE_DIR}/retro/cores/${core_name}.json"
+      "${PYLIB_DIRECTORY}/retro/cores/${core_name}.json"
     DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/retro/cores/${core_name}-version")
 
   add_custom_target(
     ${platform} ALL
     DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/retro/cores/${core_name}-version"
-            "${CMAKE_CURRENT_SOURCE_DIR}/retro/cores/${core_name}.json"
+            "${PYLIB_DIRECTORY}/retro/cores/${core_name}.json"
             "${TARGET_PATH}")
   list(APPEND CORE_TARGETS "${platform}")
   set(CORE_TARGETS

From 49641b636a23432c8d862c001bf55e148df0803f Mon Sep 17 00:00:00 2001
From: joohei <joona.heimonen@gmail.com>
Date: Sat, 22 Jul 2023 22:56:25 +0300
Subject: [PATCH 2/2] Fix formatting on CMakeLists.txt

---
 CMakeLists.txt | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 86098e6fd..47380e093 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -199,8 +199,7 @@ function(add_core platform core_name)
   add_custom_target(
     ${platform} ALL
     DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/retro/cores/${core_name}-version"
-            "${PYLIB_DIRECTORY}/retro/cores/${core_name}.json"
-            "${TARGET_PATH}")
+            "${PYLIB_DIRECTORY}/retro/cores/${core_name}.json" "${TARGET_PATH}")
   list(APPEND CORE_TARGETS "${platform}")
   set(CORE_TARGETS
       "${CORE_TARGETS}"