mirror of
https://github.com/holub/mame
synced 2025-06-05 20:33:45 +03:00
SDL: SDL2 is now the default except for OS/2 builds. [R. Belmont]
USE_NETWORK Ethernet emulation is now enabled by default as per the roadmap. [R. Belmont]
This commit is contained in:
parent
4c4f0d4ee5
commit
b1efba0d14
10
makefile
10
makefile
@ -262,8 +262,8 @@ BUILD_MIDILIB = 1
|
||||
# uncomment next line to enable LTO (link-time optimizations)
|
||||
# LTO = 1
|
||||
|
||||
# uncomment next line to enable networking
|
||||
# USE_NETWORK = 1
|
||||
# uncomment next line to disable networking
|
||||
# DONT_USE_NETWORK = 1
|
||||
|
||||
# uncomment to enable SSE2 optimized code and SSE2 code generation (implicitly enabled by 64-bit compilers)
|
||||
# SSE2 = 1
|
||||
@ -463,10 +463,12 @@ ifdef PROFILER
|
||||
DEFS += -DMAME_PROFILER
|
||||
endif
|
||||
|
||||
# define USE_NETWORK if we are a making network enabled build
|
||||
ifdef USE_NETWORK
|
||||
# dine USE_NETWORK if networking is enabled (not OS/2 and hasn't been disabled)
|
||||
ifneq ($(TARGETOS),os2)
|
||||
ifndef DONT_USE_NETWORK
|
||||
DEFS += -DUSE_NETWORK
|
||||
endif
|
||||
endif
|
||||
|
||||
# need to ensure FLAC functions are statically linked
|
||||
ifeq ($(BUILD_FLAC),1)
|
||||
|
@ -58,9 +58,6 @@ USE_DISPATCH_GL = 1
|
||||
# There is no need to play with this option unless you are doing
|
||||
# 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)
|
||||
# SDL2_MULTIAPI = 1
|
||||
|
||||
@ -86,6 +83,11 @@ SDL_FRAMEWORK_PATH = /Library/Frameworks/
|
||||
OSDSRC = $(SRC)/osd
|
||||
OSDOBJ = $(OBJ)/osd
|
||||
|
||||
# auto-select SDL2 for non-OS/2 builds now
|
||||
ifneq ($(TARGETOS),os2)
|
||||
SDL_LIBVER = sdl2
|
||||
endif
|
||||
|
||||
ifndef NO_USE_QTDEBUG
|
||||
OBJDIRS += $(OSDOBJ)/modules/debugger/qt
|
||||
endif
|
||||
|
Loading…
Reference in New Issue
Block a user