Merge pull request #591 from stuartcarnie/mame0170

osdmini: fixes build issues [Stuart Carnie]
This commit is contained in:
Miodrag Milanović 2016-01-30 07:50:33 +01:00
commit 1ec138b458
3 changed files with 4 additions and 3 deletions

View File

@ -79,6 +79,7 @@ project ("osd_" .. _OPTIONS["osd"])
MAME_DIR .. "src/osd/modules/sound/coreaudio_sound.cpp", MAME_DIR .. "src/osd/modules/sound/coreaudio_sound.cpp",
MAME_DIR .. "src/osd/modules/sound/sdl_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/none.cpp",
MAME_DIR .. "src/osd/modules/sound/xaudio2_sound.cpp",
} }
project ("ocore_" .. _OPTIONS["osd"]) project ("ocore_" .. _OPTIONS["osd"])

View File

@ -7,4 +7,6 @@ defines {
"USE_SDL", "USE_SDL",
"SDLMAME_NOASM=1", "SDLMAME_NOASM=1",
"USE_OPENGL=0", "USE_OPENGL=0",
"NO_USE_MIDI=1",
"USE_XAUDIO2=0",
} }

View File

@ -103,11 +103,9 @@ int osd_setenv(const char *name, const char *value, int overwrite)
//============================================================ //============================================================
// osd_subst_env // 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); *dst = (char *)osd_malloc_array(strlen(src) + 1);
if (*dst != nullptr) if (*dst != nullptr)
strcpy(*dst, src); strcpy(*dst, src);
return 0;
} }