Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-06-06 21:03:47 +03:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

SDL: SDL2 is now the default except for OS/2 builds. [R. Belmont]

Browse Source 
USE_NETWORK Ethernet emulation is now enabled by default as per the roadmap. [R. Belmont]
This commit is contained in:
arbee 2014-10-20 20:41:17 -04:00
parent 4c4f0d4ee5
commit b1efba0d14
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
makefile
View File

@ -262,8 +262,8 @@ BUILD_MIDILIB = 1
# uncomment next line to enable LTO (link-time optimizations) # uncomment next line to enable LTO (link-time optimizations)
# LTO = 1 # LTO = 1
# uncomment next line to enable networking # uncomment next line to disable networking
# USE_NETWORK = 1 # DONT_USE_NETWORK = 1
# uncomment to enable SSE2 optimized code and SSE2 code generation (implicitly enabled by 64-bit compilers) # uncomment to enable SSE2 optimized code and SSE2 code generation (implicitly enabled by 64-bit compilers)
# SSE2 = 1 # SSE2 = 1
@ -463,10 +463,12 @@ ifdef PROFILER
DEFS += -DMAME_PROFILER DEFS += -DMAME_PROFILER
endif endif
# define USE_NETWORK if we are a making network enabled build # dine USE_NETWORK if networking is enabled (not OS/2 and hasn't been disabled)
ifdef USE_NETWORK ifneq ($(TARGETOS),os2)
ifndef DONT_USE_NETWORK
DEFS += -DUSE_NETWORK DEFS += -DUSE_NETWORK
endif endif
endif
# need to ensure FLAC functions are statically linked # need to ensure FLAC functions are statically linked
ifeq ($(BUILD_FLAC),1) ifeq ($(BUILD_FLAC),1)

8
src/osd/sdl/sdl.mak
View File

@ -58,9 +58,6 @@ USE_DISPATCH_GL = 1
# There is no need to play with this option unless you are doing # There is no need to play with this option unless you are doing
# active development on sdlmame or SDL. # active development on sdlmame or SDL.
# uncomment the next line to compile and link against SDL2.0
# SDL_LIBVER = sdl2
# uncomment the next line to use couriersud's multi-keyboard patch for SDL 2.1? (this API was removed prior to the 2.0 release) # uncomment the next line to use couriersud's multi-keyboard patch for SDL 2.1? (this API was removed prior to the 2.0 release)
# SDL2_MULTIAPI = 1 # SDL2_MULTIAPI = 1
@ -86,6 +83,11 @@ SDL_FRAMEWORK_PATH = /Library/Frameworks/
OSDSRC = $(SRC)/osd OSDSRC = $(SRC)/osd
OSDOBJ = $(OBJ)/osd OSDOBJ = $(OBJ)/osd
# auto-select SDL2 for non-OS/2 builds now
ifneq ($(TARGETOS),os2)
SDL_LIBVER = sdl2
endif
ifndef NO_USE_QTDEBUG ifndef NO_USE_QTDEBUG
OBJDIRS += $(OSDOBJ)/modules/debugger/qt OBJDIRS += $(OSDOBJ)/modules/debugger/qt
endif endif