Previous 199869 Revisions Next

r36934 Saturday 4th April, 2015 at 14:42:58 UTC by Miodrag Milanović
Moved MOC handling in lua (nw)
[/trunk]makefile
[scripts/src/osd]modules.lua

trunk/makefile
r245445r245446
471471   scripts/src/bus.lua \
472472   scripts/src/netlist.lua \
473473   scripts/toolchain.lua \
474   scripts/src/osd/modules.lua \
474475   scripts/target/$(TARGET)/$(SUBTARGET).lua \
475476   $(wildcard src/osd/$(OSD)/$(OSD).mak) \
476477   $(wildcard src/$(TARGET)/$(SUBTARGET).mak)
r245445r245446
797798   -@rm -rf build
798799   $(SILENT) $(MAKE) $(MAKEPARAMS) -C 3rdparty/genie/build/gmake.$(GENIEOS) -f genie.make clean
799800
800GEN_FOLDERS :=  \
801   $(GENDIR)/$(TARGET)/layout/ \
802   $(GENDIR)/osd/modules/debugger/qt/
801GEN_FOLDERS := $(GENDIR)/$(TARGET)/layout/
803802
804803LAYOUTS=$(wildcard $(SRC)/$(TARGET)/layout/*.lay)
805804
806MOC_FILES=$(wildcard $(SRC)/osd/modules/debugger/qt/*.h)
807ifneq ($(USE_QTDEBUG),1)
808ifeq ($(TARGETOS),macosx)
809MOC_FILES=
810endif
811ifeq ($(TARGETOS),solaris)
812MOC_FILES=
813endif
814ifeq ($(TARGETOS),haiku)
815MOC_FILES=
816endif
817ifeq ($(TARGETOS),emscripten)
818MOC_FILES=
819endif
820ifeq ($(TARGETOS),os2)
821MOC_FILES=
822endif
823endif
824
825ifeq ($(OS),windows)
826MOC = moc
827else
828MOCTST = $(shell which moc-qt4 2>/dev/null)
829ifeq '$(MOCTST)' ''
830MOCTST = $(shell which moc 2>/dev/null)
831ifeq '$(MOCTST)' ''
832ifneq '$(MOC_FILES)' ''
833$(error Qt's Meta Object Compiler (moc) wasn't found!)
834endif
835else
836MOC = $(MOCTST)
837endif
838else
839MOC = $(MOCTST)
840endif
841endif
842
843
844805ifneq (,$(wildcard src/osd/$(OSD)/$(OSD).mak))
845806include src/osd/$(OSD)/$(OSD).mak
846807endif
r245445r245446
855816generate: \
856817      $(GENIE) \
857818      $(GEN_FOLDERS) \
858      $(patsubst $(SRC)/%.lay,$(GENDIR)/%.lh,$(LAYOUTS)) \
859      $(patsubst $(SRC)/%.h,$(GENDIR)/%.moc.c,$(MOC_FILES))
819      $(patsubst $(SRC)/%.lay,$(GENDIR)/%.lh,$(LAYOUTS))
860820
861821$(GENDIR)/%.lh: $(SRC)/%.lay $(SRC)/build/file2str.py
862822   @echo Converting $<...
863823   $(PYTHON) $(SRC)/build/file2str.py $< $@ layout_$(basename $(notdir $<))
864824
865$(GENDIR)/%.moc.c: $(SRC)/%.h
866   $(SILENT) $(MOC) $(MOCINCPATH) $< -o $@
867   
trunk/scripts/src/osd/modules.lua
r245445r245446
9999      defines {
100100         "USE_QTDEBUG=1",
101101      }
102     
103      local MOC = ""
104      if (os.is("windows")) then
105         print("windows")
106         MOC = "moc"
107      else
108         MOCTST = backtick("which moc-qt4 2>/dev/null")         
109         if (MOCTST=='') then
110            MOCTST = backtick("which moc 2>/dev/null")
111         end
112         if (MOCTST=='') then
113            print("Qt's Meta Object Compiler (moc) wasn't found!")
114            os.exit(1)
115         end   
116         MOC = MOCTST
117      end
118     
119     
120      custombuildtask {
121         { MAME_DIR .. "src/osd/modules/debugger/qt/debuggerview.h",          GEN_DIR .. "osd/modules/debugger/qt/debuggerview.moc.c", { },         { MOC .. "$(MOCINCPATH) $(<) -o $(@)" }},
122         { MAME_DIR .. "src/osd/modules/debugger/qt/windowqt.h",             GEN_DIR .. "osd/modules/debugger/qt/windowqt.moc.c", { },             { MOC .. "$(MOCINCPATH) $(<) -o $(@)" }},
123         { MAME_DIR .. "src/osd/modules/debugger/qt/logwindow.h",             GEN_DIR .. "osd/modules/debugger/qt/logwindow.moc.c", { },             { MOC .. "$(MOCINCPATH) $(<) -o $(@)" }},
124         { MAME_DIR .. "src/osd/modules/debugger/qt/dasmwindow.h",             GEN_DIR .. "osd/modules/debugger/qt/dasmwindow.moc.c", { },          { MOC .. "$(MOCINCPATH) $(<) -o $(@)" }},
125         { MAME_DIR .. "src/osd/modules/debugger/qt/mainwindow.h",             GEN_DIR .. "osd/modules/debugger/qt/mainwindow.moc.c", { },          { MOC .. "$(MOCINCPATH) $(<) -o $(@)" }},
126         { MAME_DIR .. "src/osd/modules/debugger/qt/memorywindow.h",            GEN_DIR .. "osd/modules/debugger/qt/memorywindow.moc.c", { },          { MOC .. "$(MOCINCPATH) $(<) -o $(@)" }},
127         { MAME_DIR .. "src/osd/modules/debugger/qt/breakpointswindow.h",      GEN_DIR .. "osd/modules/debugger/qt/breakpointswindow.moc.c", { },       { MOC .. "$(MOCINCPATH) $(<) -o $(@)" }},
128         { MAME_DIR .. "src/osd/modules/debugger/qt/deviceswindow.h",          GEN_DIR .. "osd/modules/debugger/qt/deviceswindow.moc.c", { },          { MOC .. "$(MOCINCPATH) $(<) -o $(@)" }},
129         { MAME_DIR .. "src/osd/modules/debugger/qt/deviceinformationwindow.h",  GEN_DIR .. "osd/modules/debugger/qt/deviceinformationwindow.moc.c", { },{ MOC .. "$(MOCINCPATH) $(<) -o $(@)" }},
130         
131      }
132     
102133      if _OPTIONS["targetos"]=="windows" then
103134         configuration { "mingw*" }
104135            buildoptions {

https://github.com/mamedev/mame/commit/3725b2fdc632f8e04606d606b9ae73f105d2d6b4

Previous 199869 Revisions Next

© 1997-2024 The MAME Team