From 12ca70a308f32e2ef8a08d2f67121d87a5c0e44a Mon Sep 17 00:00:00 2001
From: Themaister <maister@archlinux.us>
Date: Wed, 30 Nov 2011 17:25:44 +0100
Subject: [PATCH 1/3] Refactor binds.
---
settings.c | 249 +++++++++++++----------------------------------------
1 file changed, 62 insertions(+), 187 deletions(-)
diff --git a/settings.c b/settings.c
index 3f55cae17f..4905c2b0a2 100644
--- a/settings.c
+++ b/settings.c
@@ -453,195 +453,70 @@ struct bind_map
int snes_key;
};
+#define DECLARE_BIND(x, bind) { "input_" #x, "input_" #x "_btn", "input_" #x "_axis", bind }
+#define DECLARE_BIND_END() { NULL, NULL, NULL, SSNES_BIND_LIST_END }
+#define DECL_PLAYER(P) \
+ { \
+ DECLARE_BIND(player##P##_a, SNES_DEVICE_ID_JOYPAD_A), \
+ DECLARE_BIND(player##P##_b, SNES_DEVICE_ID_JOYPAD_B), \
+ DECLARE_BIND(player##P##_y, SNES_DEVICE_ID_JOYPAD_Y), \
+ DECLARE_BIND(player##P##_x, SNES_DEVICE_ID_JOYPAD_X), \
+ DECLARE_BIND(player##P##_start, SNES_DEVICE_ID_JOYPAD_START), \
+ DECLARE_BIND(player##P##_select, SNES_DEVICE_ID_JOYPAD_SELECT), \
+ DECLARE_BIND(player##P##_l, SNES_DEVICE_ID_JOYPAD_L), \
+ DECLARE_BIND(player##P##_r, SNES_DEVICE_ID_JOYPAD_R), \
+ DECLARE_BIND(player##P##_left, SNES_DEVICE_ID_JOYPAD_LEFT), \
+ DECLARE_BIND(player##P##_right, SNES_DEVICE_ID_JOYPAD_RIGHT), \
+ DECLARE_BIND(player##P##_up, SNES_DEVICE_ID_JOYPAD_UP), \
+ DECLARE_BIND(player##P##_down, SNES_DEVICE_ID_JOYPAD_DOWN), \
+ DECLARE_BIND_END(), \
+ }
-#define DECLARE_BIND(x, bind) { "input_" #x, "input_" #x "_btn", "input_" #x "_axis", bind },
// Big and nasty bind map... :)
-static const struct bind_map bind_maps[MAX_PLAYERS][MAX_BINDS - 1] = {
+static const struct bind_map bind_maps[MAX_PLAYERS][MAX_BINDS] = {
{
- DECLARE_BIND(player1_a, SNES_DEVICE_ID_JOYPAD_A)
- DECLARE_BIND(player1_b, SNES_DEVICE_ID_JOYPAD_B)
- DECLARE_BIND(player1_y, SNES_DEVICE_ID_JOYPAD_Y)
- DECLARE_BIND(player1_x, SNES_DEVICE_ID_JOYPAD_X)
- DECLARE_BIND(player1_start, SNES_DEVICE_ID_JOYPAD_START)
- DECLARE_BIND(player1_select, SNES_DEVICE_ID_JOYPAD_SELECT)
- DECLARE_BIND(player1_l, SNES_DEVICE_ID_JOYPAD_L)
- DECLARE_BIND(player1_r, SNES_DEVICE_ID_JOYPAD_R)
- DECLARE_BIND(player1_left, SNES_DEVICE_ID_JOYPAD_LEFT)
- DECLARE_BIND(player1_right, SNES_DEVICE_ID_JOYPAD_RIGHT)
- DECLARE_BIND(player1_up, SNES_DEVICE_ID_JOYPAD_UP)
- DECLARE_BIND(player1_down, SNES_DEVICE_ID_JOYPAD_DOWN)
- DECLARE_BIND(toggle_fast_forward, SSNES_FAST_FORWARD_KEY)
- DECLARE_BIND(hold_fast_forward, SSNES_FAST_FORWARD_HOLD_KEY)
- DECLARE_BIND(save_state, SSNES_SAVE_STATE_KEY)
- DECLARE_BIND(load_state, SSNES_LOAD_STATE_KEY)
- DECLARE_BIND(state_slot_increase, SSNES_STATE_SLOT_PLUS)
- DECLARE_BIND(state_slot_decrease, SSNES_STATE_SLOT_MINUS)
- DECLARE_BIND(exit_emulator, SSNES_QUIT_KEY)
- DECLARE_BIND(toggle_fullscreen, SSNES_FULLSCREEN_TOGGLE_KEY)
- DECLARE_BIND(rate_step_up, SSNES_AUDIO_INPUT_RATE_PLUS)
- DECLARE_BIND(rate_step_down, SSNES_AUDIO_INPUT_RATE_MINUS)
- DECLARE_BIND(rewind, SSNES_REWIND)
- DECLARE_BIND(movie_record_toggle, SSNES_MOVIE_RECORD_TOGGLE)
- DECLARE_BIND(pause_toggle, SSNES_PAUSE_TOGGLE)
- DECLARE_BIND(frame_advance, SSNES_FRAMEADVANCE)
- DECLARE_BIND(reset, SSNES_RESET)
- DECLARE_BIND(shader_next, SSNES_SHADER_NEXT)
- DECLARE_BIND(shader_prev, SSNES_SHADER_PREV)
- DECLARE_BIND(cheat_index_plus, SSNES_CHEAT_INDEX_PLUS)
- DECLARE_BIND(cheat_index_minus, SSNES_CHEAT_INDEX_MINUS)
- DECLARE_BIND(cheat_toggle, SSNES_CHEAT_TOGGLE)
- DECLARE_BIND(screenshot, SSNES_SCREENSHOT)
- DECLARE_BIND(dsp_config, SSNES_DSP_CONFIG)
- DECLARE_BIND(audio_mute, SSNES_MUTE)
- },
- {
- DECLARE_BIND(player2_a, SNES_DEVICE_ID_JOYPAD_A)
- DECLARE_BIND(player2_b, SNES_DEVICE_ID_JOYPAD_B)
- DECLARE_BIND(player2_y, SNES_DEVICE_ID_JOYPAD_Y)
- DECLARE_BIND(player2_x, SNES_DEVICE_ID_JOYPAD_X)
- DECLARE_BIND(player2_start, SNES_DEVICE_ID_JOYPAD_START)
- DECLARE_BIND(player2_select, SNES_DEVICE_ID_JOYPAD_SELECT)
- DECLARE_BIND(player2_l, SNES_DEVICE_ID_JOYPAD_L)
- DECLARE_BIND(player2_r, SNES_DEVICE_ID_JOYPAD_R)
- DECLARE_BIND(player2_left, SNES_DEVICE_ID_JOYPAD_LEFT)
- DECLARE_BIND(player2_right, SNES_DEVICE_ID_JOYPAD_RIGHT)
- DECLARE_BIND(player2_up, SNES_DEVICE_ID_JOYPAD_UP)
- DECLARE_BIND(player2_down, SNES_DEVICE_ID_JOYPAD_DOWN)
- DECLARE_BIND(toggle_fast_forward, SSNES_FAST_FORWARD_KEY)
- DECLARE_BIND(hold_fast_forward, SSNES_FAST_FORWARD_HOLD_KEY)
- DECLARE_BIND(save_state, SSNES_SAVE_STATE_KEY)
- DECLARE_BIND(load_state, SSNES_LOAD_STATE_KEY)
- DECLARE_BIND(state_slot_increase, SSNES_STATE_SLOT_PLUS)
- DECLARE_BIND(state_slot_decrease, SSNES_STATE_SLOT_MINUS)
- DECLARE_BIND(exit_emulator, SSNES_QUIT_KEY)
- DECLARE_BIND(toggle_fullscreen, SSNES_FULLSCREEN_TOGGLE_KEY)
- DECLARE_BIND(rate_step_up, SSNES_AUDIO_INPUT_RATE_PLUS)
- DECLARE_BIND(rate_step_down, SSNES_AUDIO_INPUT_RATE_MINUS)
- DECLARE_BIND(rewind, SSNES_REWIND)
- DECLARE_BIND(movie_record_toggle, SSNES_MOVIE_RECORD_TOGGLE)
- DECLARE_BIND(pause_toggle, SSNES_PAUSE_TOGGLE)
- DECLARE_BIND(frame_advance, SSNES_FRAMEADVANCE)
- DECLARE_BIND(reset, SSNES_RESET)
- DECLARE_BIND(shader_next, SSNES_SHADER_NEXT)
- DECLARE_BIND(shader_prev, SSNES_SHADER_PREV)
- DECLARE_BIND(cheat_index_plus, SSNES_CHEAT_INDEX_PLUS)
- DECLARE_BIND(cheat_index_minus, SSNES_CHEAT_INDEX_MINUS)
- DECLARE_BIND(cheat_toggle, SSNES_CHEAT_TOGGLE)
- DECLARE_BIND(screenshot, SSNES_SCREENSHOT)
- DECLARE_BIND(dsp_config, SSNES_DSP_CONFIG)
- DECLARE_BIND(audio_mute, SSNES_MUTE)
- },
- {
- DECLARE_BIND(player3_a, SNES_DEVICE_ID_JOYPAD_A)
- DECLARE_BIND(player3_b, SNES_DEVICE_ID_JOYPAD_B)
- DECLARE_BIND(player3_y, SNES_DEVICE_ID_JOYPAD_Y)
- DECLARE_BIND(player3_x, SNES_DEVICE_ID_JOYPAD_X)
- DECLARE_BIND(player3_start, SNES_DEVICE_ID_JOYPAD_START)
- DECLARE_BIND(player3_select, SNES_DEVICE_ID_JOYPAD_SELECT)
- DECLARE_BIND(player3_l, SNES_DEVICE_ID_JOYPAD_L)
- DECLARE_BIND(player3_r, SNES_DEVICE_ID_JOYPAD_R)
- DECLARE_BIND(player3_left, SNES_DEVICE_ID_JOYPAD_LEFT)
- DECLARE_BIND(player3_right, SNES_DEVICE_ID_JOYPAD_RIGHT)
- DECLARE_BIND(player3_up, SNES_DEVICE_ID_JOYPAD_UP)
- DECLARE_BIND(player3_down, SNES_DEVICE_ID_JOYPAD_DOWN)
- DECLARE_BIND(toggle_fast_forward, SSNES_FAST_FORWARD_KEY)
- DECLARE_BIND(hold_fast_forward, SSNES_FAST_FORWARD_HOLD_KEY)
- DECLARE_BIND(save_state, SSNES_SAVE_STATE_KEY)
- DECLARE_BIND(load_state, SSNES_LOAD_STATE_KEY)
- DECLARE_BIND(state_slot_increase, SSNES_STATE_SLOT_PLUS)
- DECLARE_BIND(state_slot_decrease, SSNES_STATE_SLOT_MINUS)
- DECLARE_BIND(exit_emulator, SSNES_QUIT_KEY)
- DECLARE_BIND(toggle_fullscreen, SSNES_FULLSCREEN_TOGGLE_KEY)
- DECLARE_BIND(rate_step_up, SSNES_AUDIO_INPUT_RATE_PLUS)
- DECLARE_BIND(rate_step_down, SSNES_AUDIO_INPUT_RATE_MINUS)
- DECLARE_BIND(rewind, SSNES_REWIND)
- DECLARE_BIND(movie_record_toggle, SSNES_MOVIE_RECORD_TOGGLE)
- DECLARE_BIND(pause_toggle, SSNES_PAUSE_TOGGLE)
- DECLARE_BIND(frame_advance, SSNES_FRAMEADVANCE)
- DECLARE_BIND(reset, SSNES_RESET)
- DECLARE_BIND(shader_next, SSNES_SHADER_NEXT)
- DECLARE_BIND(shader_prev, SSNES_SHADER_PREV)
- DECLARE_BIND(cheat_index_plus, SSNES_CHEAT_INDEX_PLUS)
- DECLARE_BIND(cheat_index_minus, SSNES_CHEAT_INDEX_MINUS)
- DECLARE_BIND(cheat_toggle, SSNES_CHEAT_TOGGLE)
- DECLARE_BIND(screenshot, SSNES_SCREENSHOT)
- DECLARE_BIND(dsp_config, SSNES_DSP_CONFIG)
- DECLARE_BIND(audio_mute, SSNES_MUTE)
- },
- {
- DECLARE_BIND(player4_a, SNES_DEVICE_ID_JOYPAD_A)
- DECLARE_BIND(player4_b, SNES_DEVICE_ID_JOYPAD_B)
- DECLARE_BIND(player4_y, SNES_DEVICE_ID_JOYPAD_Y)
- DECLARE_BIND(player4_x, SNES_DEVICE_ID_JOYPAD_X)
- DECLARE_BIND(player4_start, SNES_DEVICE_ID_JOYPAD_START)
- DECLARE_BIND(player4_select, SNES_DEVICE_ID_JOYPAD_SELECT)
- DECLARE_BIND(player4_l, SNES_DEVICE_ID_JOYPAD_L)
- DECLARE_BIND(player4_r, SNES_DEVICE_ID_JOYPAD_R)
- DECLARE_BIND(player4_left, SNES_DEVICE_ID_JOYPAD_LEFT)
- DECLARE_BIND(player4_right, SNES_DEVICE_ID_JOYPAD_RIGHT)
- DECLARE_BIND(player4_up, SNES_DEVICE_ID_JOYPAD_UP)
- DECLARE_BIND(player4_down, SNES_DEVICE_ID_JOYPAD_DOWN)
- DECLARE_BIND(toggle_fast_forward, SSNES_FAST_FORWARD_KEY)
- DECLARE_BIND(hold_fast_forward, SSNES_FAST_FORWARD_HOLD_KEY)
- DECLARE_BIND(save_state, SSNES_SAVE_STATE_KEY)
- DECLARE_BIND(load_state, SSNES_LOAD_STATE_KEY)
- DECLARE_BIND(state_slot_increase, SSNES_STATE_SLOT_PLUS)
- DECLARE_BIND(state_slot_decrease, SSNES_STATE_SLOT_MINUS)
- DECLARE_BIND(exit_emulator, SSNES_QUIT_KEY)
- DECLARE_BIND(toggle_fullscreen, SSNES_FULLSCREEN_TOGGLE_KEY)
- DECLARE_BIND(rate_step_up, SSNES_AUDIO_INPUT_RATE_PLUS)
- DECLARE_BIND(rate_step_down, SSNES_AUDIO_INPUT_RATE_MINUS)
- DECLARE_BIND(rewind, SSNES_REWIND)
- DECLARE_BIND(movie_record_toggle, SSNES_MOVIE_RECORD_TOGGLE)
- DECLARE_BIND(pause_toggle, SSNES_PAUSE_TOGGLE)
- DECLARE_BIND(frame_advance, SSNES_FRAMEADVANCE)
- DECLARE_BIND(reset, SSNES_RESET)
- DECLARE_BIND(shader_next, SSNES_SHADER_NEXT)
- DECLARE_BIND(shader_prev, SSNES_SHADER_PREV)
- DECLARE_BIND(cheat_index_plus, SSNES_CHEAT_INDEX_PLUS)
- DECLARE_BIND(cheat_index_minus, SSNES_CHEAT_INDEX_MINUS)
- DECLARE_BIND(cheat_toggle, SSNES_CHEAT_TOGGLE)
- DECLARE_BIND(screenshot, SSNES_SCREENSHOT)
- DECLARE_BIND(dsp_config, SSNES_DSP_CONFIG)
- DECLARE_BIND(audio_mute, SSNES_MUTE)
- },
- {
- DECLARE_BIND(player5_a, SNES_DEVICE_ID_JOYPAD_A)
- DECLARE_BIND(player5_b, SNES_DEVICE_ID_JOYPAD_B)
- DECLARE_BIND(player5_y, SNES_DEVICE_ID_JOYPAD_Y)
- DECLARE_BIND(player5_x, SNES_DEVICE_ID_JOYPAD_X)
- DECLARE_BIND(player5_start, SNES_DEVICE_ID_JOYPAD_START)
- DECLARE_BIND(player5_select, SNES_DEVICE_ID_JOYPAD_SELECT)
- DECLARE_BIND(player5_l, SNES_DEVICE_ID_JOYPAD_L)
- DECLARE_BIND(player5_r, SNES_DEVICE_ID_JOYPAD_R)
- DECLARE_BIND(player5_left, SNES_DEVICE_ID_JOYPAD_LEFT)
- DECLARE_BIND(player5_right, SNES_DEVICE_ID_JOYPAD_RIGHT)
- DECLARE_BIND(player5_up, SNES_DEVICE_ID_JOYPAD_UP)
- DECLARE_BIND(player5_down, SNES_DEVICE_ID_JOYPAD_DOWN)
- DECLARE_BIND(toggle_fast_forward, SSNES_FAST_FORWARD_KEY)
- DECLARE_BIND(hold_fast_forward, SSNES_FAST_FORWARD_HOLD_KEY)
- DECLARE_BIND(save_state, SSNES_SAVE_STATE_KEY)
- DECLARE_BIND(load_state, SSNES_LOAD_STATE_KEY)
- DECLARE_BIND(state_slot_increase, SSNES_STATE_SLOT_PLUS)
- DECLARE_BIND(state_slot_decrease, SSNES_STATE_SLOT_MINUS)
- DECLARE_BIND(exit_emulator, SSNES_QUIT_KEY)
- DECLARE_BIND(toggle_fullscreen, SSNES_FULLSCREEN_TOGGLE_KEY)
- DECLARE_BIND(rate_step_up, SSNES_AUDIO_INPUT_RATE_PLUS)
- DECLARE_BIND(rate_step_down, SSNES_AUDIO_INPUT_RATE_MINUS)
- DECLARE_BIND(rewind, SSNES_REWIND)
- DECLARE_BIND(movie_record_toggle, SSNES_MOVIE_RECORD_TOGGLE)
- DECLARE_BIND(pause_toggle, SSNES_PAUSE_TOGGLE)
- DECLARE_BIND(frame_advance, SSNES_FRAMEADVANCE)
- DECLARE_BIND(reset, SSNES_RESET)
- DECLARE_BIND(shader_next, SSNES_SHADER_NEXT)
- DECLARE_BIND(shader_prev, SSNES_SHADER_PREV)
- DECLARE_BIND(cheat_index_plus, SSNES_CHEAT_INDEX_PLUS)
- DECLARE_BIND(cheat_index_minus, SSNES_CHEAT_INDEX_MINUS)
- DECLARE_BIND(cheat_toggle, SSNES_CHEAT_TOGGLE)
- DECLARE_BIND(screenshot, SSNES_SCREENSHOT)
- DECLARE_BIND(dsp_config, SSNES_DSP_CONFIG)
- DECLARE_BIND(audio_mute, SSNES_MUTE)
+ DECLARE_BIND(player1_a, SNES_DEVICE_ID_JOYPAD_A),
+ DECLARE_BIND(player1_b, SNES_DEVICE_ID_JOYPAD_B),
+ DECLARE_BIND(player1_y, SNES_DEVICE_ID_JOYPAD_Y),
+ DECLARE_BIND(player1_x, SNES_DEVICE_ID_JOYPAD_X),
+ DECLARE_BIND(player1_start, SNES_DEVICE_ID_JOYPAD_START),
+ DECLARE_BIND(player1_select, SNES_DEVICE_ID_JOYPAD_SELECT),
+ DECLARE_BIND(player1_l, SNES_DEVICE_ID_JOYPAD_L),
+ DECLARE_BIND(player1_r, SNES_DEVICE_ID_JOYPAD_R),
+ DECLARE_BIND(player1_left, SNES_DEVICE_ID_JOYPAD_LEFT),
+ DECLARE_BIND(player1_right, SNES_DEVICE_ID_JOYPAD_RIGHT),
+ DECLARE_BIND(player1_up, SNES_DEVICE_ID_JOYPAD_UP),
+ DECLARE_BIND(player1_down, SNES_DEVICE_ID_JOYPAD_DOWN),
+ DECLARE_BIND(toggle_fast_forward, SSNES_FAST_FORWARD_KEY),
+ DECLARE_BIND(hold_fast_forward, SSNES_FAST_FORWARD_HOLD_KEY),
+ DECLARE_BIND(save_state, SSNES_SAVE_STATE_KEY),
+ DECLARE_BIND(load_state, SSNES_LOAD_STATE_KEY),
+ DECLARE_BIND(state_slot_increase, SSNES_STATE_SLOT_PLUS),
+ DECLARE_BIND(state_slot_decrease, SSNES_STATE_SLOT_MINUS),
+ DECLARE_BIND(exit_emulator, SSNES_QUIT_KEY),
+ DECLARE_BIND(toggle_fullscreen, SSNES_FULLSCREEN_TOGGLE_KEY),
+ DECLARE_BIND(rate_step_up, SSNES_AUDIO_INPUT_RATE_PLUS),
+ DECLARE_BIND(rate_step_down, SSNES_AUDIO_INPUT_RATE_MINUS),
+ DECLARE_BIND(rewind, SSNES_REWIND),
+ DECLARE_BIND(movie_record_toggle, SSNES_MOVIE_RECORD_TOGGLE),
+ DECLARE_BIND(pause_toggle, SSNES_PAUSE_TOGGLE),
+ DECLARE_BIND(frame_advance, SSNES_FRAMEADVANCE),
+ DECLARE_BIND(reset, SSNES_RESET),
+ DECLARE_BIND(shader_next, SSNES_SHADER_NEXT),
+ DECLARE_BIND(shader_prev, SSNES_SHADER_PREV),
+ DECLARE_BIND(cheat_index_plus, SSNES_CHEAT_INDEX_PLUS),
+ DECLARE_BIND(cheat_index_minus, SSNES_CHEAT_INDEX_MINUS),
+ DECLARE_BIND(cheat_toggle, SSNES_CHEAT_TOGGLE),
+ DECLARE_BIND(screenshot, SSNES_SCREENSHOT),
+ DECLARE_BIND(dsp_config, SSNES_DSP_CONFIG),
+ DECLARE_BIND(audio_mute, SSNES_MUTE),
+ DECLARE_BIND_END(),
},
+
+ DECL_PLAYER(2),
+ DECL_PLAYER(3),
+ DECL_PLAYER(4),
+ DECL_PLAYER(5),
};
struct key_map
@@ -734,7 +609,7 @@ static struct snes_keybind *find_snes_bind(unsigned port, int id)
static int find_sk_bind(const char *str)
{
- for (int i = 0; i < sizeof(sk_map)/sizeof(struct key_map); i++)
+ for (int i = 0; i < sizeof(sk_map) / sizeof(struct key_map); i++)
{
if (strcasecmp(sk_map[i].str, str) == 0)
return sk_map[i].key;
@@ -760,7 +635,7 @@ static void read_keybinds(config_file_t *conf)
for (int j = 0; j < MAX_PLAYERS; j++)
{
- for (int i = 0; i < sizeof(bind_maps[0])/sizeof(struct bind_map); i++)
+ for (int i = 0; bind_maps[j][i].snes_key != SSNES_BIND_LIST_END; i++)
{
struct snes_keybind *bind = find_snes_bind(j, bind_maps[j][i].snes_key);
if (!bind)
From a5b3f421d136305c0f1731531bc2a807ac54ba57 Mon Sep 17 00:00:00 2001
From: Themaister <maister@archlinux.us>
Date: Wed, 30 Nov 2011 17:32:30 +0100
Subject: [PATCH 2/3] Fix include paths for libsnes header.
---
dynamic.c | 2 +-
dynamic.h | 2 +-
file.c | 2 +-
gfx/snes_state.c | 2 +-
input/sdl.c | 2 +-
netplay.h | 2 +-
ssnes.c | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/dynamic.c b/dynamic.c
index 29364a9d3d..32f9f189cb 100644
--- a/dynamic.c
+++ b/dynamic.c
@@ -25,7 +25,7 @@
#include "config.h"
#endif
-#include <libsnes.hpp>
+#include "libsnes.hpp"
#ifdef _WIN32
#include <windows.h>
diff --git a/dynamic.h b/dynamic.h
index b08e329758..bee2014c8d 100644
--- a/dynamic.h
+++ b/dynamic.h
@@ -19,7 +19,7 @@
#define __DYNAMIC_H
#include <stdbool.h>
-#include <libsnes.hpp>
+#include "libsnes.hpp"
void init_dlsym(void);
void uninit_dlsym(void);
diff --git a/file.c b/file.c
index 73c7d344da..0248d6588f 100644
--- a/file.c
+++ b/file.c
@@ -19,7 +19,7 @@
#include "general.h"
#include <stdlib.h>
#include <stdbool.h>
-#include <libsnes.hpp>
+#include "libsnes.hpp"
#include <string.h>
#include <assert.h>
#include <time.h>
diff --git a/gfx/snes_state.c b/gfx/snes_state.c
index 7e8eeb26f0..9cd6240d77 100644
--- a/gfx/snes_state.c
+++ b/gfx/snes_state.c
@@ -20,7 +20,7 @@
#include <assert.h>
#include "strl.h"
#include "general.h"
-#include <libsnes.hpp>
+#include "../libsnes.hpp"
#ifdef HAVE_PYTHON
#include "py_state/py_state.h"
diff --git a/input/sdl.c b/input/sdl.c
index e0d54f1712..a96cf79798 100644
--- a/input/sdl.c
+++ b/input/sdl.c
@@ -22,7 +22,7 @@
#include "general.h"
#include <stdint.h>
#include <stdlib.h>
-#include <libsnes.hpp>
+#include "../libsnes.hpp"
#include "ssnes_sdl_input.h"
#include "keysym.h"
diff --git a/netplay.h b/netplay.h
index 2e439c5f9e..b5770a1fac 100644
--- a/netplay.h
+++ b/netplay.h
@@ -21,7 +21,7 @@
#include <stdint.h>
#include <stdbool.h>
-#include <libsnes.hpp>
+#include "libsnes.hpp"
void input_poll_net(void);
int16_t input_state_net(bool port, unsigned device, unsigned index, unsigned id);
diff --git a/ssnes.c b/ssnes.c
index 6f97b28a60..2ead93c9ae 100644
--- a/ssnes.c
+++ b/ssnes.c
@@ -16,7 +16,7 @@
*/
#include <stdbool.h>
-#include <libsnes.hpp>
+#include "libsnes.hpp"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
From b87f50dc9db73dff123290e8646b094156454f06 Mon Sep 17 00:00:00 2001
From: Themaister <maister@archlinux.us>
Date: Wed, 30 Nov 2011 17:34:18 +0100
Subject: [PATCH 3/3] Fix include path.
---
gfx/gfx_common.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gfx/gfx_common.c b/gfx/gfx_common.c
index 2f2ee6d517..99571d75f6 100644
--- a/gfx/gfx_common.c
+++ b/gfx/gfx_common.c
@@ -16,7 +16,7 @@
*/
#include "gfx_common.h"
-#include "general.h"
+#include "../general.h"
#include <sys/time.h>
static float tv_to_fps(const struct timeval *tv, const struct timeval *new_tv, int frames)