Previous 199869 Revisions Next

r36787 Monday 30th March, 2015 at 03:19:54 UTC by Vasantha Crabb
Make MinGW and OSX targets use dependencies for running genie
Use REGENIE=1 to force genie re-run without removing/touching files
Mark many targets as phony as appropriate
Improve situation for custom targets/OSDs
[/trunk]makefile

trunk/makefile
r245298r245299
319319PARAMS+= --targetos=$(TARGETOS)
320320endif
321321
322ifdef USE_QT
323PARAMS+= --USE_QT=$(USE_QT)
324else
322ifndef USE_QT
325323ifneq ($(TARGETOS),macosx)
326PARAMS+= --USE_QT=1
324USE_QT = 1
327325else
328PARAMS+= --USE_QT=0
326USE_QT = 0
329327endif
330328endif
329PARAMS+= --USE_QT=$(USE_QT)
331330
332331ifdef LDOPTS
333332PARAMS+= --LDOPTS='$(LDOPTS)'
r245298r245299
337336# All scripts
338337#-------------------------------------------------
339338
339
340340SCRIPTS = scripts/genie.lua \
341341   scripts/src/lib.lua \
342342   scripts/src/emu.lua \
r245298r245299
344344   scripts/src/main.lua \
345345   scripts/src/3rdparty.lua \
346346   scripts/src/cpu.lua \
347   scripts/src/osd/windows_cfg.lua \
348   scripts/src/osd/sdl_cfg.lua \
349   scripts/src/osd/windows.lua \
350   scripts/src/osd/osdmini_cfg.lua \
351   scripts/src/osd/osdmini.lua \
347   $(wildcard scripts/src/osd/$(OSD)*.lua) \
352348   scripts/src/sound.lua \
353349   scripts/src/tools.lua \
354350   scripts/src/video.lua \
355351   scripts/src/bus.lua \
356352   scripts/src/netlist.lua \
357353   scripts/toolchain.lua \
358   scripts/target/ume/tiny.lua \
359   scripts/target/ume/ume.lua \
360   scripts/target/mess/tiny.lua \
361   scripts/target/mess/mess.lua \
362   scripts/target/ldplayer/ldplayer.lua \
363   scripts/target/mame/mame.lua \
364   scripts/target/mame/tiny.lua
354   scripts/target/$(TARGET)/$(SUBTARGET).lua
355ifneq (,$(wildcard src/osd/$(OSD)/$(OSD).mak))
356SCRIPTS+= src/osd/$(OSD)/$(OSD).mak
357endif
358ifdef REGENIE
359SCRIPTS+= regenie
360endif
365361
366362#-------------------------------------------------
367363# Dependent stuff
r245298r245299
438434SUBDIR = $(OSD)/$(TARGET)$(SUBTARGET)
439435endif
440436
437.PHONY: all clean regenie generate
441438all: $(GENIE) $(TARGETOS)$(ARCHITECTURE)
439regenie:
442440
443windows_x64: generate
441#-------------------------------------------------
442# gmake-mingw64-gcc
443#-------------------------------------------------
444
445$(PROJECTDIR)/gmake-mingw64-gcc/Makefile: makefile $(SCRIPTS)
444446ifndef MINGW64
445447   $(error MINGW64 is not set)
446448endif
447ifndef COMPILE
448449   $(SILENT) $(GENIE) $(PARAMS) --gcc=mingw64-gcc --gcc_version=$(GCC_VERSION) gmake
449endif
450
451.PHONY: windows_x64
452windows_x64: generate $(PROJECTDIR)/gmake-mingw64-gcc/Makefile
450453   $(SILENT) $(MAKE) --no-print-directory -R -C $(PROJECTDIR)/gmake-mingw64-gcc config=$(CONFIG)64 WINDRES=$(WINDRES)
451454
455#-------------------------------------------------
456# gmake-mingw32-gcc
457#-------------------------------------------------
458
459.PHONY: windows
452460windows: windows_x86
453461
454windows_x86: generate
462$(PROJECTDIR)/gmake-mingw32-gcc/Makefile: makefile $(SCRIPTS)
455463ifndef MINGW32
456464   $(error MINGW32 is not set)
457465endif
458ifndef COMPILE
459466   $(SILENT) $(GENIE) $(PARAMS) --gcc=mingw32-gcc --gcc_version=$(GCC_VERSION) gmake
460endif
467
468.PHONY: windows_x86
469windows_x86: generate $(PROJECTDIR)/gmake-mingw32-gcc/Makefile
461470   $(SILENT) $(MAKE) --no-print-directory -R -C $(PROJECTDIR)/gmake-mingw32-gcc config=$(CONFIG)32 WINDRES=$(WINDRES)
462471
463windows_x64_clang: generate
472#-------------------------------------------------
473# gmake-mingw-clang
474#-------------------------------------------------
475
476$(PROJECTDIR)/gmake-mingw-clang/Makefile: makefile $(SCRIPTS)
464477ifndef CLANG
465478   $(error CLANG is not set)
466479endif
467ifndef COMPILE
468480   $(SILENT) $(GENIE) $(PARAMS) --gcc=mingw-clang --gcc_version=$(CLANG_VERSION) gmake
469endif
481
482.PHONY: windows_x64_clang
483windows_x64_clang: generate $(PROJECTDIR)/gmake-mingw-clang/Makefile
470484   $(SILENT) $(MAKE) --no-print-directory -R -C $(PROJECTDIR)/gmake-mingw-clang config=$(CONFIG)64 WINDRES=$(WINDRES)
471485   
472windows_x86_clang: generate
473ifndef CLANG
474   $(error CLANG is not set)
475endif
476ifndef COMPILE
477   $(SILENT) $(GENIE) $(PARAMS) --gcc=mingw-clang --gcc_version=$(CLANG_VERSION) gmake
478endif
486.PHONY: windows_x86_clang
487windows_x86_clang: generate $(PROJECTDIR)/gmake-mingw-clang/Makefile
479488   $(SILENT) $(MAKE) --no-print-directory -R -C $(PROJECTDIR)/gmake-mingw-clang config=$(CONFIG)32 WINDRES=$(WINDRES)
480489
481490vs2010: generate
r245298r245299
587596   $(SILENT) $(MAKE) --no-print-directory -R -C $(PROJECTDIR)/gmake-pnacl config=$(CONFIG)
588597
589598#-------------------------------------------------
590# linux_gcc
599# gmake-linux
591600#-------------------------------------------------
592601
593602$(PROJECTDIR)/gmake-linux/Makefile: makefile $(SCRIPTS)
594603   $(SILENT) $(GENIE) $(PARAMS) --gcc=linux-gcc --gcc_version=$(GCC_VERSION) gmake
595604
605.PHONY: linux_x64
596606linux_x64: generate $(PROJECTDIR)/gmake-linux/Makefile
597607   $(SILENT) $(MAKE) --no-print-directory -R -C $(PROJECTDIR)/gmake-linux config=$(CONFIG)64
598608
609.PHONY: linux
599610linux: linux_x86
600611
612.PHONY: linux_x86
601613linux_x86: generate $(PROJECTDIR)/gmake-linux/Makefile
602614   $(SILENT) $(MAKE) --no-print-directory -R -C $(PROJECTDIR)/gmake-linux config=$(CONFIG)32
603615
604616#-------------------------------------------------
605# linux_clang
617# gmake-linux-clang
606618#-------------------------------------------------
607619
608620$(PROJECTDIR)/gmake-linux-clang/Makefile: makefile $(SCRIPTS)
609621   $(SILENT) $(GENIE) $(PARAMS) --gcc=linux-clang --gcc_version=$(CLANG_VERSION) gmake
610622
623.PHONY: linux_x64_clang
611624linux_x64_clang: generate $(PROJECTDIR)/gmake-linux-clang/Makefile
612625   $(SILENT) $(MAKE) --no-print-directory -R -C $(PROJECTDIR)/gmake-linux-clang config=$(CONFIG)64
613626
627.PHONY: linux_x86_clang
614628linux_x86_clang: generate $(PROJECTDIR)/gmake-linux-clang/Makefile
615629   $(SILENT) $(MAKE) --no-print-directory -R -C $(PROJECTDIR)/gmake-linux-clang config=$(CONFIG)32
616630
617macosx_x64: generate
618ifndef COMPILE
619   $(SILENT) $(GENIE) $(PARAMS) --gcc=osx --gcc_version=$(GCC_VERSION) gmake
620endif
631#-------------------------------------------------
632# gmake-osx
633#-------------------------------------------------
634
635$(PROJECTDIR)/gmake-osx/Makefile: makefile $(SCRIPTS)
636   $(SILENT) $(GENIE) $(PARAMS) --gcc=osx --os_version=$(DARWIN_VERSION) --gcc_version=$(GCC_VERSION) gmake
637
638.PHONY: macosx_x64
639macosx_x64: generate $(PROJECTDIR)/gmake-osx/Makefile
621640   $(SILENT) $(MAKE) --no-print-directory -R -C $(PROJECTDIR)/gmake-osx config=$(CONFIG)64
622641
642.PHONY: macosx
623643macosx: macosx_x86
624644
625macosx_x86: generate
626ifndef COMPILE
627   $(SILENT) $(GENIE) $(PARAMS) --gcc=osx --os_version=$(DARWIN_VERSION) --gcc_version=$(GCC_VERSION) gmake
628endif
645.PHONY: macosx_x86
646macosx_x86: generate $(PROJECTDIR)/gmake-osx/Makefile
629647   $(SILENT) $(MAKE) --no-print-directory -R -C $(PROJECTDIR)/gmake-osx config=$(CONFIG)32
630648
631macosx_x64_clang: generate
632ifndef COMPILE
633   $(SILENT) $(GENIE) $(PARAMS) --gcc=osx-clang --gcc_version=$(CLANG_VERSION) gmake
634endif
649#-------------------------------------------------
650# gmake-osx-clang
651#-------------------------------------------------
652
653$(PROJECTDIR)/gmake-osx-clang/Makefile: makefile $(SCRIPTS)
654   $(SILENT) $(GENIE) $(PARAMS) --gcc=osx-clang --os_version=$(DARWIN_VERSION) --gcc_version=$(CLANG_VERSION) gmake
655
656.PHONY: macosx_x64_clang
657macosx_x64_clang: generate $(PROJECTDIR)/gmake-osx-clang/Makefile
635658   $(SILENT) $(MAKE) --no-print-directory -R -C $(PROJECTDIR)/gmake-osx-clang config=$(CONFIG)64
636659
637macosx_x86_clang: generate
638ifndef COMPILE
639   $(SILENT) $(GENIE) $(PARAMS) --gcc=osx-clang --os_version=$(DARWIN_VERSION) --gcc_version=$(CLANG_VERSION) gmake
640endif
660.PHONY: macosx_x86_clang
661macosx_x86_clang: generate $(PROJECTDIR)/gmake-osx-clang/Makefile
641662   $(SILENT) $(MAKE) --no-print-directory -R -C $(PROJECTDIR)/gmake-osx-clang config=$(CONFIG)32
642663
664#-------------------------------------------------
665# Clean/bootstrap
666#-------------------------------------------------
667
643668$(GENIE):
644669   $(SILENT) $(MAKE) --no-print-directory -R -C 3rdparty/genie/build/gmake.$(GENIEOS) -f genie.make
645670
r245298r245299
666691   $(GENDIR)/osd/modules/debugger/qt/ \
667692   $(GENDIR)/resource/
668693
669LAYOUTS=$(wildcard $(SRC)/emu/layout/*.lay) $(wildcard $(SRC)/mame/layout/*.lay) $(wildcard $(SRC)/mess/layout/*.lay) $(wildcard $(SRC)/ldplayer/layout/*.lay)
694LAYOUTS=$(wildcard $(SRC)/emu/layout/*.lay) $(wildcard $(SRC)/$(TARGET)/layout/*.lay)
670695
671ifeq ($(TARGETOS),macosx)
696ifeq ($(USE_QT),0)
672697MOC_FILES=
673698else
674699MOC_FILES=$(wildcard $(SRC)/osd/modules/debugger/qt/*.h)

https://github.com/mamedev/mame/commit/f1523ec8061e549834bfe998483e2e0d40c7337c

Previous 199869 Revisions Next

© 1997-2024 The MAME Team