diff options
author | 2016-02-21 11:35:58 +0100 | |
---|---|---|
committer | 2016-02-21 11:35:58 +0100 | |
commit | b5daabda5495dea5c50e17961ecfed2ea8619d76 (patch) | |
tree | f192bedcd7939c68d40a75a1901239be7f52de07 /3rdparty/bx/scripts/genie.lua | |
parent | e57c90084c5d1dd9f6cdb0bbbf8782dc4f369cda (diff) | |
parent | c24b31a077c2103b27e4df67d3be825c0c7d379d (diff) |
Merge remote-tracking branch 'refs/remotes/mamedev/master'
Resolved Conflicts:
- src/osd/modules/render/d3d/d3dhlsl.cpp
Diffstat (limited to '3rdparty/bx/scripts/genie.lua')
-rw-r--r-- | 3rdparty/bx/scripts/genie.lua | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/3rdparty/bx/scripts/genie.lua b/3rdparty/bx/scripts/genie.lua index 2399a70ce3d..580e3d66157 100644 --- a/3rdparty/bx/scripts/genie.lua +++ b/3rdparty/bx/scripts/genie.lua @@ -58,17 +58,18 @@ project "bx.test" path.join(BX_DIR, "tests/**.H"), } - configuration { "vs*" } + configuration { "vs* or mingw*" } + links { + "psapi", + } configuration { "android*" } - kind "ConsoleApp" targetextension ".so" linkoptions { "-shared", } configuration { "nacl or nacl-arm" } - kind "ConsoleApp" targetextension ".nexe" links { "ppapi", @@ -76,7 +77,6 @@ project "bx.test" } configuration { "pnacl" } - kind "ConsoleApp" targetextension ".pexe" links { "ppapi", |