summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2015-04-04 15:36:44 +0200
committer Miodrag Milanovic <mmicko@gmail.com>2015-04-04 15:36:44 +0200
commited0de1632e858992a13aa3f5ba984a7aa5d16b76 (patch)
treef62e606cbcb0c44fd544af0d5b03dac640250d70
parent4788c3222db2446366cbc65221487efe592df3a4 (diff)
Moved plist generate to lua (nw)
-rw-r--r--makefile7
-rw-r--r--scripts/src/main.lua9
2 files changed, 9 insertions, 7 deletions
diff --git a/makefile b/makefile
index 94d6115053e..5dfcafb8023 100644
--- a/makefile
+++ b/makefile
@@ -859,17 +859,12 @@ generate: \
$(GENIE) \
$(GEN_FOLDERS) \
$(patsubst $(SRC)/%.lay,$(GENDIR)/%.lh,$(LAYOUTS)) \
- $(patsubst $(SRC)/%.h,$(GENDIR)/%.moc.c,$(MOC_FILES)) \
- $(GENDIR)/resource/$(TARGET)-Info.plist
+ $(patsubst $(SRC)/%.h,$(GENDIR)/%.moc.c,$(MOC_FILES))
$(GENDIR)/%.lh: $(SRC)/%.lay $(SRC)/build/file2str.py
@echo Converting $<...
$(PYTHON) $(SRC)/build/file2str.py $< $@ layout_$(basename $(notdir $<))
-$(GENDIR)/resource/$(TARGET)-Info.plist: $(SRC)/build/verinfo.py $(SRC)/version.c
- @echo Emitting $@...
- $(PYTHON) $(SRC)/build/verinfo.py -p -b $(TARGET) $(SRC)/version.c > $@
-
$(GENDIR)/%.moc.c: $(SRC)/%.h
$(SILENT) $(MOC) $(MOCINCPATH) $< -o $@
diff --git a/scripts/src/main.lua b/scripts/src/main.lua
index b4a247dc88b..f4c4e4a01c7 100644
--- a/scripts/src/main.lua
+++ b/scripts/src/main.lua
@@ -81,8 +81,15 @@ function mainProject(_target, _subtarget)
if _OPTIONS["targetos"]=="macosx" then
linkoptions {
- "-sectcreate __TEXT __info_plist " .. GEN_DIR .. "/resource/" .. _OPTIONS["target"] .. "-Info.plist"
+ "-sectcreate __TEXT __info_plist " .. GEN_DIR .. "/resource/" .. _target .. "-Info.plist"
}
+ custombuildtask {
+ { MAME_DIR .. "src/version.c" , GEN_DIR .. "/resource/" .. _target .. "-Info.plist", { MAME_DIR .. "src/build/verinfo.py" }, {"@echo Emitting " .. _target .. "-Info.plist" .. "...", "python $(1) -p -b " .. _target .. " $(<) > $(@)" }},
+ }
+ dependency {
+ { "$(TARGET)" , GEN_DIR .. "/resource/" .. _target .. "-Info.plist", true },
+ }
+
end
if _OPTIONS["targetos"]=="windows" then