diff options
author | 2016-01-27 15:34:31 +0100 | |
---|---|---|
committer | 2016-01-27 15:36:29 +0100 | |
commit | 3f2add802dd33bb61a4634bba61191823e0d41c5 (patch) | |
tree | 1374999251fefdfd884c1163490f8caf7476dd08 | |
parent | 1a6999a0e70871f3635844b7b5294114ab40f996 (diff) |
Updated makefile to generate m68k files (nw)
-rw-r--r-- | .gitignore | 4 | ||||
-rw-r--r-- | makefile | 6 | ||||
-rw-r--r-- | src/devices/cpu/m68000/makefile | 12 |
3 files changed, 15 insertions, 7 deletions
diff --git a/.gitignore b/.gitignore index a9154ad4011..1e1afa52def 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,7 @@ regtests/chdman/temp regtests/jedutil/output *.pyc /CMakeLists.txt +/src/devices/cpu/m68000/m68kops.cpp +/src/devices/cpu/m68000/m68kops.h +/src/devices/cpu/m68000/m68kmake.* +!/src/devices/cpu/m68000/m68kmake.cpp
\ No newline at end of file @@ -1233,6 +1233,7 @@ clean: @echo Cleaning... -@rm -rf $(BUILDDIR) $(SILENT) $(MAKE) $(MAKEPARAMS) -C 3rdparty/genie/build/gmake.$(GENIEOS) -f genie.make clean + $(SILENT) $(MAKE) -C $(SRC)/devices/cpu/m68000 clean GEN_FOLDERS := $(GENDIR)/$(TARGET)/layout/ $(GENDIR)/$(TARGET)/$(SUBTARGET)/ @@ -1252,12 +1253,15 @@ $(GEN_FOLDERS): generate: \ $(GENIE) \ $(GEN_FOLDERS) \ - $(patsubst $(SRC)/%.lay,$(GENDIR)/%.lh,$(LAYOUTS)) + $(patsubst $(SRC)/%.lay,$(GENDIR)/%.lh,$(LAYOUTS)) \ + $(SRC)/devices/cpu/m68000/m68kops.cpp $(GENDIR)/%.lh: $(SRC)/%.lay scripts/build/file2str.py | $(GEN_FOLDERS) @echo Converting $<... $(SILENT)$(PYTHON) scripts/build/file2str.py $< $@ layout_$(basename $(notdir $<)) +$(SRC)/devices/cpu/m68000/m68kops.cpp: $(SRC)/devices/cpu/m68000/m68k_in.cpp $(SRC)/devices/cpu/m68000/m68kmake.cpp + $(SILENT) $(MAKE) -C $(SRC)/devices/cpu/m68000 #------------------------------------------------- # Regression tests diff --git a/src/devices/cpu/m68000/makefile b/src/devices/cpu/m68000/makefile index 12b29fa267a..e16787e70d6 100644 --- a/src/devices/cpu/m68000/makefile +++ b/src/devices/cpu/m68000/makefile @@ -10,22 +10,22 @@ endif .PHONY: all clean -all : m68kmake$(EXE) m68kops.c clean +all : m68kmake$(EXE) m68kops.cpp clean: @echo Cleaning... -@rm -f m68kmake$(EXE) -@rm -f m68kmake.o + -@rm -f m68kops.* -m68kmake.o: m68kmake.c - @echo $(notdir $<) - @gcc -x c++ -std=gnu++98 -o "$@" -c "$<" +m68kmake.o: m68kmake.cpp + @gcc -x c++ -std=c++11 -o "$@" -c "$<" m68kmake$(EXE) : m68kmake.o @echo Linking $@... @g++ -lstdc++ $^ -o $@ -m68kops.c: m68kmake$(EXE) m68k_in.c +m68kops.cpp: m68kmake$(EXE) m68k_in.cpp @echo Generating M68K source files... - @m68kmake$(EXE) . m68k_in.c + @m68kmake$(EXE) . m68k_in.cpp |