libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2025-02-23 03:02:04 +00:00
Code Issues Actions 24 Packages Projects Releases Wiki Activity

(WIN32) various build fixes.

Browse Source
This commit is contained in:
aliaspider 2018-01-20 20:05:32 +01:00
parent 5918e15999
commit 5db96f35fa
9 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
audio/drivers/wasapi.c
View File

@ -23,11 +23,11 @@
#include <windows.h>
#include <winerror.h>
#include <propidl.h>
#include <initguid.h>
#include <mmdeviceapi.h>
#include <mmreg.h>
#include <audioclient.h>
#include <propidl.h>
#include <lists/string_list.h>
#include <queues/fifo_queue.h>

4
config.def.h
View File

@ -670,7 +670,7 @@ static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/apple/
#endif
#elif defined(_WIN32) && !defined(_XBOX)
#if _MSC_VER == 1600
#if defined(__x86_64__)
#if defined(__x86_64__) || defined(_M_X64)
static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/windows-msvc2010/x86_64/latest/";
#elif defined(__i386__) || defined(__i486__) || defined(__i686__) || defined(_M_IX86) || defined(_M_IA64)
static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/windows-msvc2010/x86/latest/";
@ -680,7 +680,7 @@ static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/window
#elif _MSC_VER == 1310
static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/windows-msvc2003/x86/latest/";
#else
#if defined(__x86_64__)
#if defined(__x86_64__) || defined(_M_X64)
static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/windows/x86_64/latest/";
#elif defined(__i386__) || defined(__i486__) || defined(__i686__) || defined(_M_IX86) || defined(_M_IA64)
static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/windows/x86/latest/";

16
input/drivers/dinput.c
View File

@ -21,14 +21,6 @@
#undef DIRECTINPUT_VERSION
#define DIRECTINPUT_VERSION 0x0800
#ifndef WM_MOUSEHWHEEL
#define WM_MOUSEHWHEEL 0x20e
#endif
#ifndef WM_MOUSEWHEEL
#define WM_MOUSEWHEEL 0x020A
#endif
#include <dinput.h>
#include <dbt.h>
@ -39,6 +31,14 @@
#include <windowsx.h>
#ifndef WM_MOUSEHWHEEL
#define WM_MOUSEHWHEEL 0x20e
#endif
#ifndef WM_MOUSEWHEEL
#define WM_MOUSEWHEEL 0x020A
#endif
#ifdef HAVE_CONFIG_H
#include "../../config.h"
#endif

2
libretro-common/gfx/scaler/scaler_filter.c
View File

@ -26,8 +26,8 @@
#include <gfx/scaler/filter.h>
#include <gfx/scaler/scaler_int.h>
#include <retro_inline.h>
#include <retro_math.h>
#include <filters.h>
#include <retro_math.h>
#define FILTER_UNITY (1 << 14)

4
libretro-common/include/gfx/scaler/scaler.h
View File

@ -23,13 +23,13 @@
#ifndef __LIBRETRO_SDK_SCALER_H__
#define __LIBRETRO_SDK_SCALER_H__
#include <retro_common_api.h>
#include <stdint.h>
#include <stddef.h>
#include <boolean.h>
#include <clamping.h>
#include <retro_common_api.h>
RETRO_BEGIN_DECLS
enum scaler_pix_fmt

4
libretro-common/include/retro_common_api.h
View File

@ -76,11 +76,15 @@ typedef int ssize_t;
#endif
#ifdef _MSC_VER
#if _MSC_VER >= 1800
#include <inttypes.h>
#else
#ifndef PRId64
#define PRId64 "I64d"
#define PRIu64 "I64u"
#define PRIuPTR "Iu"
#endif
#endif
#else
/* C++11 says this one isn't needed, but apparently (some versions of) mingw require it anyways */
/* https://stackoverflow.com/questions/8132399/how-to-printf-uint64-t-fails-with-spurious-trailing-in-format */

5
libretro-common/net/net_http.c
View File

@ -32,6 +32,7 @@
#endif
#include <compat/strl.h>
#include <string/stdstring.h>
#include <retro_common_api.h>
enum
{
@ -397,9 +398,9 @@ struct http_t *net_http_new(struct http_connection_t *conn)
post_len = strlen(conn->postdatacopy);
#ifdef _WIN32
len = snprintf(NULL, 0, "%I64u", post_len);
len = snprintf(NULL, 0, "%"PRIuPTR, post_len);
len_str = (char*)malloc(len + 1);
snprintf(len_str, len + 1, "%I64u", post_len);
snprintf(len_str, len + 1, "%"PRIuPTR, post_len);
#else
len = snprintf(NULL, 0, "%llu", (long long unsigned)post_len);
len_str = (char*)malloc(len + 1);

1
tasks/task_autodetect.c
View File

@ -50,6 +50,7 @@
#include <setupapi.h>
#include <hidsdi.h>
/* Why doesn't including cguid.h work to get a GUID_NULL instead? */
__attribute__((weak))
const GUID GUID_NULL = {0, 0, 0, {0, 0, 0, 0, 0, 0, 0, 0}};
#endif

3
ui/drivers/win32/ui_win32_browser_window.c
View File

@ -19,7 +19,10 @@
#include <stdlib.h>
#include <string.h>
#include "../../gfx/common/win32_common.h"
#include <windows.h>
#include <commdlg.h>
#include <commctrl.h>
#include "../../ui_companion_driver.h"