Add libretro common dep

Replace libretro.h with libretro-common/libretro.h

CMakeLists.txt

@@ -4,11 +4,13 @@ project(game.libretro)
 list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
 
 find_package(Kodi REQUIRED)
+find_package(LibretroCommon REQUIRED)
 find_package(TinyXML REQUIRED)
 find_package(Rcheevos REQUIRED)
 
 include_directories(${KODI_INCLUDE_DIR}
                     ${PROJECT_SOURCE_DIR}/src
+                    ${LIBRETRO_COMMON_INCLUDE_DIRS}
                     ${TINYXML_INCLUDE_DIRS}
                     ${RCHEEVOS_INCLUDE_DIRS})
 
@@ -78,7 +80,6 @@ set(LIBRETRO_HEADERS src/GameInfoLoader.h
                      src/libretro/LibretroDefines.h
                      src/libretro/LibretroDLL.h
                      src/libretro/LibretroEnvironment.h
-                     src/libretro/libretro.h
                      src/libretro/LibretroResources.h
                      src/libretro/LibretroTranslator.h
                      src/libretro/MemoryMap.h

cmake/FindLibretroCommon.cmake

@@ -0,0 +1,25 @@
+# FindLibretroCommon.cmake
+# -------
+# Finds the libretro-common headers
+#
+# This will define the following variables:
+#
+# LIBRETRO_COMMON_FOUND - libretro-common was found
+# LIBRETRO_COMMON_INCLUDE_DIRS - the libretro include directory containing libretro.h
+#
+
+find_path(LIBRETRO_COMMON_INCLUDE_DIR NAMES libretro.h
+                                      PATH_SUFFIXES libretro-common)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(
+  LibretroCommon
+    REQUIRED_VARS LIBRETRO_COMMON_INCLUDE_DIR
+)
+
+if(LibretroCommon_FOUND)
+  set(LIBRETRO_COMMON_FOUND true)
+  set(LIBRETRO_COMMON_INCLUDE_DIRS ${LIBRETRO_COMMON_INCLUDE_DIR})
+endif()
+
+mark_as_advanced(LIBRETRO_COMMON_INCLUDE_DIR)

depends/common/libretro-common/CMakeLists.txt

@@ -0,0 +1,7 @@
+cmake_minimum_required(VERSION 3.0)
+project(libretro-common)
+
+INSTALL(
+  DIRECTORY include/
+  DESTINATION include/${PROJECT_NAME}
+)

depends/common/libretro-common/libretro-common.txt

@@ -0,0 +1 @@
+libretro-common https://github.com/libretro/libretro-common master

src/GameInfoLoader.h

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "libretro/libretro.h"
+#include "libretro-common/libretro.h"
 
 #include <stdint.h>
 #include <string>

src/cheevos/Cheevos.cpp

@@ -11,7 +11,6 @@
 
 #include "libretro/LibretroEnvironment.h"
 #include "libretro/MemoryMap.h"
-#include "libretro/libretro.h"
 #include "rcheevos/rconsoles.h"
 #include "rcheevos/rhash.h"
 #include "rcheevos/rurl.h"

src/client.cpp

@@ -10,7 +10,7 @@
 #include "input/ButtonMapper.h"
 #include "input/ControllerTopology.h"
 #include "input/InputManager.h"
-#include "libretro/libretro.h"
+#include "libretro-common/libretro.h"
 #include "libretro/LibretroEnvironment.h"
 #include "log/Log.h"
 #include "log/LogAddon.h"

src/input/ButtonMapper.cpp

@@ -13,7 +13,7 @@
 #include "libretro/LibretroDLL.h"
 #include "libretro/LibretroEnvironment.h"
 #include "libretro/LibretroTranslator.h"
-#include "libretro/libretro.h"
+#include "libretro-common/libretro.h"
 #include "log/Log.h"
 
 #include <tinyxml.h>

src/input/DefaultControllerTranslator.cpp

@@ -7,7 +7,7 @@
 
 #include "DefaultControllerTranslator.h"
 #include "DefaultControllerDefines.h"
-#include "libretro/libretro.h"
+#include "libretro-common/libretro.h"
 
 using namespace LIBRETRO;
 

src/input/DefaultKeyboardTranslator.cpp

@@ -7,7 +7,7 @@
 
 #include "DefaultKeyboardTranslator.h"
 #include "DefaultKeyboardDefines.h"
-#include "libretro/libretro.h"
+#include "libretro-common/libretro.h"
 
 using namespace LIBRETRO;
 

src/input/InputManager.cpp

@@ -10,7 +10,7 @@
 #include "LibretroDevice.h"
 #include "LibretroDeviceInput.h"
 #include "libretro/ClientBridge.h"
-#include "libretro/libretro.h"
+#include "libretro-common/libretro.h"
 #include "libretro/LibretroEnvironment.h"
 #include "libretro/LibretroTranslator.h"
 #include "log/Log.h"

src/input/LibretroDevice.cpp

@@ -10,7 +10,7 @@
 #include "InputDefinitions.h"
 #include "LibretroDeviceInput.h"
 #include "libretro/LibretroTranslator.h"
-#include "libretro/libretro.h"
+#include "libretro-common/libretro.h"
 #include "log/Log.h"
 
 #include <tinyxml.h>

src/input/LibretroDeviceInput.cpp

@@ -11,7 +11,7 @@
 #include "libretro/ClientBridge.h"
 #include "libretro/LibretroEnvironment.h"
 #include "libretro/LibretroTranslator.h"
-#include "libretro/libretro.h"
+#include "libretro-common/libretro.h"
 #include "log/Log.h"
 
 using namespace LIBRETRO;

src/libretro/LibretroEnvironment.cpp

@@ -8,7 +8,7 @@
 #include "LibretroEnvironment.h"
 #include "ClientBridge.h"
 #include "FrontendBridge.h"
-#include "libretro.h"
+#include "libretro-common/libretro.h"
 #include "LibretroDLL.h"
 #include "LibretroTranslator.h"
 #include "input/InputManager.h"

src/libretro/LibretroEnvironment.h

@@ -21,7 +21,6 @@
 class CGameLibRetro;
 
 struct retro_game_geometry;
-struct retro_memory_map_kodi;
 
 namespace LIBRETRO
 {

src/libretro/MemoryMap.cpp

@@ -6,7 +6,6 @@
  */
 
 #include "MemoryMap.h"
-#include "libretro.h"
 
 using namespace LIBRETRO;
 

src/libretro/MemoryMap.h

@@ -8,9 +8,13 @@
 #pragma once
 
 #include <vector>
+#include "libretro-common/libretro.h"
 
-struct retro_memory_map;
-struct retro_memory_descriptor_kodi;
+struct retro_memory_descriptor_kodi
+{
+  retro_memory_descriptor descriptor;
+  size_t disconnectMask;
+};
 
 namespace LIBRETRO
 {