summaryrefslogtreecommitdiffstats
path: root/scripts/genie.lua
diff options
context:
space:
mode:
author Robbbert <Robbbert@users.noreply.github.com>2020-06-23 19:48:01 +1000
committer Robbbert <Robbbert@users.noreply.github.com>2020-06-23 19:48:01 +1000
commit60761a0d8171ce971e62566a7ffe9f77c200881f (patch)
tree3db2436ce33bdd8373c3c6b489e8042d4a1b2ec8 /scripts/genie.lua
parentfeda349b3eea19d4fd0010a74e2dd6ff30f26b16 (diff)
parentd1362259ee3a0791689ef2a754f5b730a9afcd6e (diff)
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'scripts/genie.lua')
-rw-r--r--scripts/genie.lua13
1 files changed, 8 insertions, 5 deletions
diff --git a/scripts/genie.lua b/scripts/genie.lua
index 19c892d6c65..0255815e367 100644
--- a/scripts/genie.lua
+++ b/scripts/genie.lua
@@ -1269,15 +1269,18 @@ configuration { "osx* or xcode4" }
}
configuration { "mingw*" }
- if _OPTIONS["osd"]~="sdl"
- then
+ if _OPTIONS["osd"]=="sdl" then
+ linkoptions {
+ "-Wl,--start-group",
+ }
+ else
linkoptions {
"-static",
}
+ flags {
+ "LinkSupportCircularDependencies",
+ }
end
- flags {
- "LinkSupportCircularDependencies",
- }
links {
"user32",
"winmm",