summaryrefslogtreecommitdiffstatshomepage
path: root/scripts/src
diff options
context:
space:
mode:
author couriersud <couriersud@gmx.org>2017-02-09 00:03:00 +0100
committer couriersud <couriersud@gmx.org>2017-02-10 21:53:01 +0100
commit9a71daa2e000abd0f07f1b43b848124c81958005 (patch)
treeb2be98c1ed3d455b44097bd5f254254cd12bdcf7 /scripts/src
parentab17457707eaab1ec5d3f4719704ccd25a235651 (diff)
Make windows builds of nltool and nlwav understand unicode.
nltool and nlwav now use wmain, i.e. UNICODE main on windows. (nw)
Diffstat (limited to 'scripts/src')
-rw-r--r--scripts/src/netlist.lua17
-rw-r--r--scripts/src/tools.lua23
2 files changed, 31 insertions, 9 deletions
diff --git a/scripts/src/netlist.lua b/scripts/src/netlist.lua
index 66387c572df..4caa895091a 100644
--- a/scripts/src/netlist.lua
+++ b/scripts/src/netlist.lua
@@ -13,18 +13,25 @@ project "netlist"
uuid "665ef8ac-2a4c-4c3e-a05f-fd1e5db11de9"
kind (LIBTYPE)
+ if _OPTIONS["targetos"]=="windows" then
+ configuration { "mingw* or vs*" }
+ defines {
+ "UNICODE",
+ "_UNICODE",
+ "_WIN32_WINNT=0x0501",
+ "WIN32_LEAN_AND_MEAN",
+ "NOMINMAX",
+ }
+ end
+
addprojectflags()
-
defines {
"__STDC_CONSTANT_MACROS",
}
includedirs {
MAME_DIR .. "src/lib",
- -- MAME_DIR .. "src/osd",
- -- MAME_DIR .. "src/lib/util",
- -- ext_includedir("expat"),
}
files {
@@ -55,6 +62,8 @@ project "netlist"
MAME_DIR .. "src/lib/netlist/plib/plists.h",
MAME_DIR .. "src/lib/netlist/plib/pdynlib.cpp",
MAME_DIR .. "src/lib/netlist/plib/pdynlib.h",
+ MAME_DIR .. "src/lib/netlist/plib/pmain.cpp",
+ MAME_DIR .. "src/lib/netlist/plib/pmain.h",
MAME_DIR .. "src/lib/netlist/plib/poptions.cpp",
MAME_DIR .. "src/lib/netlist/plib/poptions.h",
MAME_DIR .. "src/lib/netlist/plib/pparser.cpp",
diff --git a/scripts/src/tools.lua b/scripts/src/tools.lua
index fa1b5740d5f..46871c24201 100644
--- a/scripts/src/tools.lua
+++ b/scripts/src/tools.lua
@@ -516,6 +516,15 @@ files {
MAME_DIR .. "src/lib/netlist/prg/nltool.cpp",
}
+configuration { "mingw*" }
+ linkoptions{
+ "-municode",
+ }
+configuration { "vs*" }
+ flags {
+ "Unicode",
+ }
+
configuration { "mingw*" or "vs*" }
targetextension ".exe"
@@ -540,22 +549,26 @@ if _OPTIONS["SEPARATE_BIN"]~="1" then
end
links {
--- "utils",
--- "ocore_" .. _OPTIONS["osd"],
"netlist",
}
includedirs {
--- MAME_DIR .. "src/osd",
--- MAME_DIR .. "src/lib/util",
MAME_DIR .. "src/lib",
}
files {
MAME_DIR .. "src/lib/netlist/prg/nlwav.cpp",
--- MAME_DIR .. "src/emu/emucore.cpp",
}
+configuration { "mingw*" }
+ linkoptions{
+ "-municode",
+ }
+configuration { "vs*" }
+ flags {
+ "Unicode",
+ }
+
configuration { "mingw*" or "vs*" }
targetextension ".exe"