summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2016-08-27 15:46:22 +1000
committer Vas Crabb <vas@vastheman.com>2016-08-27 15:46:22 +1000
commiteff28a88cd200be94564dc2fc950d901224de62a (patch)
tree0200b80ebb417932e1f017d0b85420d20709173d
parentbe637e1af8a4e41d5a5c841b73aa2915f967d91e (diff)
Proper fix for making zlib visible to vgmplay
-rw-r--r--scripts/target/mame/virtual.lua12
-rw-r--r--src/mame/drivers/vgmplay.cpp4
2 files changed, 8 insertions, 8 deletions
diff --git a/scripts/target/mame/virtual.lua b/scripts/target/mame/virtual.lua
index 7cc49adb149..a5d04d8f370 100644
--- a/scripts/target/mame/virtual.lua
+++ b/scripts/target/mame/virtual.lua
@@ -69,11 +69,15 @@ function createVirtualProjects(_target, _subtarget, _name)
MAME_DIR .. "src/lib/netlist",
MAME_DIR .. "3rdparty",
}
+
+ includedirs {
+ ext_includedir("zlib"),
+ }
end
function createProjects_mame_virtual(_target, _subtarget)
-createVirtualProjects(_target, _subtarget, "virtual")
-files {
- MAME_DIR .. "src/mame/drivers/vgmplay.cpp",
-}
+ createVirtualProjects(_target, _subtarget, "virtual")
+ files {
+ MAME_DIR .. "src/mame/drivers/vgmplay.cpp",
+ }
end
diff --git a/src/mame/drivers/vgmplay.cpp b/src/mame/drivers/vgmplay.cpp
index 52d605f9729..61d639e87c5 100644
--- a/src/mame/drivers/vgmplay.cpp
+++ b/src/mame/drivers/vgmplay.cpp
@@ -4,11 +4,7 @@
// A "virtual" driver to play vgm files
// Use with mame vgmplay -bitb file.vgm
-#if defined(_MSC_VER)
-#include "zlib/zlib.h"
-#else
#include <zlib.h>
-#endif
#include "emu.h"
#include "debugger.h"