mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-28 19:20:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix some includes and stuff.

Browse Source
This commit is contained in:
Themaister 2011-06-10 17:55:40 +02:00
parent d03855c655
commit 2dcccc7cda
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile.win64
View File

@ -6,6 +6,7 @@ JOBJ = conf/config_file.o tools/main-stub.o tools/ssnes-joyconfig.o
CC = gcc CC = gcc
CXX = g++ CXX = g++
HAVE_DINPUT = 1
HAVE_SRC = 0 HAVE_SRC = 0
HAVE_SDL = 1 HAVE_SDL = 1
HAVE_XML = 1 HAVE_XML = 1
@ -105,6 +106,13 @@ ifeq ($(HAVE_PYTHON), 1)
OBJ += gfx/py_state/py_state.o OBJ += gfx/py_state/py_state.o
endif endif
ifeq ($(HAVE_DINPUT), 1)
LIBS += -ldinput8 -ldxguid -lole32
DEFINES += -DHAVE_DINPUT
OBJ += input/dinput.o
endif
ifneq ($(V),1) ifneq ($(V),1)
Q := @ Q := @
endif endif

2
input/dinput.c
View File

@ -109,7 +109,7 @@ sdl_dinput_t* sdl_dinput_init(void)
di->hWnd = info.window; di->hWnd = info.window;
if (FAILED(DirectInput8Create( if (FAILED(DirectInput8Create(
GetModuleHandle(NULL), 0x0800, &IID_IDirectInput8, GetModuleHandle(NULL), DIRECTINPUT_VERSION, &IID_IDirectInput8,
(void**)&di->ctx, NULL))) (void**)&di->ctx, NULL)))
{ {
SSNES_ERR("Failed to init DirectInput.\n"); SSNES_ERR("Failed to init DirectInput.\n");

3
input/ssnes_dinput.h
View File

@ -18,6 +18,9 @@
#ifndef __SSNES_DINPUT_H #ifndef __SSNES_DINPUT_H
#define __SSNES_DINPUT_H #define __SSNES_DINPUT_H
#undef DIRECTINPUT_VERSION
#define DIRECTINPUT_VERSION 0x0800
#include <dinput.h> #include <dinput.h>
#include <stdbool.h> #include <stdbool.h>
#include "general.h" #include "general.h"