summaryrefslogtreecommitdiffstatshomepage
path: root/scripts/src/osd/sdl.lua
diff options
context:
space:
mode:
author andreasnaive <andreasnaive@gmail.com>2019-03-25 23:13:40 +0100
committer andreasnaive <andreasnaive@gmail.com>2019-03-25 23:13:40 +0100
commitb380514764cf857469bae61c11143a19f79a74c5 (patch)
tree63c8012e262618f08a332da31dd714281aa2c5ed /scripts/src/osd/sdl.lua
parentc24473ddff715ecec2e258a6eb38960cf8c8e98e (diff)
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'scripts/src/osd/sdl.lua')
-rw-r--r--scripts/src/osd/sdl.lua20
1 files changed, 10 insertions, 10 deletions
diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua
index c9a63dcb24e..9ef57e0ba7c 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 { }