summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author arbee <rb6502@users.noreply.github.com>2014-10-20 20:41:17 -0400
committer arbee <rb6502@users.noreply.github.com>2014-10-20 20:42:20 -0400
commitb1efba0d14e72bbc09367ba46c393049f880f68a (patch)
treeab29f0a261680d96757f73eec8f8a88ec928c499
parent4c4f0d4ee50f67880aea4c548ecff8273213d063 (diff)
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]
-rw-r--r--makefile10
-rw-r--r--src/osd/sdl/sdl.mak8
2 files changed, 11 insertions, 7 deletions
diff --git a/makefile b/makefile
index ce637da4c01..cf2e995dc24 100644
--- a/makefile
+++ b/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)
diff --git a/src/osd/sdl/sdl.mak b/src/osd/sdl/sdl.mak
index d4c06138821..fd7055f71ad 100644
--- a/src/osd/sdl/sdl.mak
+++ b/src/osd/sdl/sdl.mak
@@ -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