--- nono/vm/Makefile 2026/04/29 17:05:37 1.1.1.17 +++ nono/vm/Makefile 2026/04/29 17:05:50 1.1.1.19 @@ -15,12 +15,13 @@ TARGETS= libnnvm.a TARGETS+= test_busio test_windrv .endif -CXXSRCS_vm= \ +CXXSRCS= \ adpcm.cpp \ areaset.cpp \ bankram.cpp \ bootloader.cpp \ bt45x.cpp \ + buserr.cpp \ cgrom.cpp \ cmmu.cpp \ console.cpp \ @@ -70,6 +71,7 @@ CXXSRCS_vm= \ newsfb.cpp \ newsio.cpp \ nmi.cpp \ + nop.cpp \ opm.cpp \ partialram.cpp \ pedec.cpp \ @@ -99,6 +101,7 @@ CXXSRCS_vm= \ scsibus.cpp \ scsicmd.cpp \ scsidev.cpp \ + scsidomain.cpp \ sio.cpp \ spc.cpp \ sprite.cpp \ @@ -121,6 +124,7 @@ CXXSRCS_vm= \ virtio_def.cpp \ virtio_entropy.cpp \ virtio_net.cpp \ + virtio_scsi.cpp \ vm.cpp \ vm_luna.cpp \ vm_news.cpp \ @@ -132,11 +136,11 @@ CXXSRCS_vm= \ xpbus.cpp \ .if "${HOST_HAS_AVX2}" == "yes" -CXXSRCS_vm+= accel_avx2.cpp +CXXSRCS+= accel_avx2.cpp CXXFLAGS.accel_avx2.cpp+= -mavx2 .endif .if "${HOST_HAS_NEON}" == "yes" -CXXSRCS_vm+= accel_neon.cpp +CXXSRCS+= accel_neon.cpp .endif CXXSRCS_test= \ @@ -144,13 +148,13 @@ CXXSRCS_test= \ test_tool.cpp \ test_windrv.cpp \ -CXXSRCS= ${CXXSRCS_vm} ${CXXSRCS_test} +CXXSRCS_all= ${CXXSRCS} ${CXXSRCS_test} -OBJS_vm= ${CXXSRCS_vm:.cpp=.o} +OBJS= ${CXXSRCS:.cpp=.o} CLEANFILES+= gencgrom -libnnvm.a: ${OBJS_vm} +libnnvm.a: ${OBJS} rm -f $@ ${AR} r $@ $> ${RANLIB} $@ @@ -165,6 +169,6 @@ test_ethernet.o: test_ethernet.cpp ether # LIBS は libbsd のため。 test_windrv: test_windrv.o ../lib/libnnlib.a - ${CXX} ${LDFLAGs} -o $@ $> ${LIBS} + ${CXX} ${LDFLAGS} -o $@ $> ${LIBS} .include "../Makefile.rule"