From 688ec929a204acc00ca2d06c9eb378833a6f128b Mon Sep 17 00:00:00 2001
From: n-a-c-h <>
Date: Sun, 26 Feb 2006 04:27:18 +0000
Subject: [PATCH] Fixed DOS/Win makesfiles for new unified PSR build approach.
 Fixed issues with rebuilding zmovie.c

---
 zsnes/src/Makefile.in |  2 +-
 zsnes/src/makefile.ms | 13 ++++---------
 zsnes/src/zmovie.c    |  2 +-
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/zsnes/src/Makefile.in b/zsnes/src/Makefile.in
index 0844ebdc..53e4982b 100644
--- a/zsnes/src/Makefile.in
+++ b/zsnes/src/Makefile.in
@@ -112,7 +112,7 @@ ALL: @ZSNESEXE@
 ${PSR}: parsegen.cpp
 
 ALL:
-	rm -f version.o psrhead/*.h
+	rm -f version.o
 
 tools: archopt cutrtype extraext minwhite nreplace sec-test srccount
 
diff --git a/zsnes/src/makefile.ms b/zsnes/src/makefile.ms
index 2ba73f12..4c7b387c 100644
--- a/zsnes/src/makefile.ms
+++ b/zsnes/src/makefile.ms
@@ -173,7 +173,7 @@ JMAOBJ=${JMADIR}/7zlzma${OE} ${JMADIR}/crc32${OE} ${JMADIR}/iiostrm${OE}\
 
 MAINOBJ=cfgload${OE} endmem${OE} init${OE} initc${OE} uic${OE} patch${OE}\
 	ui${OE} vcache${OE} version${OE} zmovie${OE} zstate${OE} zloader${OE} \
-	cfgparse${OE} md${OE}
+	cfg${OE} md${OE}
 
 NETOBJ=
 #${NETDIR}/ztcp${OE}
@@ -237,7 +237,7 @@ else
 endif
 
 %${OE}: %.psr
-	${PSR} -D${OS} temppsr.c $<
+	${PSR} -D${OS} -cheader psrhead/$(patsubst %${OE},%.h,$@) -fname $(patsubst %${OE},%,$@) temppsr.c $<
 ifneq (${ENV},msvc)
 	${CC} -o $@ -c temppsr.c
 else
@@ -259,7 +259,7 @@ else
 endif
 
 cfgload${OE}: cfgload.c
-cfgparse${OE}: ${PSR} cfgparse.psr
+cfg${OE}: ${PSR} cfg.psr
 endmem${OE}: endmem.asm macros.mac
 init${OE}: init.asm macros.mac
 initc${OE}: initc.c asm_call.h ${CPUDIR}/memtable.h ${JMADIR}/zsnesjma.h\
@@ -273,12 +273,6 @@ zloader${OE}: zloader.c
 zmovie${OE}: zmovie.c asm_call.h gblvars.h numconv.h md${OE}
 zstate${OE}: zstate.c asm_call.h gblvars.h numconv.h
 md${OE}: md.psr ${PSR}
-	${PSR} -D${OS} -cheader md.h -fname movie temppsr.c $<
-ifneq (${ENV},msvc)
-	${CC} -o $@ -c temppsr.c
-else
-	cl /Ox /G6 /c /EHsc /D__WIN32__ /Fo$@ temppsr.c
-endif
 
 ${CHIPDIR}/c4emu${OE}: ${CHIPDIR}/c4emu.c
 ${CHIPDIR}/dsp1emu${OE}: ${CHIPDIR}/dsp1emu.c
@@ -439,6 +433,7 @@ clean:
 	${DELETECOMMAND} ${VIDEODIR}${SLASH}*${OE} ${TRUTH}
 	${DELETECOMMAND} ${WINDIR}${SLASH}*${OE} ${TRUTH}
 	${DELETECOMMAND} ${ZIPDIR}${SLASH}*${OE} ${TRUTH}
+	${DELETECOMMAND} psrhead${SLASH}*.h
 
 else  #else no ENV specified
 help:
diff --git a/zsnes/src/zmovie.c b/zsnes/src/zmovie.c
index f11b1653..8965b963 100644
--- a/zsnes/src/zmovie.c
+++ b/zsnes/src/zmovie.c
@@ -44,7 +44,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #include "gblvars.h"
 #include "asm_call.h"
 #include "numconv.h"
-#include "md.h"
+#include "psrhead/md.h"
 
 #ifndef __WIN32__
 #define mkdir(path) mkdir(path, (S_IRWXU|S_IRWXG|S_IRWXO)) //0777