Fixed sdl12/Makefile.cfg and sdl12/(port)/Makefile.cfg and related to refer to sdl12/ subfolders, not sdl/ subfolders

This commit is contained in:
Monster Iestyn 2017-09-14 21:09:35 +01:00
parent c330907dba
commit 5076861e0f
7 changed files with 23 additions and 23 deletions

View file

@ -1,5 +1,5 @@
# #
# sdl/makeCYG.cfg for SRB2/Cygwin # sdl12/makeCYG.cfg for SRB2/Cygwin
# #
# #

View file

@ -1,5 +1,5 @@
# #
# sdl/makeNIX.cfg for SRB2/?nix # sdl12/makeNIX.cfg for SRB2/?nix
# #
#Valgrind support #Valgrind support

View file

@ -1,5 +1,5 @@
# #
# sdl/makefile.cfg for SRB2/SDL # sdl12/makefile.cfg for SRB2/SDL
# #
# #
@ -7,35 +7,35 @@
# #
ifdef UNIXCOMMON ifdef UNIXCOMMON
include sdl/MakeNIX.cfg include sdl12/MakeNIX.cfg
endif endif
ifdef PANDORA ifdef PANDORA
include sdl/SRB2Pandora/Makefile.cfg include sdl12/SRB2Pandora/Makefile.cfg
endif #ifdef PANDORA endif #ifdef PANDORA
ifdef DC ifdef DC
include sdl/SRB2DC/Makefile.cfg include sdl12/SRB2DC/Makefile.cfg
endif #ifdef DC endif #ifdef DC
ifdef PS3N ifdef PS3N
include sdl/SRB2PS3/Makefile.cfg include sdl12/SRB2PS3/Makefile.cfg
endif #ifdef PS3N endif #ifdef PS3N
ifdef PSP ifdef PSP
include sdl/SRB2PSP/Makefile.cfg include sdl12/SRB2PSP/Makefile.cfg
endif #ifdef PSP endif #ifdef PSP
ifdef XBOX ifdef XBOX
include sdl/SRB2XBOX/Makefile.cfg include sdl12/SRB2XBOX/Makefile.cfg
endif #ifdef XBOX endif #ifdef XBOX
ifdef WINCE ifdef WINCE
include sdl/SRB2CE/Makefile.cfg include sdl12/SRB2CE/Makefile.cfg
endif #ifef WINCE endif #ifef WINCE
ifdef CYGWIN32 ifdef CYGWIN32
include sdl/MakeCYG.cfg include sdl12/MakeCYG.cfg
endif #ifdef CYGWIN32 endif #ifdef CYGWIN32
ifdef SDL_PKGCONFIG ifdef SDL_PKGCONFIG
@ -151,7 +151,7 @@ endif
# FIXME: DevkitPPC and ready-compiled SDL Wii require these things to be in a silly order # FIXME: DevkitPPC and ready-compiled SDL Wii require these things to be in a silly order
ifdef WII ifdef WII
include sdl/SRB2WII/Makefile.cfg include sdl12/SRB2WII/Makefile.cfg
endif #ifdef WII endif #ifdef WII
CFLAGS+=$(SDL_CFLAGS) CFLAGS+=$(SDL_CFLAGS)

View file

@ -27,10 +27,10 @@ PKGNAME?=SRB2PS3.pkg
endif endif
DGBNAME?=$(EXENAME).debug DGBNAME?=$(EXENAME).debug
SRB2PS3DIR=sdl/SRB2PS3 SRB2PS3DIR=sdl12/SRB2PS3
ICON0?=$(SRB2PS3DIR)/ICON0.png ICON0?=$(SRB2PS3DIR)/ICON0.png
SFOXML?=sfo.xml SFOXML?=sfo.xml
SRB2TTF?=sdl/srb2.ttf SRB2TTF?=sdl12/srb2.ttf
TITLE=Sonic Robo Blast 2 v2.0.6 TITLE=Sonic Robo Blast 2 v2.0.6
APPID=SRB2-PS3 APPID=SRB2-PS3

View file

@ -36,14 +36,14 @@ endif
PSP_EBOOT_TITLE=SRB2-PSP vME PSP_EBOOT_TITLE=SRB2-PSP vME
PSP_EBOOT_SFO=$(BIN)/PARAM.SFO PSP_EBOOT_SFO=$(BIN)/PARAM.SFO
PSP_EBOOT_ICON=sdl/SRB2PSP/ICON0.png PSP_EBOOT_ICON=sdl12/SRB2PSP/ICON0.png
PSP_EBOOT_ICON1=NULL PSP_EBOOT_ICON1=NULL
PSP_EBOOT_UNKPNG=NULL PSP_EBOOT_UNKPNG=NULL
PSP_EBOOT_PIC1=sdl/SRB2PSP/PIC1.png PSP_EBOOT_PIC1=sdl12/SRB2PSP/PIC1.png
PSP_EBOOT_SND0=NULL PSP_EBOOT_SND0=NULL
PSP_EBOOT_PSAR=NULL PSP_EBOOT_PSAR=NULL
SIGNER?=sdl/SRB2PSP/psp-prxsign/psp-prxsign SIGNER?=sdl12/SRB2PSP/psp-prxsign/psp-prxsign
SDL=1 SDL=1
PREFIX=psp PREFIX=psp
@ -100,8 +100,8 @@ kxploit: $(BIN)/$(EXENAME) $(PSP_EBOOT_SFO)
$(PSP_EBOOT_ICON1) $(PSP_EBOOT_UNKPNG) $(PSP_EBOOT_PIC1) \ $(PSP_EBOOT_ICON1) $(PSP_EBOOT_UNKPNG) $(PSP_EBOOT_PIC1) \
$(PSP_EBOOT_SND0) NULL $(PSP_EBOOT_PSAR) $(PSP_EBOOT_SND0) NULL $(PSP_EBOOT_PSAR)
sdl/SRB2PSP/psp-prxsign/psp-prxsign: sdl12/SRB2PSP/psp-prxsign/psp-prxsign:
-$(MAKE) -C sdl/SRB2PSP/psp-prxsign CFLAGS=-pipe CC="$(HOSTCC)" -$(MAKE) -C sdl12/SRB2PSP/psp-prxsign CFLAGS=-pipe CC="$(HOSTCC)"
fix-up: $(BIN)/$(EXENAME) fix-up: $(BIN)/$(EXENAME)
@echo Running psp-fixup-imports on $(EXENAME) @echo Running psp-fixup-imports on $(EXENAME)

View file

@ -2,8 +2,8 @@
PNDNAME=SRB2.pnd PNDNAME=SRB2.pnd
PNDDIR=$(BIN)/pnd PNDDIR=$(BIN)/pnd
ICON=sdl/SRB2Pandora/icon.png ICON=sdl12/SRB2Pandora/icon.png
PXML=sdl/SRB2Pandora/PXML.xml PXML=sdl12/SRB2Pandora/PXML.xml
SED=sed SED=sed
CAT=cat CAT=cat

View file

@ -16,8 +16,8 @@ EXENAME?=$(SRB2NAME).elf
DBGNAME?=$(SRB2NAME).elf.debug DBGNAME?=$(SRB2NAME).elf.debug
DOLNAME?=$(SRB2NAME).dol DOLNAME?=$(SRB2NAME).dol
ICONPNG?=sdl/SRB2WII/icon.png ICONPNG?=sdl12/SRB2WII/icon.png
METAXML?=sdl/SRB2WII/meta.xml METAXML?=sdl12/SRB2WII/meta.xml
APPDIR=apps/$(SRB2NAME) APPDIR=apps/$(SRB2NAME)
ZIPNAME=$(SRB2NAME).zip ZIPNAME=$(SRB2NAME).zip