diff options
author | 2015-04-06 11:58:24 +0200 | |
---|---|---|
committer | 2015-04-06 11:58:24 +0200 | |
commit | abf7d057d26427b7839f3946b163163cabd261df (patch) | |
tree | 6d3128e3bd19e3252573caff7e625cd4ecc11338 /scripts/src | |
parent | f0b6bb5407d067d227acd21e7f357cd1100e7b00 (diff) |
Supported mingw-clang builds (nw)
Diffstat (limited to 'scripts/src')
-rw-r--r-- | scripts/src/osd/sdl.lua | 2 | ||||
-rw-r--r-- | scripts/src/osd/sdl_cfg.lua | 11 | ||||
-rw-r--r-- | scripts/src/osd/windows.lua | 2 | ||||
-rw-r--r-- | scripts/src/osd/windows_cfg.lua | 10 |
4 files changed, 15 insertions, 10 deletions
diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua index 578fb17608f..4dafe5462c6 100644 --- a/scripts/src/osd/sdl.lua +++ b/scripts/src/osd/sdl.lua @@ -53,7 +53,7 @@ function maintargetosdoptions(_target) } end - configuration { "mingw*" } + configuration { "mingw*-gcc" } linkoptions{ "-municode", } diff --git a/scripts/src/osd/sdl_cfg.lua b/scripts/src/osd/sdl_cfg.lua index aaf52e3e2cd..6114cc4727f 100644 --- a/scripts/src/osd/sdl_cfg.lua +++ b/scripts/src/osd/sdl_cfg.lua @@ -99,11 +99,12 @@ if BASE_TARGETOS=="unix" then end if _OPTIONS["targetos"]=="windows" then - defines { - "UNICODE", - "_UNICODE", - "main=utf8_main", - } + configuration { "mingw*-gcc or vs*" } + defines { + "UNICODE", + "_UNICODE", + "main=utf8_main", + } configuration { "Debug" } defines { diff --git a/scripts/src/osd/windows.lua b/scripts/src/osd/windows.lua index 470e621bbc1..c2277109db1 100644 --- a/scripts/src/osd/windows.lua +++ b/scripts/src/osd/windows.lua @@ -4,7 +4,7 @@ dofile("modules.lua") function maintargetosdoptions(_target) osdmodulestargetconf() - configuration { "mingw*" } + configuration { "mingw*-gcc" } linkoptions { "-municode", } diff --git a/scripts/src/osd/windows_cfg.lua b/scripts/src/osd/windows_cfg.lua index 082cdc432eb..94c1271ae1a 100644 --- a/scripts/src/osd/windows_cfg.lua +++ b/scripts/src/osd/windows_cfg.lua @@ -1,11 +1,15 @@ defines { - "UNICODE", - "_UNICODE", "OSD_WINDOWS", - "main=utf8_main", "_WIN32_WINNT=0x0501", } +configuration { "mingw*-gcc or vs*" } + defines { + "UNICODE", + "_UNICODE", + "main=utf8_main", + } + configuration { "Debug" } defines { "MALLOC_DEBUG", |