vivlim
/
Kart-Public
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added a SDL12=1 flag to all ports whose interface code still lives in the sdl12 folder (and is unsupported by SDL 2.0 officially anyway) 

This basically causes the makefile to use the sdl12 folder instead of the main sdl folder
This commit is contained in:
Monster Iestyn 2017-09-14 21:03:20 +01:00
parent 017df6cd75
commit c330907dba
2 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Makefile
View File

@ -209,7 +209,13 @@ LIBS+=-lm
endif endif
ifdef SDL ifdef SDL
include sdl/Makefile.cfg #SDL 2.0
ifndef SDL12
include sdl/Makefile.cfg
#SDL 1.2
else
include sdl12/Makefile.cfg
endif #ifndef SDL12
endif #ifdef SDL endif #ifdef SDL
ifdef DISTCC ifdef DISTCC

24
src/Makefile.cfg
View File

@ -322,22 +322,24 @@ ifdef MINGW64
BIN:=$(BIN)/Mingw64 BIN:=$(BIN)/Mingw64
else else
ifdef WII ifdef WII
INTERFACE=sdl INTERFACE=sdl12
NONX86=1 NONX86=1
STATIC=1 STATIC=1
PREFIX?=powerpc-eabi PREFIX?=powerpc-eabi
SDL=1 SDL=1
SDL12=1
SDLMAIN=1 SDLMAIN=1
OBJDIR:=$(OBJDIR)/Wii OBJDIR:=$(OBJDIR)/Wii
BIN:=$(BIN)/Wii BIN:=$(BIN)/Wii
NOUPX=1 NOUPX=1
else else
ifdef PS3N ifdef PS3N
INTERFACE=sdl INTERFACE=sdl12
NONX86=1 NONX86=1
STATIC=1 STATIC=1
PREFIX?=ppu PREFIX?=ppu
SDL=1 SDL=1
SDL12=1
# unsure? # unsure?
#SDLMAIN=1 #SDLMAIN=1
# can't compile SDL_mixer for ps3... # can't compile SDL_mixer for ps3...
@ -352,34 +354,38 @@ ifdef MINGW
BIN:=$(BIN)/Mingw BIN:=$(BIN)/Mingw
else else
ifdef XBOX ifdef XBOX
INTERFACE=sdl INTERFACE=sdl12
NASMFORMAT=win32 NASMFORMAT=win32
PREFIX?=/usr/local/openxdk/bin/i386-pc-xbox PREFIX?=/usr/local/openxdk/bin/i386-pc-xbox
SDL=1 SDL=1
SDL12=1
OBJDIR:=$(OBJDIR)/XBOX OBJDIR:=$(OBJDIR)/XBOX
BIN:=$(BIN)/XBOX BIN:=$(BIN)/XBOX
else else
ifdef PSP ifdef PSP
INTERFACE=sdl INTERFACE=sdl12
NONX86=1 NONX86=1
SDL=1 SDL=1
SDL12=1
OBJDIR:=$(OBJDIR)/PSP OBJDIR:=$(OBJDIR)/PSP
BIN:=$(BIN)/PSP BIN:=$(BIN)/PSP
NOUPX=1 NOUPX=1
else else
ifdef DC ifdef DC
INTERFACE=sdl INTERFACE=sdl12
NONX86=1 NONX86=1
SDL=1 SDL=1
SDL12=1
OBJDIR:=$(OBJDIR)/DC OBJDIR:=$(OBJDIR)/DC
BIN:=$(BIN)/DC BIN:=$(BIN)/DC
NOUPX=1 NOUPX=1
else else
ifdef WINCE ifdef WINCE
INTERFACE=sdl INTERFACE=sdl12
NONX86=1 NONX86=1
PREFIX?=arm-wince-pe PREFIX?=arm-wince-pe
SDL=1 SDL=1
SDL12=1
OBJDIR:=$(OBJDIR)/WinCE OBJDIR:=$(OBJDIR)/WinCE
BIN:=$(BIN)/WinCE BIN:=$(BIN)/WinCE
else else
@ -437,7 +443,13 @@ OBJDUMP_OPTS?=--wide --source --line-numbers
LD=$(CC) LD=$(CC)
ifdef SDL ifdef SDL
# SDL 2.0
ifndef SDL12
INTERFACE=sdl INTERFACE=sdl
# SDL 1.2
else
INTERFACE=sdl12
endif
OBJDIR:=$(OBJDIR)/SDL OBJDIR:=$(OBJDIR)/SDL
endif endif