ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix build errors for Win32.

This commit is contained in:
Themaister 2011-01-19 13:07:11 +01:00
parent b69f91027b
commit bd23e23661
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.win32
View File

@ -11,7 +11,7 @@ HAVE_XML = 1
libsnes ?= -lsnes libsnes ?= -lsnes
LIBS = LIBS =
DEFINES = -I. DEFINES = -I. -DHAVE_CONFIGFILE
LDFLAGS = -L. -static-libgcc -s LDFLAGS = -L. -static-libgcc -s
SRC_LIBS = -lsamplerate-0 SRC_LIBS = -lsamplerate-0

1
gfx/gl.c
View File

@ -357,7 +357,6 @@ static void* gl_init(video_info_t *video, const input_driver_t **input, void **i
glGenTextures(1, &gl->texture); glGenTextures(1, &gl->texture);
glActiveTexture(GL_TEXTURE0);
glBindTexture(GL_TEXTURE_2D, gl->texture); glBindTexture(GL_TEXTURE_2D, gl->texture);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER);

7
settings.c
View File

@ -30,7 +30,9 @@
struct settings g_settings; struct settings g_settings;
#ifdef HAVE_CONFIGFILE
static void read_keybinds(config_file_t *conf); static void read_keybinds(config_file_t *conf);
#endif
static void set_defaults(void) static void set_defaults(void)
{ {
@ -96,7 +98,9 @@ static void set_defaults(void)
g_settings.video.smooth = video_smooth; g_settings.video.smooth = video_smooth;
g_settings.video.force_aspect = force_aspect; g_settings.video.force_aspect = force_aspect;
g_settings.video.aspect_ratio = SNES_ASPECT_RATIO; g_settings.video.aspect_ratio = SNES_ASPECT_RATIO;
#ifdef HAVE_FILTER
g_settings.video.filter = FILTER_NONE; g_settings.video.filter = FILTER_NONE;
#endif
g_settings.audio.enable = audio_enable; g_settings.audio.enable = audio_enable;
g_settings.audio.out_rate = out_rate; g_settings.audio.out_rate = out_rate;
@ -341,7 +345,6 @@ static void parse_config_file(void)
config_file_free(conf); config_file_free(conf);
} }
#endif
struct bind_map struct bind_map
{ {
@ -593,4 +596,4 @@ static void read_keybinds(config_file_t *conf)
} }
} }
} }
#endif