diff options
author | couriersud <couriersud@arcor.de> | 2015-02-02 01:59:04 +0100 |
---|---|---|
committer | couriersud <couriersud@arcor.de> | 2015-02-02 01:59:04 +0100 |
commit | ec0dbc3fed5ed569397f028f564226a71266dc08 (patch) | |
tree | e64f8670fee084a535c3eba37286ca53f78bb40b | |
parent | b4ce26e27c7df801b70b06a49c1b6352fb8c8861 (diff) |
Add a netdev provider "none" as a fallback doing nothing.
-rw-r--r-- | src/osd/modules/lib/osdobj_common.c | 1 | ||||
-rw-r--r-- | src/osd/modules/netdev/none.c | 18 | ||||
-rw-r--r-- | src/osd/sdl/sdl.mak | 6 | ||||
-rw-r--r-- | src/osd/windows/windows.mak | 1 |
4 files changed, 23 insertions, 3 deletions
diff --git a/src/osd/modules/lib/osdobj_common.c b/src/osd/modules/lib/osdobj_common.c index 3a8444c04cc..32b1f355b89 100644 --- a/src/osd/modules/lib/osdobj_common.c +++ b/src/osd/modules/lib/osdobj_common.c @@ -130,6 +130,7 @@ void osd_common_t::register_options() REGISTER_MODULE(m_mod_man, NETDEV_TAPTUN); REGISTER_MODULE(m_mod_man, NETDEV_PCAP); + REGISTER_MODULE(m_mod_man, NETDEV_NONE); REGISTER_MODULE(m_mod_man, MIDI_PM); REGISTER_MODULE(m_mod_man, MIDI_NONE); diff --git a/src/osd/modules/netdev/none.c b/src/osd/modules/netdev/none.c new file mode 100644 index 00000000000..6cf31052d68 --- /dev/null +++ b/src/osd/modules/netdev/none.c @@ -0,0 +1,18 @@ +/* + * none.c + * + */ + +#include "netdev_module.h" +#include "modules/osdmodule.h" + +class netdev_none : public osd_module, public netdev_module +{ +public: + netdev_none() + : osd_module(OSD_NETDEV_PROVIDER, "none"), netdev_module() + { + } +}; + +MODULE_DEFINITION(NETDEV_NONE, netdev_none) diff --git a/src/osd/sdl/sdl.mak b/src/osd/sdl/sdl.mak index c974e73f025..b208adca5df 100644 --- a/src/osd/sdl/sdl.mak +++ b/src/osd/sdl/sdl.mak @@ -81,7 +81,6 @@ SDL_FRAMEWORK_PATH = /Library/Frameworks/ # SDL_LIBVER = sdl # uncomment to use BGFX - # USE_BGFX = 1 ########################################################################### @@ -344,8 +343,8 @@ SDL_NETWORK = pcap INCPATH += -I$(3RDPARTY)/winpcap/Include # enable UNICODE -DEFS += -Dmain=utf8_main -DUNICODE -D_UNICODE -LDFLAGS += -municode +DEFS += -Dmain=utf8_main -DUNICODE -D_UNICODE +LDFLAGS += -municode # Qt ifndef NO_USE_QTDEBUG @@ -451,6 +450,7 @@ OSDOBJS = \ $(OSDOBJ)/modules/font/font_none.o \ $(OSDOBJ)/modules/netdev/taptun.o \ $(OSDOBJ)/modules/netdev/pcap.o \ + $(OSDOBJ)/modules/netdev/none.o \ $(OSDOBJ)/modules/midi/portmidi.o \ $(OSDOBJ)/modules/midi/none.o \ diff --git a/src/osd/windows/windows.mak b/src/osd/windows/windows.mak index 33691806213..eac9bdbdeb7 100644 --- a/src/osd/windows/windows.mak +++ b/src/osd/windows/windows.mak @@ -392,6 +392,7 @@ OSDOBJS = \ $(OSDOBJ)/modules/font/font_none.o \ $(OSDOBJ)/modules/netdev/pcap.o \ $(OSDOBJ)/modules/netdev/taptun.o \ + $(OSDOBJ)/modules/netdev/none.o \ ifdef USE_SDL DEFS += -DUSE_SDL_SOUND |