summaryrefslogtreecommitdiffstatshomepage
path: root/scripts/src
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/src')
-rw-r--r--scripts/src/main.lua22
-rw-r--r--scripts/src/osd/osdmini.lua7
-rw-r--r--scripts/src/osd/sdl.lua22
-rw-r--r--scripts/src/osd/windows.lua13
4 files changed, 50 insertions, 14 deletions
diff --git a/scripts/src/main.lua b/scripts/src/main.lua
index f7030d7ca82..059d086c00a 100644
--- a/scripts/src/main.lua
+++ b/scripts/src/main.lua
@@ -5,7 +5,7 @@ function mainProject(_target, _subtarget)
project (_target .. _subtarget)
end
uuid (os.uuid(_target .."_" .. _subtarget))
- kind "ConsoleApp"
+ kind "ConsoleApp"
options {
"ForceCPP",
@@ -27,21 +27,15 @@ function mainProject(_target, _subtarget)
"-sectcreate __TEXT __info_plist " .. GEN_DIR .. "/osd/sdl/" .. _OPTIONS["target"] .. "-Info.plist"
}
- configuration { "mingw*" }
+ configuration { "mingw*" or "vs*" }
if _OPTIONS["osd"]=="sdl" then
targetprefix "sdl"
end
targetextension ".exe"
-
- configuration { "vs*" }
- if _OPTIONS["osd"]=="sdl" then
- targetprefix "sdl"
- end
- targetextension ".exe"
-
+
configuration { "asmjs" }
targetextension ".bc"
-
+
configuration { }
targetdir(MAME_DIR)
@@ -76,7 +70,7 @@ function mainProject(_target, _subtarget)
"ocore_" .. _OPTIONS["osd"],
}
dofile("src/osd/" .. _OPTIONS["osd"] .. "_cfg.lua")
-
+
includedirs {
MAME_DIR .. "src/emu",
MAME_DIR .. "src/mame",
@@ -99,9 +93,9 @@ function mainProject(_target, _subtarget)
rcfile,
}
else
- files {
- MAME_DIR .. "src/osd/windows/mame.rc",
- }
+ files {
+ MAME_DIR .. "src/osd/windows/mame.rc",
+ }
end
end
diff --git a/scripts/src/osd/osdmini.lua b/scripts/src/osd/osdmini.lua
index c3db9d211c6..cd51f8cf1e6 100644
--- a/scripts/src/osd/osdmini.lua
+++ b/scripts/src/osd/osdmini.lua
@@ -1,3 +1,10 @@
+function includeosd()
+ includedirs {
+ MAME_DIR .. "src/osd",
+ }
+end
+
+
project ("osd_" .. _OPTIONS["osd"])
uuid (os.uuid("osd_" .. _OPTIONS["osd"]))
kind "StaticLib"
diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua
index fb7eae99383..ff49229d470 100644
--- a/scripts/src/osd/sdl.lua
+++ b/scripts/src/osd/sdl.lua
@@ -1,3 +1,25 @@
+function includeosd()
+ includedirs {
+ MAME_DIR .. "src/osd",
+ MAME_DIR .. "src/osd/sdl",
+ }
+end
+
+
+forcedincludes {
+ MAME_DIR .. "src/osd/sdl/sdlprefix.h"
+}
+
+
+configuration { "mingw*" }
+ linkoptions {
+ "-Wl,--allow-multiple-definition",
+ "-static"
+ }
+
+configuration { }
+
+
project ("osd_" .. _OPTIONS["osd"])
uuid (os.uuid("osd_" .. _OPTIONS["osd"]))
kind "StaticLib"
diff --git a/scripts/src/osd/windows.lua b/scripts/src/osd/windows.lua
index 1cc64c2eae9..9a786632f6a 100644
--- a/scripts/src/osd/windows.lua
+++ b/scripts/src/osd/windows.lua
@@ -1,3 +1,16 @@
+function includeosd()
+ includedirs {
+ MAME_DIR .. "src/osd",
+ MAME_DIR .. "src/osd/windows",
+ }
+end
+
+
+forcedincludes {
+ MAME_DIR .. "src/osd/windows/winprefix.h"
+}
+
+
project ("osd_" .. _OPTIONS["osd"])
uuid (os.uuid("osd_" .. _OPTIONS["osd"]))
kind "StaticLib"