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

Fixed platform changes during compile.

Browse Source
This commit is contained in:
n-a-c-h
2005-02-08 22:25:21 +00:00
parent 1a8e6884eb
commit 5cb42fecc7
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
zsnes/src/makefile.ms
View File

@@ -32,8 +32,8 @@
# CPU=cpu-type optimize for a particular CPU, find a list of cpu types in the GCC manual # CPU=cpu-type optimize for a particular CPU, find a list of cpu types in the GCC manual
ENV=$(PLATFORM)
ifneq ($(PLATFORM),) #end if is at the bottom of the file ifneq (${ENV},) #end if is at the bottom of the file
CHIPDIR=chips CHIPDIR=chips
@@ -66,18 +66,18 @@ CROSS=no
STRIP=-Ws -s STRIP=-Ws -s
ifeq ($(PLATFORM),dos) ifeq (${ENV},dos)
CC = gcc CC = gcc
CPPC = gpp CPPC = gpp
OS=__MSDOS__ OS=__MSDOS__
endif endif
ifeq ($(PLATFORM),win32-unix-shell) ifeq (${ENV},win32-unix-shell)
PLATFORM=win32 ENV=win32
CROSS=yes CROSS=yes
endif endif
ifeq ($(PLATFORM),win32) ifeq (${ENV},win32)
CC = gcc CC = gcc
CPPC = g++ CPPC = g++
WINDRES = windres WINDRES = windres
@@ -85,20 +85,20 @@ ifeq ($(PLATFORM),win32)
OBJFIX=objfix.exe OBJFIX=objfix.exe
endif endif
ifeq ($(PLATFORM),msvc) ifeq (${ENV},msvc)
MSVCLIBS=zlib.lib libpng.lib wsock32.lib user32.lib gdi32.lib shell32.lib winmm.lib dinput8.lib dxguid.lib MSVCLIBS=zlib.lib libpng.lib wsock32.lib user32.lib gdi32.lib shell32.lib winmm.lib dinput8.lib dxguid.lib
DRESOBJ=${WINDIR}/zsnes.res DRESOBJ=${WINDIR}/zsnes.res
OS=__WIN32__ OS=__WIN32__
endif endif
ifeq ($(PLATFORM),dos-cross) ifeq (${ENV},dos-cross)
CC = i386-pc-msdosdjgpp-gcc CC = i386-pc-msdosdjgpp-gcc
CPPC = i386-pc-msdosdjgpp-g++ CPPC = i386-pc-msdosdjgpp-g++
OS=__MSDOS__ OS=__MSDOS__
CROSS=yes CROSS=yes
endif endif
ifeq ($(PLATFORM),win32-cross) ifeq (${ENV},win32-cross)
CC = i586-mingw32msvc-gcc CC = i586-mingw32msvc-gcc
CPPC = i586-mingw32msvc-g++ CPPC = i586-mingw32msvc-g++
WINDRES = i586-mingw32msvc-windres WINDRES = i586-mingw32msvc-windres
@@ -208,7 +208,7 @@ endif
.SUFFIXES: .c .cpp .asm .SUFFIXES: .c .cpp .asm
ifneq ($(PLATFORM),msvc) ifneq (${ENV},msvc)
%${OE}: %.c %${OE}: %.c
${CC} ${COPT} ${CFLAGS} -o $@ -c $< ${CC} ${COPT} ${CFLAGS} -o $@ -c $<
@@ -235,7 +235,7 @@ ALL: zsnes
${DELETECOMMAND} version${OE} ${DELETECOMMAND} version${OE}
zsnes: ${OBJFIX} ${OBJS} zsnes: ${OBJFIX} ${OBJS}
ifneq ($(PLATFORM),msvc) ifneq (${ENV},msvc)
${CPPC} ${STRIP} -o ${EXE} ${OBJS} ${LIBS} ${CPPC} ${STRIP} -o ${EXE} ${OBJS} ${LIBS}
else else
@echo /Fezsnesw.exe *.obj ${CPUDIR}\*.obj ${VIDEODIR}\*.obj ${CHIPDIR}\*.obj ${EFFECTSDIR}\*.obj ${DOSDIR}\*.obj ${WINDIR}\*.obj ${GUIDIR}\*.obj > link.vc @echo /Fezsnesw.exe *.obj ${CPUDIR}\*.obj ${VIDEODIR}\*.obj ${CHIPDIR}\*.obj ${EFFECTSDIR}\*.obj ${DOSDIR}\*.obj ${WINDIR}\*.obj ${GUIDIR}\*.obj > link.vc
@@ -349,7 +349,7 @@ ${WINDIR}/winintrf${OE}: $< macros.mac
${WINDIR}/zfilew${OE}: $< ${WINDIR}/zfilew${OE}: $<
${WINDIR}/zipxw${OE}: $< ${WINDIR}/zipxw${OE}: $<
${WINDIR}/zloaderw${OE}: $< ${WINDIR}/zloaderw${OE}: $<
ifeq ($(PLATFORM),msvc) ifeq (${ENV},msvc)
${WINDIR}/zsnes.res: ${WINDIR}/zsnes.rc ${WINDIR}/zsnes.res: ${WINDIR}/zsnes.rc
rc ${WINDIR}/zsnes.rc rc ${WINDIR}/zsnes.rc
${WINDIR}/winlink.obj: ${WINDIR}/winlink.cpp ${WINDIR}/resource.h ${WINDIR}/winlink.obj: ${WINDIR}/winlink.cpp ${WINDIR}/resource.h
@@ -376,7 +376,7 @@ clean:
${DELETECOMMAND} ${WINDIR}${SLASH}*${OE} ${TRUTH} ${DELETECOMMAND} ${WINDIR}${SLASH}*${OE} ${TRUTH}
${DELETECOMMAND} ${GUIDIR}${SLASH}*${OE} ${TRUTH} ${DELETECOMMAND} ${GUIDIR}${SLASH}*${OE} ${TRUTH}
else #else no platform specified else #else no ENV specified
help: help:
@echo Please specify which platform to compile/clean for with PLATFORM=platform_name @echo Please specify which ENV to compile/clean for with ENV=ENV_name
endif #endif on the PLATFORM being empty endif #endif on the ENV being empty