summaryrefslogtreecommitdiffstatshomepage
path: root/scripts/src
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2017-01-23 19:12:47 +1100
committer Vas Crabb <vas@vastheman.com>2017-01-23 19:12:47 +1100
commit110bc692fa80763f5dbd96cab2eb2c1182f12cfb (patch)
tree842a59bddc8d2fad1f723a6098254392af67e134 /scripts/src
parentebc23dacaf43d9cc81a5e2780f09ffbcddba3b23 (diff)
portaudio needs COM (nw)
Diffstat (limited to 'scripts/src')
-rw-r--r--scripts/src/3rdparty.lua4
-rw-r--r--scripts/src/osd/sdl.lua2
2 files changed, 3 insertions, 3 deletions
diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua
index 2cb7a145b91..e5b64df3ac0 100644
--- a/scripts/src/3rdparty.lua
+++ b/scripts/src/3rdparty.lua
@@ -917,14 +917,14 @@ project "portaudio"
"/wd4189", -- warning C4189: 'xxx' : local variable is initialized but not referenced
"/wd4127", -- warning C4127: conditional expression is constant
}
- if _OPTIONS["vs"]=="intel-15" then
+ if _OPTIONS["vs"]=="intel-15" then
buildoptions {
"/Qwd869", -- remark #869: parameter "xxx" was never referenced
"/Qwd1478", -- warning #1478: function "xxx" (declared at line yyy of "zzz") was declared deprecated
"/Qwd2544", -- message #2544: empty dependent statement in if-statement
"/Qwd1879", -- warning #1879: unimplemented pragma ignored
}
- end
+ end
configuration { "vs2015*" }
buildoptions {
"/wd4456", -- warning C4456: declaration of 'xxx' hides previous local declaration
diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua
index af6ff1b98ce..2e14178b6ab 100644
--- a/scripts/src/osd/sdl.lua
+++ b/scripts/src/osd/sdl.lua
@@ -54,7 +54,6 @@ function maintargetosdoptions(_target,_subtarget)
"SDL2",
"Imm32",
"Version",
- "Ole32",
"OleAut32",
}
configuration { "vs*" }
@@ -92,6 +91,7 @@ function maintargetosdoptions(_target,_subtarget)
}
end
links {
+ "Ole32",
"psapi",
}
configuration { "mingw*" }