mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-09 21:45:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1026 from heuripedes/master

Browse Source 
More Windows fixes
This commit is contained in:
Twinaphex 2014-09-16 03:17:08 +02:00
commit 8071be73d9
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -16,6 +16,10 @@ LIBS :=
DEFINES := -DHAVE_CONFIG_H -DRARCH_INTERNAL -DHAVE_CC_RESAMPLER -DHAVE_OVERLAY DEFINES := -DHAVE_CONFIG_H -DRARCH_INTERNAL -DHAVE_CC_RESAMPLER -DHAVE_OVERLAY
DEFINES += -DGLOBAL_CONFIG_DIR='"$(GLOBAL_CONFIG_DIR)"' DEFINES += -DGLOBAL_CONFIG_DIR='"$(GLOBAL_CONFIG_DIR)"'
ifneq ($(findstring Win32,$(OS)),)
LDFLAGS += -static-libgcc
endif
include Makefile.common include Makefile.common
HEADERS = $(wildcard */*/*.h) $(wildcard */*.h) $(wildcard *.h) HEADERS = $(wildcard */*/*.h) $(wildcard */*.h) $(wildcard *.h)

6
Makefile.common
View File

@ -306,7 +306,7 @@ ifeq ($(HAVE_DINPUT), 1)
endif endif
ifeq ($(HAVE_WINXINPUT), 1) ifeq ($(HAVE_WINXINPUT), 1)
DEFINES += -DHAVE_WINXINPUT DEFINES += -DHAVE_WINXINPUT -DHAVE_BUILTIN_AUTOCONFIG
OBJ += input/winxinput_joypad.o \ OBJ += input/winxinput_joypad.o \
input/autoconf/builtin_win.o input/autoconf/builtin_win.o
JOYCONFIG_OBJ += input/winxinput_joypad.o JOYCONFIG_OBJ += input/winxinput_joypad.o
@ -413,6 +413,10 @@ ifeq ($(HAVE_OPENGL), 1)
DEFINES += -DHAVE_GLSL DEFINES += -DHAVE_GLSL
endif endif
ifeq ($(HAVE_SDL2), 1)
HAVE_SDL=0
endif
ifeq ($(HAVE_SDL), 1) ifeq ($(HAVE_SDL), 1)
OBJ += gfx/sdl_gfx.o input/sdl_input.o input/sdl_joypad.o audio/sdl_audio.o OBJ += gfx/sdl_gfx.o input/sdl_input.o input/sdl_joypad.o audio/sdl_audio.o

2
Makefile.win
View File

@ -64,7 +64,7 @@ OBJ :=
JOYCONFIG_OBJ := JOYCONFIG_OBJ :=
LIBS := -lm LIBS := -lm
JOYCONFIG_LIBS := JOYCONFIG_LIBS :=
DEFINES := -I. -DHAVE_BUILTIN_AUTOCONFIG -DRARCH_INTERNAL -DHAVE_CC_RESAMPLER -DHAVE_OVERLAY DEFINES := -I. -DRARCH_INTERNAL -DHAVE_CC_RESAMPLER -DHAVE_OVERLAY
LDFLAGS := -L. -static-libgcc LDFLAGS := -L. -static-libgcc
include Makefile.common include Makefile.common