Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2025-04-10 19:15:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removed support for NetBSD and OpenBSD

Browse source
This commit is contained in:
Leon Styhre 2024-08-09 21:05:12 +02:00
parent 7791859d14
commit 9c07456d21
7 changed files with 9 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CMakeLists.txt
View file

@ -381,7 +381,7 @@ if(AUR_BUILD OR FLATPAK_BUILD OR RETRODECK OR RPI)
set(APPLICATION_UPDATER OFF) set(APPLICATION_UPDATER OFF)
endif() endif()
if(CMAKE_SYSTEM_NAME MATCHES FreeBSD OR CMAKE_SYSTEM_NAME MATCHES NetBSD OR CMAKE_SYSTEM_NAME MATCHES OpenBSD) if(CMAKE_SYSTEM_NAME MATCHES FreeBSD)
set(APPLICATION_UPDATER OFF) set(APPLICATION_UPDATER OFF)
endif() endif()
@ -434,13 +434,11 @@ add_compile_definitions(GLM_FORCE_CXX17)
add_compile_definitions(GLM_FORCE_XYZW_ONLY) add_compile_definitions(GLM_FORCE_XYZW_ONLY)
# For Unix systems, assign the installation prefix. If it's not explicitly set, # For Unix systems, assign the installation prefix. If it's not explicitly set,
# we use /usr on Linux, /usr/pkg on NetBSD and /usr/local on FreeBSD and OpenBSD. # we use /usr on Linux and /usr/local on FreeBSD.
if(NOT WIN32 AND NOT APPLE AND NOT ANDROID) if(NOT WIN32 AND NOT APPLE AND NOT ANDROID)
if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
if(CMAKE_SYSTEM_NAME MATCHES Linux) if(CMAKE_SYSTEM_NAME MATCHES Linux)
set(CMAKE_INSTALL_PREFIX /usr CACHE INTERNAL CMAKE_INSTALL_PREFIX) set(CMAKE_INSTALL_PREFIX /usr CACHE INTERNAL CMAKE_INSTALL_PREFIX)
elseif(CMAKE_SYSTEM_NAME MATCHES NetBSD)
set(CMAKE_INSTALL_PREFIX /usr/pkg CACHE INTERNAL CMAKE_INSTALL_PREFIX)
else() else()
set(CMAKE_INSTALL_PREFIX /usr/local CACHE INTERNAL CMAKE_INSTALL_PREFIX) set(CMAKE_INSTALL_PREFIX /usr/local CACHE INTERNAL CMAKE_INSTALL_PREFIX)
endif() endif()

2
es-app/src/FileFilterIndex.h
View file

@ -9,7 +9,7 @@
#ifndef ES_APP_FILE_FILTER_INDEX_H #ifndef ES_APP_FILE_FILTER_INDEX_H
#define ES_APP_FILE_FILTER_INDEX_H #define ES_APP_FILE_FILTER_INDEX_H
#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__) #if defined(__APPLE__) || defined(__FreeBSD__)
#include <sstream> #include <sstream>
#endif #endif

2
es-app/src/MetaData.h
View file

@ -10,7 +10,7 @@
#ifndef ES_APP_META_DATA_H #ifndef ES_APP_META_DATA_H
#define ES_APP_META_DATA_H #define ES_APP_META_DATA_H
#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__) #if defined(__APPLE__) || defined(__FreeBSD__)
#include <sstream> #include <sstream>
#endif #endif

3
es-app/src/guis/GuiMenu.cpp
View file

@ -1084,8 +1084,7 @@ void GuiMenu::openSoundOptions()
auto s = new GuiSettings(_("SOUND SETTINGS")); auto s = new GuiSettings(_("SOUND SETTINGS"));
// TODO: Implement system volume support for macOS and Android. // TODO: Implement system volume support for macOS and Android.
#if !defined(__APPLE__) && !defined(__ANDROID__) && !defined(__FreeBSD__) && \ #if !defined(__APPLE__) && !defined(__ANDROID__) && !defined(__FreeBSD__)
!defined(__OpenBSD__) && !defined(__NetBSD__)
// System volume. // System volume.
// The reason to create the VolumeControl object every time instead of making it a singleton // The reason to create the VolumeControl object every time instead of making it a singleton
// is that this is the easiest way to detect new default audio devices or changes to the // is that this is the easiest way to detect new default audio devices or changes to the

2
es-app/src/scrapers/ScreenScraper.h
View file

@ -51,7 +51,7 @@ public:
const std::string API_DEV_KEY = {67, 112, 72, 120, 121, 77, 119, 74, 84, 56, const std::string API_DEV_KEY = {67, 112, 72, 120, 121, 77, 119, 74, 84, 56,
75, 122, 78, 98, 69, 86, 56, 120, 120, 49}; 75, 122, 78, 98, 69, 86, 56, 120, 120, 49};
const std::string API_URL_BASE = "https://api.screenscraper.fr/api2"; const std::string API_URL_BASE = "https://api.screenscraper.fr/api2";
#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) #if defined(__FreeBSD__)
const std::string platformIdentifier {" B"}; const std::string platformIdentifier {" B"};
#elif defined(STEAM_DECK) #elif defined(STEAM_DECK)
const std::string platformIdentifier {" S"}; const std::string platformIdentifier {" S"};

7
es-core/src/utils/FileSystemUtil.cpp
View file

@ -37,17 +37,14 @@
#endif #endif
// For Unix systems, set the install prefix as defined via CMAKE_INSTALL_PREFIX when CMake was run. // For Unix systems, set the install prefix as defined via CMAKE_INSTALL_PREFIX when CMake was run.
// If not defined, the default prefix '/usr' will be used on Linux, '/usr/pkg' on NetBSD and // If not defined, the default prefix "/usr" will be used on Linux and "/usr/local" on FreeBSD.
// '/usr/local' on FreeBSD and OpenBSD. This fallback should not be required though unless the // This fallback should not be required though unless the build environment is broken.
// build environment is broken.
#if defined(__unix__) #if defined(__unix__)
#if defined(ES_INSTALL_PREFIX) #if defined(ES_INSTALL_PREFIX)
const std::string installPrefix {ES_INSTALL_PREFIX}; const std::string installPrefix {ES_INSTALL_PREFIX};
#else #else
#if defined(__linux__) #if defined(__linux__)
const std::string installPrefix {"/usr"}; const std::string installPrefix {"/usr"};
#elif defined(__NetBSD__)
const std::string installPrefix {"/usr/pkg"};
#else #else
const std::string installPrefix {"/usr/local"}; const std::string installPrefix {"/usr/local"};
#endif #endif

4
resources/systems/unix/es_find_rules.xml
View file

@ -17,10 +17,8 @@
<rule type="corepath"> <rule type="corepath">
<!-- Compiled from source --> <!-- Compiled from source -->
<entry>~/.config/retroarch/cores</entry> <entry>~/.config/retroarch/cores</entry>
<!-- FreeBSD and OpenBSD repository --> <!-- FreeBSD repository -->
<entry>/usr/local/lib/libretro</entry> <entry>/usr/local/lib/libretro</entry>
<!-- NetBSD repository -->
<entry>/usr/pkg/lib/libretro</entry>
</rule> </rule>
</core> </core>
<emulator name="ADVANCEMAME"> <emulator name="ADVANCEMAME">