From 4303fbc35c901868d3da2b9a7b994091b82c3557 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Sat, 28 Mar 2015 16:20:04 +1100 Subject: [PATCH] Put some OSD libs back in main GENie file to fix WinSDL build for now --- scripts/genie.lua | 10 ++++++++++ scripts/src/osd/sdl.lua | 8 -------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/scripts/genie.lua b/scripts/genie.lua index ddf04d50eb7..c179e5b5392 100644 --- a/scripts/genie.lua +++ b/scripts/genie.lua @@ -678,6 +678,16 @@ configuration { "mingw*" } "-static-libstdc++", "-municode", } +if _OPTIONS["osd"]=="sdl" then + links { + "opengl32", + "SDL2", + "Imm32", + "version", + "ole32", + "oleaut32", + } +end links { "user32", "gdi32", diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua index 6300a1932c2..ff49229d470 100644 --- a/scripts/src/osd/sdl.lua +++ b/scripts/src/osd/sdl.lua @@ -16,14 +16,6 @@ configuration { "mingw*" } "-Wl,--allow-multiple-definition", "-static" } - links { - "opengl32", - "SDL2", - "Imm32", - "version", - "ole32", - "oleaut32", - } configuration { }