Fix more MSVC Griffin build errors

This commit is contained in:
twinaphex 2017-12-30 13:35:47 +01:00
parent 8d5a8355a7
commit 292d506ed8
8 changed files with 26 additions and 35 deletions

View File

@ -20,11 +20,14 @@
#include <boolean.h>
#include <libretro.h>
#include <retro_environment.h>
#ifdef HAVE_CONFIG_H
#include "../config.h"
#endif
RETRO_BEGIN_DECLS
void libretro_dummy_retro_init(void);
void libretro_dummy_retro_deinit(void);
@ -300,4 +303,6 @@ size_t libretro_videoprocessor_retro_get_memory_size(unsigned id);
#endif
RETRO_END_DECLS
#endif

View File

@ -21,6 +21,9 @@
#include <stddef.h>
#include <boolean.h>
#include <retro_environment.h>
RETRO_BEGIN_DECLS
enum file_path_enum
{
@ -141,4 +144,6 @@ bool fill_pathname_application_data(char *s, size_t len);
void fill_pathname_application_special(char *s, size_t len, enum application_special_type type);
RETRO_END_DECLS
#endif

View File

@ -73,8 +73,6 @@
const GUID GUID_DEVINTERFACE_HID = { 0x4d1e55b2, 0xf16f, 0x11Cf, { 0x88, 0xcb, 0x00, 0x11, 0x11, 0x00, 0x00, 0x30 } };
HDEVNOTIFY notification_handler;
extern LRESULT win32_menu_loop(HWND owner, WPARAM wparam);
#if defined(HAVE_D3D9) || defined(HAVE_D3D8)
extern bool dinput_handle_message(void *dinput, UINT message,
WPARAM wParam, LPARAM lParam);

View File

@ -32,6 +32,7 @@
#include <boolean.h>
#include <retro_common_api.h>
#include <retro_environment.h>
#include "../../driver.h"
#include "../video_driver.h"
@ -42,9 +43,7 @@
#include "../../ui/drivers/ui_win32.h"
#endif
#ifdef __cplusplus
extern "C" {
#endif
RETRO_BEGIN_DECLS
#ifndef _XBOX
extern unsigned g_resize_width;
@ -141,8 +140,8 @@ LRESULT CALLBACK WndProcGDI(HWND hwnd, UINT message,
BOOL IsIconic(HWND hwnd);
#endif
#ifdef __cplusplus
}
#endif
LRESULT win32_menu_loop(HWND owner, WPARAM wparam);
RETRO_END_DECLS
#endif

View File

@ -1085,16 +1085,8 @@ MENU
#include "../menu/menu_cbs.c"
#include "../menu/menu_content.c"
#ifdef __cplusplus
extern "C" {
#endif
#include "../menu/menu_networking.c"
#ifdef __cplusplus
}
#endif
#include "../menu/widgets/menu_entry.c"
#include "../menu/widgets/menu_filebrowser.c"
#include "../menu/widgets/menu_dialog.c"
@ -1204,10 +1196,6 @@ extern "C" {
#include "../command.c"
#ifdef __cplusplus
extern "C" {
#endif
#if defined(HAVE_NETWORKING)
#include "../libretro-common/net/net_http_parse.c"
#endif
@ -1330,7 +1318,3 @@ HTTP SERVER
#include "../deps/civetweb/civetweb.c"
#include "network/httpserver/httpserver.c"
#endif
#ifdef __cplusplus
}
#endif

View File

@ -20,24 +20,17 @@
#include <stddef.h>
#include <sys/types.h>
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <boolean.h>
#include <retro_common_api.h>
#include <retro_inline.h>
#include <libretro.h>
#include "../msg_hash.h"
#include <retro_environment.h>
RETRO_BEGIN_DECLS
typedef struct led_driver
{
void (*init)(void);
void (*free)(void);
void (*set_led)(int led,int value);
void (*init)(void);
void (*free)(void);
void (*set_led)(int led,int value);
} led_driver_t;
bool led_driver_init(void);

View File

@ -22,6 +22,9 @@
#include <stddef.h>
#include <lists/string_list.h>
#include <retro_environment.h>
RETRO_BEGIN_DECLS
enum dir_list_type
{
@ -62,4 +65,6 @@ struct string_list *string_list_new_special(enum string_list_type type,
const char *char_list_new_special(enum string_list_type type, void *data);
RETRO_END_DECLS
#endif

View File

@ -19,7 +19,9 @@
#define _MENU_NETWORKING_H
#include <stdint.h>
#include <retro_common_api.h>
#include <retro_environment.h>
#include <lists/file_list.h>