From 4568aca1459a012e21ac95de6382d907e6f000db Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Mon, 16 Feb 2015 19:06:29 +0100 Subject: Fixed osdmini compile (nw) --- src/osd/modules/sound/sdl_sound.c | 2 +- src/osd/osdmini/osdmini.mak | 28 +++++++++++++++++++++++++--- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/src/osd/modules/sound/sdl_sound.c b/src/osd/modules/sound/sdl_sound.c index 3376d57719e..ba1e842f4a9 100644 --- a/src/osd/modules/sound/sdl_sound.c +++ b/src/osd/modules/sound/sdl_sound.c @@ -12,7 +12,7 @@ #include "sound_module.h" #include "modules/osdmodule.h" -#if (!defined(OSD_WINDOWS) || defined(USE_SDL_SOUND)) +#if (defined(OSD_SDL) || defined(USE_SDL_SOUND)) // standard sdl header #include "../../sdl/sdlinc.h" diff --git a/src/osd/osdmini/osdmini.mak b/src/osd/osdmini/osdmini.mak index 4ce98edbcd0..58a4d348778 100644 --- a/src/osd/osdmini/osdmini.mak +++ b/src/osd/osdmini/osdmini.mak @@ -39,7 +39,8 @@ # add a define identifying the target osd DEFS += -DOSD_MINI - +DEFS += -DUSE_QTDEBUG=0 +DEFS += -DUSE_SDL=0 #------------------------------------------------- # object and source roots #------------------------------------------------- @@ -53,7 +54,10 @@ OSDOBJ = $(OBJ)/osd OBJDIRS += $(MINIOBJ) \ $(OSDOBJ)/modules/sync \ $(OSDOBJ)/modules/lib \ - $(OSDOBJ)/modules/midi + $(OSDOBJ)/modules/sound \ + $(OSDOBJ)/modules/midi \ + $(OSDOBJ)/modules/font \ + $(OSDOBJ)/modules/netdev #------------------------------------------------- # OSD core library @@ -65,6 +69,8 @@ OSDCOREOBJS = \ $(MINIOBJ)/minimisc.o \ $(MINIOBJ)/minisync.o \ $(MINIOBJ)/minitime.o \ + $(OSDOBJ)/modules/sync/work_mini.o \ + $(OSDOBJ)/modules/osdmodule.o \ #------------------------------------------------- # OSD mini library @@ -72,9 +78,25 @@ OSDCOREOBJS = \ OSDOBJS = \ $(MINIOBJ)/minimain.o \ - $(OSDOBJ)/modules/sync/work_mini.o \ $(OSDOBJ)/modules/lib/osdobj_common.o \ + $(OSDOBJ)/modules/midi/portmidi.o \ $(OSDOBJ)/modules/midi/none.o \ + $(OSDOBJ)/modules/lib/osdobj_common.o \ + $(OSDOBJ)/modules/sound/js_sound.o \ + $(OSDOBJ)/modules/sound/direct_sound.o \ + $(OSDOBJ)/modules/sound/sdl_sound.o \ + $(OSDOBJ)/modules/sound/none.o \ + $(OSDOBJ)/modules/font/font_sdl.o \ + $(OSDOBJ)/modules/font/font_windows.o \ + $(OSDOBJ)/modules/font/font_osx.o \ + $(OSDOBJ)/modules/font/font_none.o \ + $(OSDOBJ)/modules/netdev/pcap.o \ + $(OSDOBJ)/modules/netdev/taptun.o \ + $(OSDOBJ)/modules/netdev/none.o \ + $(OSDOBJ)/modules/debugger/debugwin.o \ + $(OSDOBJ)/modules/debugger/debugint.o \ + $(OSDOBJ)/modules/debugger/debugqt.o \ + $(OSDOBJ)/modules/debugger/none.o \ ifeq ($(OS),Windows_NT) LIBS += -lwinmm -lwsock32 -- cgit v1.2.3