diff options
author | 2015-04-01 12:02:13 +0200 | |
---|---|---|
committer | 2015-04-01 12:02:13 +0200 | |
commit | 627b7c61dcc3ab194b55a9d7e51e29fa43dbcf07 (patch) | |
tree | 58b3958d6598e44c061a083e890876012465e3a5 /scripts/src | |
parent | 9207811ed5b46039e8d5754ce7fa524eff214026 (diff) |
Ok shuffling done
Diffstat (limited to 'scripts/src')
-rw-r--r-- | scripts/src/osd/osdmini.lua | 2 | ||||
-rw-r--r-- | scripts/src/osd/sdl.lua | 8 | ||||
-rw-r--r-- | scripts/src/osd/sdl_cfg.lua | 6 | ||||
-rw-r--r-- | scripts/src/osd/windows.lua | 7 | ||||
-rw-r--r-- | scripts/src/osd/windows_cfg.lua | 10 |
5 files changed, 33 insertions, 0 deletions
diff --git a/scripts/src/osd/osdmini.lua b/scripts/src/osd/osdmini.lua index 652ecda2124..359308d19a9 100644 --- a/scripts/src/osd/osdmini.lua +++ b/scripts/src/osd/osdmini.lua @@ -30,6 +30,7 @@ project ("osd_" .. _OPTIONS["osd"]) } files { + MAME_DIR .. "src/osd/osdnet.c", MAME_DIR .. "src/osd/osdmini/minimain.c", MAME_DIR .. "src/osd/modules/lib/osdobj_common.c", MAME_DIR .. "src/osd/modules/font/font_sdl.c", @@ -87,6 +88,7 @@ project ("ocore_" .. _OPTIONS["osd"]) end files { + MAME_DIR .. "src/osd/osdcore.c", MAME_DIR .. "src/osd/modules/osdmodule.c", MAME_DIR .. "src/osd/osdmini/minidir.c", MAME_DIR .. "src/osd/osdmini/minifile.c", diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua index b69365b6bff..24c08f4de5a 100644 --- a/scripts/src/osd/sdl.lua +++ b/scripts/src/osd/sdl.lua @@ -43,6 +43,14 @@ function maintargetosdoptions(_target) end if _OPTIONS["targetos"]=="windows" then + configuration { "mingw*" } + linkoptions{ + "-municode", + } + configuration { "vs*" } + flags { + "Unicode", + } configuration { "x32", "vs*" } libdirs { path.join(_OPTIONS["SDL_INSTALL_ROOT"],"lib","x86") diff --git a/scripts/src/osd/sdl_cfg.lua b/scripts/src/osd/sdl_cfg.lua index 1aa5980f810..7f990ed31e6 100644 --- a/scripts/src/osd/sdl_cfg.lua +++ b/scripts/src/osd/sdl_cfg.lua @@ -99,6 +99,12 @@ if BASE_TARGETOS=="unix" then end if _OPTIONS["targetos"]=="windows" then + defines { + "UNICODE", + "_UNICODE", + "main=utf8_main", + } + configuration { "vs*" } includedirs { path.join(_OPTIONS["SDL_INSTALL_ROOT"],"include") diff --git a/scripts/src/osd/windows.lua b/scripts/src/osd/windows.lua index ac515a07cee..f372375b598 100644 --- a/scripts/src/osd/windows.lua +++ b/scripts/src/osd/windows.lua @@ -4,6 +4,13 @@ dofile("modules.lua") function maintargetosdoptions(_target) osdmodulestargetconf() + configuration { "mingw*" } + linkoptions { + "-municode", + } + + configuration { } + if _OPTIONS["DIRECTINPUT"] == "8" then links { "dinput8", diff --git a/scripts/src/osd/windows_cfg.lua b/scripts/src/osd/windows_cfg.lua index 01d33b60da4..8bbba52f8d6 100644 --- a/scripts/src/osd/windows_cfg.lua +++ b/scripts/src/osd/windows_cfg.lua @@ -1,9 +1,19 @@ defines { + "UNICODE", + "_UNICODE", "OSD_WINDOWS", "USE_SDL=0", + "main=utf8_main", "_WIN32_WINNT=0x0501", } +configuration { "vs*" } + flags { + "Unicode", + } + +configuration { } + if not _OPTIONS["DONT_USE_NETWORK"] then defines { "USE_NETWORK", |