From 110bc692fa80763f5dbd96cab2eb2c1182f12cfb Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Mon, 23 Jan 2017 19:12:47 +1100 Subject: portaudio needs COM (nw) --- scripts/src/3rdparty.lua | 4 ++-- scripts/src/osd/sdl.lua | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'scripts') 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*" } -- cgit v1.2.3 From 2d6477f8723eed9ad6830e5cc5e5dd02dd2588de Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Mon, 23 Jan 2017 19:37:51 +1100 Subject: This isn't behaving how I expect, investigate another time (nw) --- scripts/src/osd/sdl.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua index 2e14178b6ab..ec6863e7274 100644 --- a/scripts/src/osd/sdl.lua +++ b/scripts/src/osd/sdl.lua @@ -54,6 +54,7 @@ function maintargetosdoptions(_target,_subtarget) "SDL2", "Imm32", "Version", + "Ole32", "OleAut32", } configuration { "vs*" } @@ -91,7 +92,6 @@ function maintargetosdoptions(_target,_subtarget) } end links { - "Ole32", "psapi", } configuration { "mingw*" } @@ -114,6 +114,7 @@ function maintargetosdoptions(_target,_subtarget) targetprefix "sdl" links { "psapi" + "Ole32", } configuration { } -- cgit v1.2.3 From 192c09b374f445e380429cf399de2e20650c66ca Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Mon, 23 Jan 2017 19:42:19 +1100 Subject: comma (nw) --- scripts/src/osd/sdl.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua index ec6863e7274..5970f6d3334 100644 --- a/scripts/src/osd/sdl.lua +++ b/scripts/src/osd/sdl.lua @@ -113,7 +113,7 @@ function maintargetosdoptions(_target,_subtarget) configuration { "mingw*" or "vs*" } targetprefix "sdl" links { - "psapi" + "psapi", "Ole32", } configuration { } -- cgit v1.2.3