From 42ffb726fa065a16206a355b9462f90ac2694f10 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Wed, 1 Apr 2015 10:57:03 +0200 Subject: [PATCH] uf reverting breaks mingw (nw) --- scripts/genie.lua | 5 ----- scripts/src/osd/sdl_cfg.lua | 6 ++++++ scripts/src/osd/windows_cfg.lua | 3 +++ 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/scripts/genie.lua b/scripts/genie.lua index b95d8a11c6b..2ea08108b7f 100644 --- a/scripts/genie.lua +++ b/scripts/genie.lua @@ -333,11 +333,6 @@ if _OPTIONS["targetos"]=="windows" then "X64_WINDOWS_ABI", } configuration { } - defines { - "UNICODE", - "_UNICODE", - "main=utf8_main", - } end -- Avoid error when invoking genie --help. 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_cfg.lua b/scripts/src/osd/windows_cfg.lua index 01d33b60da4..e123af16759 100644 --- a/scripts/src/osd/windows_cfg.lua +++ b/scripts/src/osd/windows_cfg.lua @@ -1,6 +1,9 @@ defines { + "UNICODE", + "_UNICODE", "OSD_WINDOWS", "USE_SDL=0", + "main=utf8_main", "_WIN32_WINNT=0x0501", }