From 048fd105db8dec41dd3340555d27b2288a32e51f Mon Sep 17 00:00:00 2001 From: Stuart Carnie Date: Fri, 29 Jan 2016 22:41:21 -0700 Subject: [PATCH] osdmini: fixes build issues --- scripts/src/osd/osdmini.lua | 1 + scripts/src/osd/osdmini_cfg.lua | 2 ++ src/osd/osdmini/minimisc.cpp | 4 +--- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/src/osd/osdmini.lua b/scripts/src/osd/osdmini.lua index 803b7413014..0795ccdb4bd 100644 --- a/scripts/src/osd/osdmini.lua +++ b/scripts/src/osd/osdmini.lua @@ -79,6 +79,7 @@ project ("osd_" .. _OPTIONS["osd"]) MAME_DIR .. "src/osd/modules/sound/coreaudio_sound.cpp", MAME_DIR .. "src/osd/modules/sound/sdl_sound.cpp", MAME_DIR .. "src/osd/modules/sound/none.cpp", + MAME_DIR .. "src/osd/modules/sound/xaudio2_sound.cpp", } project ("ocore_" .. _OPTIONS["osd"]) diff --git a/scripts/src/osd/osdmini_cfg.lua b/scripts/src/osd/osdmini_cfg.lua index ff9539066b2..586075d3cac 100644 --- a/scripts/src/osd/osdmini_cfg.lua +++ b/scripts/src/osd/osdmini_cfg.lua @@ -7,4 +7,6 @@ defines { "USE_SDL", "SDLMAME_NOASM=1", "USE_OPENGL=0", + "NO_USE_MIDI=1", + "USE_XAUDIO2=0", } diff --git a/src/osd/osdmini/minimisc.cpp b/src/osd/osdmini/minimisc.cpp index 2bf613b0b7c..9891447359b 100644 --- a/src/osd/osdmini/minimisc.cpp +++ b/src/osd/osdmini/minimisc.cpp @@ -103,11 +103,9 @@ int osd_setenv(const char *name, const char *value, int overwrite) //============================================================ // osd_subst_env //============================================================ -int osd_subst_env(char **dst, const char *src) +void osd_subst_env(char **dst, const char *src) { *dst = (char *)osd_malloc_array(strlen(src) + 1); if (*dst != nullptr) strcpy(*dst, src); - - return 0; }