Merge ../SSNES-w64

This commit is contained in:
Themaister 2011-08-28 21:48:06 +02:00
commit 4b4686ae04
2 changed files with 27 additions and 20 deletions

View File

@ -7,19 +7,23 @@ CC = gcc
CXX = g++
HAVE_DINPUT = 1
HAVE_SDL = 1
HAVE_SDL_IMAGE = 1
HAVE_XML = 1
HAVE_FREETYPE = 1
HAVE_XAUDIO = 1
HAVE_DSOUND = 1
HAVE_RSOUND = 1
HAVE_SDL = 1
HAVE_DYLIB = 1
HAVE_NETPLAY = 1
HAVE_FBO = 1
HAVE_CG = 1
HAVE_PYTHON = 1
HAVE_FFMPEG = 0
ifeq ($(SLIM),)
HAVE_SDL_IMAGE = 1
HAVE_XML = 1
HAVE_FREETYPE = 1
HAVE_RSOUND = 1
HAVE_NETPLAY = 1
HAVE_FBO = 1
HAVE_CG = 1
HAVE_PYTHON = 1
HAVE_FFMPEG = 0
endif
libsnes ?= -lsnes
LIBS = -lm -lshlwapi

View File

@ -7,19 +7,22 @@ CC = gcc
CXX = g++
HAVE_DINPUT = 1
HAVE_SDL = 1
HAVE_SDL_IMAGE = 1
HAVE_XML = 1
HAVE_FREETYPE = 1
HAVE_XAUDIO = 1
HAVE_DSOUND = 1
HAVE_RSOUND = 1
HAVE_SDL = 1
HAVE_DYLIB = 1
HAVE_NETPLAY = 1
HAVE_FBO = 1
HAVE_CG = 1
HAVE_PYTHON = 1
HAVE_FFMPEG = 1
ifeq ($(SLIM),)
HAVE_XML = 1
HAVE_SDL_IMAGE = 1
HAVE_FREETYPE = 1
HAVE_RSOUND = 1
HAVE_NETPLAY = 1
HAVE_FBO = 1
HAVE_CG = 1
HAVE_PYTHON = 1
HAVE_FFMPEG = 1
endif
libsnes ?= -lsnes
LIBS = -lm -lshlwapi