More makefile updates.

zsnes/src/makefile.dos

@@ -59,12 +59,15 @@ ZIPOBJ=${ZIPDIR}/unzip.o ${ZIPDIR}/zpng.o
 
 EFFECTSOBJ=${EFFECTSDIR}/burn.o ${EFFECTSDIR}/water.o ${EFFECTSDIR}/smoke.o
 
+JMAOBJ=${JMADIR}/7zlzma.obj ${JMADIR}/aribitcd.obj ${JMADIR}/crc32.obj ${JMADIR}/iiostrm.obj\
+       ${JMADIR}/inbyte.obj ${JMADIR}/jma.obj ${JMADIR}/lzma.obj ${JMADIR}/lzmadec.obj\
+       ${JMADIR}/outbyte.obj ${JMADIR}/winout.obj ${JMADIR}/zsnesjma.obj
+       
 MAINOBJ=cfgload.o endmem.o init.o initc.o uic.o patch.o ui.o vcache.o version.o
 
 
-OBJS=${CHIPSOBJ} ${CPUOBJ} ${DOSOBJ} ${GUIOBJ} ${VIDEOBJ} ${PREOBJ} ${MAINOBJ} ${ZIPOBJ} ${EFFECTSOBJ}
+OBJS=${CHIPSOBJ} ${CPUOBJ} ${DOSOBJ} ${GUIOBJ} ${VIDEOBJ} ${PREOBJ} ${MAINOBJ} ${ZIPOBJ} ${EFFECTSOBJ} ${JMAOBJ}
 LIBS=-lz -lm -lpng
-#CFLAGS=-O2 -Wall -Wno-unused -D__MSDOS__
 CFLAGS=-O3 -march=i586 -fno-exceptions -ffast-math\
 -fomit-frame-pointer -fno-unroll-loops -Wall -Wno-unused -D__MSDOS__
 ASM=nasm
@@ -114,7 +117,7 @@ ${CHIPDIR}/seta10.o: ${CHIPDIR}/seta10.c
 ui.o: ui.asm macros.mac
 cfgload.o:cfgload.asm macros.mac
 init.o:init.asm macros.mac
-initc.o:initc.c
+initc.o:initc.c ${JMADIR}/zsnesjma.h
 uic.o:uic.c
 patch.o:patch.c
 
@@ -199,6 +202,18 @@ ${CHIPDIR}/sa1proc.o: ${CHIPDIR}/sa1proc.asm macros.mac
 endmem.o: endmem.asm macros.mac
 ${DOSDIR}/modemrtn.o: ${DOSDIR}/modemrtn.asm macros.mac
 
+${JMADIR}/7zlzma.obj: ${JMADIR}/7zlzma.cpp
+${JMADIR}/aribitcd.obj: ${JMADIR}/aribitcd.cpp
+${JMADIR}/crc32.obj: ${JMADIR}/crc32.cpp ${JMADIR}/crc32.h
+${JMADIR}/iiostrm.obj: ${JMADIR}/iiostrm.cpp
+${JMADIR}/inbyte.obj: ${JMADIR}/inbyte.cpp
+${JMADIR}/jma.obj: ${JMADIR}/jma.cpp ${JMADIR}/jma.h ${JMADIR}/crc32.h ${JMADIR}/portable.h
+${JMADIR}/lzma.obj: ${JMADIR}/lzma.cpp
+${JMADIR}/lzmadec.obj: ${JMADIR}/lzmadec.cpp
+${JMADIR}/outbyte.obj: ${JMADIR}/outbyte.cpp
+${JMADIR}/winout.obj: ${JMADIR}/winout.cpp
+${JMADIR}/zsnesjma.obj: ${JMADIR}/zsnesjma.cpp ${JMADIR}/zsnesjma.h ${JMADIR}/jma.h
+
 clean:
 	del *.o
 	del ${CHIPDIR}\*.o
@@ -208,6 +223,7 @@ clean:
 	del ${DOSDIR}\*.o
 	del ${ZIPDIR}\*.o
 	del ${EFFECTSDIR}\*.o
+	del ${JMADIR}\*.obj
 	del zsnes.exe