diff options
author | 2019-03-25 22:44:58 +0100 | |
---|---|---|
committer | 2019-03-25 22:44:58 +0100 | |
commit | c24473ddff715ecec2e258a6eb38960cf8c8e98e (patch) | |
tree | 8ea44b6396a6129913c0aac13859b5de9965e972 /scripts/src/osd/sdl.lua | |
parent | 009cba4fb8102102168ef32870892438327f3705 (diff) | |
parent | 598cd5227223c3b04ca31f0dbc1981256d9ea3ff (diff) |
conflict resolution (nw)
Diffstat (limited to 'scripts/src/osd/sdl.lua')
-rw-r--r-- | scripts/src/osd/sdl.lua | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua index 9ef57e0ba7c..c9a63dcb24e 100644 --- a/scripts/src/osd/sdl.lua +++ b/scripts/src/osd/sdl.lua @@ -52,16 +52,16 @@ function maintargetosdoptions(_target,_subtarget) configuration { "mingw*"} links { "SDL2", - "Imm32", - "Version", - "Ole32", - "OleAut32", + "imm32", + "version", + "ole32", + "oleaut32", } configuration { "vs*" } links { "SDL2", - "Imm32", - "Version", + "imm32", + "version", } configuration { } else @@ -74,8 +74,8 @@ function maintargetosdoptions(_target,_subtarget) configuration { "vs*" } links { "SDL2", - "Imm32", - "Version", + "imm32", + "version", } configuration { } else @@ -91,11 +91,11 @@ function maintargetosdoptions(_target,_subtarget) libdirs { path.join(_OPTIONS["SDL_INSTALL_ROOT"],"lib","x64") } + configuration { } end links { "psapi", } - configuration {} elseif _OPTIONS["targetos"]=="haiku" then links { "network", @@ -107,7 +107,7 @@ function maintargetosdoptions(_target,_subtarget) targetprefix "sdl" links { "psapi", - "Ole32", + "ole32", } configuration { } |