diff options
author | Miodrag Milanovic <mmicko@gmail.com> | 2015-03-29 19:10:46 +0200 |
---|---|---|
committer | Miodrag Milanovic <mmicko@gmail.com> | 2015-03-29 19:10:46 +0200 |
commit | befcf8a176c649f91a760419c64ab821f7380c36 (patch) | |
tree | 2704e45cb9b4261085cc6c4601627bbb2e956206 | |
parent | 28165887618417add2d95be2e823391f98613569 (diff) | |
parent | 08fd3f4ec65aa22328722f43facfa05a95ca28fb (diff) |
Merge branch 'master' of https://github.com/mamedev/mame
-rw-r--r-- | scripts/genie.lua | 7 | ||||
-rw-r--r-- | scripts/src/osd/sdl.lua | 2 | ||||
-rw-r--r-- | scripts/src/osd/sdl_cfg.lua | 1 | ||||
-rw-r--r-- | scripts/src/osd/windows.lua | 4 | ||||
-rw-r--r-- | scripts/src/osd/windows_cfg.lua | 1 |
5 files changed, 8 insertions, 7 deletions
diff --git a/scripts/genie.lua b/scripts/genie.lua index 3d4de308570..ad8076fc0ff 100644 --- a/scripts/genie.lua +++ b/scripts/genie.lua @@ -718,13 +718,9 @@ configuration { "osx*" } configuration { "mingw*" } - defines { - "main=utf8_main", - } linkoptions { "-static-libgcc", "-static-libstdc++", - "-municode", } if _OPTIONS["osd"]=="sdl" then links { @@ -752,9 +748,6 @@ end configuration { "vs*" } defines { - "main=utf8_main", - } - defines { "XML_STATIC", "WIN32", "_WIN32", diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua index ffe4080a6e4..e3ccd96d7b7 100644 --- a/scripts/src/osd/sdl.lua +++ b/scripts/src/osd/sdl.lua @@ -1,6 +1,7 @@ function maintargetosdoptions(_target) if _OPTIONS["targetos"]=="windows" then linkoptions{ + "-municode", "-L$(shell qmake -query QT_INSTALL_LIBS)", } @@ -28,6 +29,7 @@ function maintargetosdoptions(_target) configuration { } end + configuration { "mingw*" } linkoptions { "-Wl,--allow-multiple-definition", diff --git a/scripts/src/osd/sdl_cfg.lua b/scripts/src/osd/sdl_cfg.lua index e746dcf40df..600e19035b6 100644 --- a/scripts/src/osd/sdl_cfg.lua +++ b/scripts/src/osd/sdl_cfg.lua @@ -13,6 +13,7 @@ if _OPTIONS["targetos"]=="windows" then "USE_OPENGL=1", "USE_QTDEBUG=1", "SDLMAME_NET_PCAP", + "main=utf8_main", } buildoptions { diff --git a/scripts/src/osd/windows.lua b/scripts/src/osd/windows.lua index 6cdc4009b11..26b9b34826f 100644 --- a/scripts/src/osd/windows.lua +++ b/scripts/src/osd/windows.lua @@ -1,4 +1,8 @@ function maintargetosdoptions(_target) + linkoptions { + "-municode", + } + local rcfile = MAME_DIR .. "src/" .. _target .. "/osd/windows/" .. _target ..".rc" if os.isfile(rcfile) then diff --git a/scripts/src/osd/windows_cfg.lua b/scripts/src/osd/windows_cfg.lua index 90944ecbb4f..50775976b01 100644 --- a/scripts/src/osd/windows_cfg.lua +++ b/scripts/src/osd/windows_cfg.lua @@ -12,4 +12,5 @@ defines { "USE_DISPATCH_GL=1", "DIRECTINPUT_VERSION=0x0800", "SDLMAME_NET_PCAP", + "main=utf8_main", } |