a_dinosaur/ZSNES
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed DOS/Win makesfiles for new unified PSR build approach. Fixed issues with rebuilding zmovie.c

Browse Source
This commit is contained in:
n-a-c-h
2006-02-26 04:27:18 +00:00
parent 864237380c
commit 688ec929a2
3 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
zsnes/src/Makefile.in
View File

@@ -112,7 +112,7 @@ ALL: @ZSNESEXE@
${PSR}: parsegen.cpp ${PSR}: parsegen.cpp
ALL: ALL:
rm -f version.o psrhead/*.h rm -f version.o
tools: archopt cutrtype extraext minwhite nreplace sec-test srccount tools: archopt cutrtype extraext minwhite nreplace sec-test srccount

13
zsnes/src/makefile.ms
View File

@@ -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}\ 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} \ ui${OE} vcache${OE} version${OE} zmovie${OE} zstate${OE} zloader${OE} \
cfgparse${OE} md${OE} cfg${OE} md${OE}
NETOBJ= NETOBJ=
#${NETDIR}/ztcp${OE} #${NETDIR}/ztcp${OE}
@@ -237,7 +237,7 @@ else
endif endif
%${OE}: %.psr %${OE}: %.psr
${PSR} -D${OS} temppsr.c $< ${PSR} -D${OS} -cheader psrhead/$(patsubst %${OE},%.h,$@) -fname $(patsubst %${OE},%,$@) temppsr.c $<
ifneq (${ENV},msvc) ifneq (${ENV},msvc)
${CC} -o $@ -c temppsr.c ${CC} -o $@ -c temppsr.c
else else
@@ -259,7 +259,7 @@ else
endif endif
cfgload${OE}: cfgload.c cfgload${OE}: cfgload.c
cfgparse${OE}: ${PSR} cfgparse.psr cfg${OE}: ${PSR} cfg.psr
endmem${OE}: endmem.asm macros.mac endmem${OE}: endmem.asm macros.mac
init${OE}: init.asm macros.mac init${OE}: init.asm macros.mac
initc${OE}: initc.c asm_call.h ${CPUDIR}/memtable.h ${JMADIR}/zsnesjma.h\ 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} zmovie${OE}: zmovie.c asm_call.h gblvars.h numconv.h md${OE}
zstate${OE}: zstate.c asm_call.h gblvars.h numconv.h zstate${OE}: zstate.c asm_call.h gblvars.h numconv.h
md${OE}: md.psr ${PSR} 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}/c4emu${OE}: ${CHIPDIR}/c4emu.c
${CHIPDIR}/dsp1emu${OE}: ${CHIPDIR}/dsp1emu.c ${CHIPDIR}/dsp1emu${OE}: ${CHIPDIR}/dsp1emu.c
@@ -439,6 +433,7 @@ clean:
${DELETECOMMAND} ${VIDEODIR}${SLASH}*${OE} ${TRUTH} ${DELETECOMMAND} ${VIDEODIR}${SLASH}*${OE} ${TRUTH}
${DELETECOMMAND} ${WINDIR}${SLASH}*${OE} ${TRUTH} ${DELETECOMMAND} ${WINDIR}${SLASH}*${OE} ${TRUTH}
${DELETECOMMAND} ${ZIPDIR}${SLASH}*${OE} ${TRUTH} ${DELETECOMMAND} ${ZIPDIR}${SLASH}*${OE} ${TRUTH}
${DELETECOMMAND} psrhead${SLASH}*.h
else #else no ENV specified else #else no ENV specified
help: help:

2
zsnes/src/zmovie.c
View File

@@ -44,7 +44,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#include "gblvars.h" #include "gblvars.h"
#include "asm_call.h" #include "asm_call.h"
#include "numconv.h" #include "numconv.h"
#include "md.h" #include "psrhead/md.h"
#ifndef __WIN32__ #ifndef __WIN32__
#define mkdir(path) mkdir(path, (S_IRWXU|S_IRWXG|S_IRWXO)) //0777 #define mkdir(path) mkdir(path, (S_IRWXU|S_IRWXG|S_IRWXO)) //0777