diff --git a/mkcross.sh b/mkcross.sh index fc7503ee..189ddff4 100755 --- a/mkcross.sh +++ b/mkcross.sh @@ -2,7 +2,7 @@ set -e export VERSION=`utils/b-em-version-str.sh` -export VPATH='../src ../src/resid-fp ../src/NS32016 ../src/darm ../src/mc6809nc ../src/pdp11' +export VPATH='../src ../src/resid-fp ../src/NS32016 ../src/darm ../src/mc6809nc ../src/pdp11 ../src/musahi' dlls='allegro-5.2.dll allegro_acodec-5.2.dll allegro_audio-5.2.dll allegro_dialog-5.2.dll diff --git a/src/Makefile.win b/src/Makefile.win index dc9d90cb..604b5384 100644 --- a/src/Makefile.win +++ b/src/Makefile.win @@ -1,4 +1,4 @@ -VPATH = . resid-fp NS32016 darm pdp11 +VPATH = . resid-fp NS32016 darm musahi CPP = i686-w64-mingw32-g++ CC = i686-w64-mingw32-gcc @@ -122,12 +122,18 @@ PDP11OBJ = \ pdp11_debug.o \ copro-pdp11.o +M68000OBJ = \ + mc68000tube.o \ + m68kops.o \ + m68kcpu.o \ + m68kdasm.o + LIBS = -lz -lallegro_audio -lallegro_acodec -lallegro_primitives -lallegro_dialog -lallegro_image -lallegro_font -lallegro -mwindows -lgdi32 -lwinmm -lstdc++ all : b-em.exe hdfmt.exe jstest.exe gtest.exe -b-em.exe: $(OBJ) $(SIDOBJ) $(NS32KOBJ) $(MC6809OBJ) $(PDP11OBJ) - $(CC) $(OBJ) $(SIDOBJ) $(NS32KOBJ) $(MC6809OBJ) $(PDP11OBJ) -o "b-em.exe" $(LIBS) +b-em.exe: $(OBJ) $(SIDOBJ) $(NS32KOBJ) $(MC6809OBJ) $(PDP11OBJ) $(M68000OBJ) + $(CC) $(OBJ) $(SIDOBJ) $(NS32KOBJ) $(MC6809OBJ) $(PDP11OBJ) $(M68000OBJ) -o "b-em.exe" $(LIBS) clean : del *.o *.exe *.res