Emulation/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-05-10 17:04:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

(config.def.h) only try to include define headers

Browse source
This commit is contained in:
libretroadmin 2022-11-27 22:57:17 +01:00
parent 694b84937f
commit 38bc51f5c2
6 changed files with 244 additions and 174 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
config.def.h
View file

@ -22,14 +22,14 @@
#include <audio/audio_resampler.h>
#include "configuration.h"
#include "gfx/video_defines.h"
#include "input/input_driver.h"
#include "input/input_defines.h"
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#ifdef HAVE_NETWORKING
#include "network/netplay/netplay.h"
#include "network/netplay/netplay_defines.h"
#endif
/* Required for 3DS display mode setting */
@ -563,9 +563,9 @@
#define DEFAULT_INPUT_OVERLAY_AUTO_SCALE false
#endif
#include "runtime_file.h"
#include "runtime_file_defines.h"
#ifdef HAVE_MENU
#include "menu/menu_driver.h"
#include "menu/menu_defines.h"
#ifdef HAVE_LIBNX
#define DEFAULT_MENU_USE_PREFERRED_SYSTEM_COLOR_THEME true

124
network/netplay/netplay.h
View file

@ -31,120 +31,12 @@
#include <net/net_compat.h>
#include "netplay_defines.h"
#include "../../msg_hash.h"
#include "../natt.h"
#ifndef HAVE_DYNAMIC
#define NETPLAY_FORK_MAX_ARGS 64
#endif
#define NETPLAY_NICK_LEN 32
#define NETPLAY_HOST_STR_LEN 32
#define NETPLAY_HOST_LONGSTR_LEN 256
#define NETPLAY_MITM_SERVERS 5
#define NETPLAY_CHAT_MAX_MESSAGES 5
#define NETPLAY_CHAT_MAX_SIZE 96
#define NETPLAY_CHAT_FRAME_TIME 900
enum rarch_netplay_ctl_state
{
RARCH_NETPLAY_CTL_NONE = 0,
RARCH_NETPLAY_CTL_GAME_WATCH,
RARCH_NETPLAY_CTL_PLAYER_CHAT,
RARCH_NETPLAY_CTL_POST_FRAME,
RARCH_NETPLAY_CTL_PRE_FRAME,
RARCH_NETPLAY_CTL_ENABLE_SERVER,
RARCH_NETPLAY_CTL_ENABLE_CLIENT,
RARCH_NETPLAY_CTL_DISABLE,
#ifndef HAVE_DYNAMIC
RARCH_NETPLAY_CTL_ADD_FORK_ARG,
RARCH_NETPLAY_CTL_GET_FORK_ARGS,
RARCH_NETPLAY_CTL_CLEAR_FORK_ARGS,
#endif
RARCH_NETPLAY_CTL_REFRESH_CLIENT_INFO,
RARCH_NETPLAY_CTL_IS_ENABLED,
RARCH_NETPLAY_CTL_IS_REPLAYING,
RARCH_NETPLAY_CTL_IS_SERVER,
RARCH_NETPLAY_CTL_IS_CONNECTED,
RARCH_NETPLAY_CTL_IS_PLAYING,
RARCH_NETPLAY_CTL_IS_SPECTATING,
RARCH_NETPLAY_CTL_IS_DATA_INITED,
RARCH_NETPLAY_CTL_ALLOW_PAUSE,
RARCH_NETPLAY_CTL_PAUSE,
RARCH_NETPLAY_CTL_UNPAUSE,
RARCH_NETPLAY_CTL_LOAD_SAVESTATE,
RARCH_NETPLAY_CTL_RESET,
RARCH_NETPLAY_CTL_DISCONNECT,
RARCH_NETPLAY_CTL_FINISHED_NAT_TRAVERSAL,
RARCH_NETPLAY_CTL_DESYNC_PUSH,
RARCH_NETPLAY_CTL_DESYNC_POP,
RARCH_NETPLAY_CTL_KICK_CLIENT,
RARCH_NETPLAY_CTL_BAN_CLIENT
};
/* The current status of a connection */
enum rarch_netplay_connection_mode
{
NETPLAY_CONNECTION_NONE = 0,
NETPLAY_CONNECTION_DELAYED_DISCONNECT,
/* The connection is dead, but data
is still waiting to be forwarded */
/* Initialization: */
NETPLAY_CONNECTION_INIT, /* Waiting for header */
NETPLAY_CONNECTION_PRE_NICK, /* Waiting for nick */
NETPLAY_CONNECTION_PRE_PASSWORD, /* Waiting for password */
NETPLAY_CONNECTION_PRE_INFO, /* Waiting for core/content info */
NETPLAY_CONNECTION_PRE_SYNC, /* Waiting for sync */
/* Ready: */
NETPLAY_CONNECTION_CONNECTED, /* Modes above this are connected */
NETPLAY_CONNECTION_SPECTATING, /* Spectator mode */
NETPLAY_CONNECTION_SLAVE, /* Playing in slave mode */
NETPLAY_CONNECTION_PLAYING /* Normal ready state */
};
/* Preferences for sharing digital devices */
enum rarch_netplay_share_digital_preference
{
RARCH_NETPLAY_SHARE_DIGITAL_NO_SHARING = 0,
RARCH_NETPLAY_SHARE_DIGITAL_NO_PREFERENCE,
RARCH_NETPLAY_SHARE_DIGITAL_OR,
RARCH_NETPLAY_SHARE_DIGITAL_XOR,
RARCH_NETPLAY_SHARE_DIGITAL_VOTE,
RARCH_NETPLAY_SHARE_DIGITAL_LAST
};
/* Preferences for sharing analog devices */
enum rarch_netplay_share_analog_preference
{
RARCH_NETPLAY_SHARE_ANALOG_NO_SHARING = 0,
RARCH_NETPLAY_SHARE_ANALOG_NO_PREFERENCE,
RARCH_NETPLAY_SHARE_ANALOG_MAX,
RARCH_NETPLAY_SHARE_ANALOG_AVERAGE,
RARCH_NETPLAY_SHARE_ANALOG_LAST
};
enum netplay_host_method
{
NETPLAY_HOST_METHOD_UNKNOWN = 0,
NETPLAY_HOST_METHOD_MANUAL,
NETPLAY_HOST_METHOD_UPNP,
NETPLAY_HOST_METHOD_MITM
};
enum rarch_netplay_discovery_ctl_state
{
RARCH_NETPLAY_DISCOVERY_CTL_NONE = 0,
RARCH_NETPLAY_DISCOVERY_CTL_LAN_SEND_QUERY,
RARCH_NETPLAY_DISCOVERY_CTL_LAN_GET_RESPONSES,
RARCH_NETPLAY_DISCOVERY_CTL_LAN_CLEAR_RESPONSES
};
typedef struct netplay netplay_t;
typedef struct netplay_client_info
@ -240,18 +132,6 @@ struct netplay_chat_buffer
uint32_t color_msg;
};
enum net_driver_state_flags
{
NET_DRIVER_ST_FLAG_NETPLAY_CLIENT_DEFERRED = (1 << 0),
/* Only used before init_netplay */
NET_DRIVER_ST_FLAG_NETPLAY_ENABLED = (1 << 1),
NET_DRIVER_ST_FLAG_NETPLAY_IS_CLIENT = (1 << 2),
NET_DRIVER_ST_FLAG_HAS_SET_NETPLAY_MODE = (1 << 3),
NET_DRIVER_ST_FLAG_HAS_SET_NETPLAY_IP_ADDRESS = (1 << 4),
NET_DRIVER_ST_FLAG_HAS_SET_NETPLAY_IP_PORT = (1 << 5),
NET_DRIVER_ST_FLAG_HAS_SET_NETPLAY_CHECK_FRAMES = (1 << 6)
};
typedef struct
{
#ifndef HAVE_DYNAMIC

152
network/netplay/netplay_defines.h Normal file
View file

@ -0,0 +1,152 @@
/* RetroArch - A frontend for libretro.
* Copyright (C) 2010-2014 - Hans-Kristian Arntzen
* Copyright (C) 2011-2017 - Daniel De Matteis
* Copyright (C) 2016-2017 - Gregor Richards
*
* RetroArch is free software: you can redistribute it and/or modify it under the terms
* of the GNU General Public License as published by the Free Software Found-
* ation, either version 3 of the License, or (at your option) any later version.
*
* RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
* without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along with RetroArch.
* If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __RARCH_NETPLAY_DEFINES_H
#define __RARCH_NETPLAY_DEFINES_H
#include <stdint.h>
#include <stddef.h>
#include <boolean.h>
#ifdef HAVE_CONFIG_H
#include "../../config.h"
#endif
#ifndef HAVE_DYNAMIC
#define NETPLAY_FORK_MAX_ARGS 64
#endif
#define NETPLAY_NICK_LEN 32
#define NETPLAY_HOST_STR_LEN 32
#define NETPLAY_HOST_LONGSTR_LEN 256
#define NETPLAY_MITM_SERVERS 5
#define NETPLAY_CHAT_MAX_MESSAGES 5
#define NETPLAY_CHAT_MAX_SIZE 96
#define NETPLAY_CHAT_FRAME_TIME 900
enum rarch_netplay_ctl_state
{
RARCH_NETPLAY_CTL_NONE = 0,
RARCH_NETPLAY_CTL_GAME_WATCH,
RARCH_NETPLAY_CTL_PLAYER_CHAT,
RARCH_NETPLAY_CTL_POST_FRAME,
RARCH_NETPLAY_CTL_PRE_FRAME,
RARCH_NETPLAY_CTL_ENABLE_SERVER,
RARCH_NETPLAY_CTL_ENABLE_CLIENT,
RARCH_NETPLAY_CTL_DISABLE,
#ifndef HAVE_DYNAMIC
RARCH_NETPLAY_CTL_ADD_FORK_ARG,
RARCH_NETPLAY_CTL_GET_FORK_ARGS,
RARCH_NETPLAY_CTL_CLEAR_FORK_ARGS,
#endif
RARCH_NETPLAY_CTL_REFRESH_CLIENT_INFO,
RARCH_NETPLAY_CTL_IS_ENABLED,
RARCH_NETPLAY_CTL_IS_REPLAYING,
RARCH_NETPLAY_CTL_IS_SERVER,
RARCH_NETPLAY_CTL_IS_CONNECTED,
RARCH_NETPLAY_CTL_IS_PLAYING,
RARCH_NETPLAY_CTL_IS_SPECTATING,
RARCH_NETPLAY_CTL_IS_DATA_INITED,
RARCH_NETPLAY_CTL_ALLOW_PAUSE,
RARCH_NETPLAY_CTL_PAUSE,
RARCH_NETPLAY_CTL_UNPAUSE,
RARCH_NETPLAY_CTL_LOAD_SAVESTATE,
RARCH_NETPLAY_CTL_RESET,
RARCH_NETPLAY_CTL_DISCONNECT,
RARCH_NETPLAY_CTL_FINISHED_NAT_TRAVERSAL,
RARCH_NETPLAY_CTL_DESYNC_PUSH,
RARCH_NETPLAY_CTL_DESYNC_POP,
RARCH_NETPLAY_CTL_KICK_CLIENT,
RARCH_NETPLAY_CTL_BAN_CLIENT
};
/* The current status of a connection */
enum rarch_netplay_connection_mode
{
NETPLAY_CONNECTION_NONE = 0,
NETPLAY_CONNECTION_DELAYED_DISCONNECT,
/* The connection is dead, but data
is still waiting to be forwarded */
/* Initialization: */
NETPLAY_CONNECTION_INIT, /* Waiting for header */
NETPLAY_CONNECTION_PRE_NICK, /* Waiting for nick */
NETPLAY_CONNECTION_PRE_PASSWORD, /* Waiting for password */
NETPLAY_CONNECTION_PRE_INFO, /* Waiting for core/content info */
NETPLAY_CONNECTION_PRE_SYNC, /* Waiting for sync */
/* Ready: */
NETPLAY_CONNECTION_CONNECTED, /* Modes above this are connected */
NETPLAY_CONNECTION_SPECTATING, /* Spectator mode */
NETPLAY_CONNECTION_SLAVE, /* Playing in slave mode */
NETPLAY_CONNECTION_PLAYING /* Normal ready state */
};
/* Preferences for sharing digital devices */
enum rarch_netplay_share_digital_preference
{
RARCH_NETPLAY_SHARE_DIGITAL_NO_SHARING = 0,
RARCH_NETPLAY_SHARE_DIGITAL_NO_PREFERENCE,
RARCH_NETPLAY_SHARE_DIGITAL_OR,
RARCH_NETPLAY_SHARE_DIGITAL_XOR,
RARCH_NETPLAY_SHARE_DIGITAL_VOTE,
RARCH_NETPLAY_SHARE_DIGITAL_LAST
};
/* Preferences for sharing analog devices */
enum rarch_netplay_share_analog_preference
{
RARCH_NETPLAY_SHARE_ANALOG_NO_SHARING = 0,
RARCH_NETPLAY_SHARE_ANALOG_NO_PREFERENCE,
RARCH_NETPLAY_SHARE_ANALOG_MAX,
RARCH_NETPLAY_SHARE_ANALOG_AVERAGE,
RARCH_NETPLAY_SHARE_ANALOG_LAST
};
enum netplay_host_method
{
NETPLAY_HOST_METHOD_UNKNOWN = 0,
NETPLAY_HOST_METHOD_MANUAL,
NETPLAY_HOST_METHOD_UPNP,
NETPLAY_HOST_METHOD_MITM
};
enum rarch_netplay_discovery_ctl_state
{
RARCH_NETPLAY_DISCOVERY_CTL_NONE = 0,
RARCH_NETPLAY_DISCOVERY_CTL_LAN_SEND_QUERY,
RARCH_NETPLAY_DISCOVERY_CTL_LAN_GET_RESPONSES,
RARCH_NETPLAY_DISCOVERY_CTL_LAN_CLEAR_RESPONSES
};
enum net_driver_state_flags
{
NET_DRIVER_ST_FLAG_NETPLAY_CLIENT_DEFERRED = (1 << 0),
/* Only used before init_netplay */
NET_DRIVER_ST_FLAG_NETPLAY_ENABLED = (1 << 1),
NET_DRIVER_ST_FLAG_NETPLAY_IS_CLIENT = (1 << 2),
NET_DRIVER_ST_FLAG_HAS_SET_NETPLAY_MODE = (1 << 3),
NET_DRIVER_ST_FLAG_HAS_SET_NETPLAY_IP_ADDRESS = (1 << 4),
NET_DRIVER_ST_FLAG_HAS_SET_NETPLAY_IP_PORT = (1 << 5),
NET_DRIVER_ST_FLAG_HAS_SET_NETPLAY_CHECK_FRAMES = (1 << 6)
};
#endif

4
retroarch.c
View file

@ -114,6 +114,10 @@
#include "config.def.h"
#ifdef HAVE_MENU
#include "menu/menu_driver.h"
#endif
#include "runloop.h"
#include "camera/camera_driver.h"
#include "location_driver.h"

49
runtime_file.h
View file

@ -30,57 +30,10 @@
#include <boolean.h>
#include "playlist.h"
#include "runtime_file_defines.h"
RETRO_BEGIN_DECLS
/* Enums */
enum playlist_sublabel_last_played_style_type
{
PLAYLIST_LAST_PLAYED_STYLE_YMD_HMS = 0,
PLAYLIST_LAST_PLAYED_STYLE_YMD_HM,
PLAYLIST_LAST_PLAYED_STYLE_YMD,
PLAYLIST_LAST_PLAYED_STYLE_YM,
PLAYLIST_LAST_PLAYED_STYLE_MDYYYY_HMS,
PLAYLIST_LAST_PLAYED_STYLE_MDYYYY_HM,
PLAYLIST_LAST_PLAYED_STYLE_MD_HM,
PLAYLIST_LAST_PLAYED_STYLE_MDYYYY,
PLAYLIST_LAST_PLAYED_STYLE_MD,
PLAYLIST_LAST_PLAYED_STYLE_DDMMYYYY_HMS,
PLAYLIST_LAST_PLAYED_STYLE_DDMMYYYY_HM,
PLAYLIST_LAST_PLAYED_STYLE_DDMM_HM,
PLAYLIST_LAST_PLAYED_STYLE_DDMMYYYY,
PLAYLIST_LAST_PLAYED_STYLE_DDMM,
PLAYLIST_LAST_PLAYED_STYLE_YMD_HMS_AMPM,
PLAYLIST_LAST_PLAYED_STYLE_YMD_HM_AMPM,
PLAYLIST_LAST_PLAYED_STYLE_MDYYYY_HMS_AMPM,
PLAYLIST_LAST_PLAYED_STYLE_MDYYYY_HM_AMPM,
PLAYLIST_LAST_PLAYED_STYLE_MD_HM_AMPM,
PLAYLIST_LAST_PLAYED_STYLE_DDMMYYYY_HMS_AMPM,
PLAYLIST_LAST_PLAYED_STYLE_DDMMYYYY_HM_AMPM,
PLAYLIST_LAST_PLAYED_STYLE_DDMM_HM_AMPM,
PLAYLIST_LAST_PLAYED_STYLE_AGO,
PLAYLIST_LAST_PLAYED_STYLE_LAST
};
/* Note: These must be kept synchronised with
* 'enum menu_timedate_date_separator_type' in
* 'menu_defines.h' */
enum playlist_sublabel_last_played_date_separator_type
{
PLAYLIST_LAST_PLAYED_DATE_SEPARATOR_HYPHEN = 0,
PLAYLIST_LAST_PLAYED_DATE_SEPARATOR_SLASH,
PLAYLIST_LAST_PLAYED_DATE_SEPARATOR_PERIOD,
PLAYLIST_LAST_PLAYED_DATE_SEPARATOR_LAST
};
enum playlist_sublabel_runtime
{
PLAYLIST_RUNTIME_PER_CORE = 0,
PLAYLIST_RUNTIME_AGGREGATE,
PLAYLIST_RUNTIME_LAST
};
/* Structs */
typedef struct

81
runtime_file_defines.h Normal file
View file

@ -0,0 +1,81 @@
/* Copyright (C) 2010-2019 The RetroArch team
*
* ---------------------------------------------------------------------------------------
* The following license statement only applies to this file (runtime_file.h).
* ---------------------------------------------------------------------------------------
*
* Permission is hereby granted, free of charge,
* to any person obtaining a copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation the rights to
* use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
* and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#ifndef __RUNTIME_FILE_DEFINES_H
#define __RUNTIME_FILE_DEFINES_H
#include <retro_common_api.h>
#include <libretro.h>
RETRO_BEGIN_DECLS
/* Enums */
enum playlist_sublabel_last_played_style_type
{
PLAYLIST_LAST_PLAYED_STYLE_YMD_HMS = 0,
PLAYLIST_LAST_PLAYED_STYLE_YMD_HM,
PLAYLIST_LAST_PLAYED_STYLE_YMD,
PLAYLIST_LAST_PLAYED_STYLE_YM,
PLAYLIST_LAST_PLAYED_STYLE_MDYYYY_HMS,
PLAYLIST_LAST_PLAYED_STYLE_MDYYYY_HM,
PLAYLIST_LAST_PLAYED_STYLE_MD_HM,
PLAYLIST_LAST_PLAYED_STYLE_MDYYYY,
PLAYLIST_LAST_PLAYED_STYLE_MD,
PLAYLIST_LAST_PLAYED_STYLE_DDMMYYYY_HMS,
PLAYLIST_LAST_PLAYED_STYLE_DDMMYYYY_HM,
PLAYLIST_LAST_PLAYED_STYLE_DDMM_HM,
PLAYLIST_LAST_PLAYED_STYLE_DDMMYYYY,
PLAYLIST_LAST_PLAYED_STYLE_DDMM,
PLAYLIST_LAST_PLAYED_STYLE_YMD_HMS_AMPM,
PLAYLIST_LAST_PLAYED_STYLE_YMD_HM_AMPM,
PLAYLIST_LAST_PLAYED_STYLE_MDYYYY_HMS_AMPM,
PLAYLIST_LAST_PLAYED_STYLE_MDYYYY_HM_AMPM,
PLAYLIST_LAST_PLAYED_STYLE_MD_HM_AMPM,
PLAYLIST_LAST_PLAYED_STYLE_DDMMYYYY_HMS_AMPM,
PLAYLIST_LAST_PLAYED_STYLE_DDMMYYYY_HM_AMPM,
PLAYLIST_LAST_PLAYED_STYLE_DDMM_HM_AMPM,
PLAYLIST_LAST_PLAYED_STYLE_AGO,
PLAYLIST_LAST_PLAYED_STYLE_LAST
};
/* Note: These must be kept synchronised with
* 'enum menu_timedate_date_separator_type' in
* 'menu_defines.h' */
enum playlist_sublabel_last_played_date_separator_type
{
PLAYLIST_LAST_PLAYED_DATE_SEPARATOR_HYPHEN = 0,
PLAYLIST_LAST_PLAYED_DATE_SEPARATOR_SLASH,
PLAYLIST_LAST_PLAYED_DATE_SEPARATOR_PERIOD,
PLAYLIST_LAST_PLAYED_DATE_SEPARATOR_LAST
};
enum playlist_sublabel_runtime
{
PLAYLIST_RUNTIME_PER_CORE = 0,
PLAYLIST_RUNTIME_AGGREGATE,
PLAYLIST_RUNTIME_LAST
};
RETRO_END_DECLS
#endif