Patch adding Wii support by tueidj, part 2: Makefile changes

I didn't add Makefile.common, because it needs to be made conditional.

git-svn-id: https://svn.eduke32.com/eduke32@2622 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2012-05-01 12:37:53 +00:00
parent 133acaecae
commit bd8559f6c3
3 changed files with 28 additions and 2 deletions

View file

@ -191,6 +191,12 @@ ifeq ($(PLATFORM),LINUX)
LIBS += -lvorbisfile -lvorbis -logg
endif
ifeq ($(PLATFORM),WII)
STRIP=powerpc-eabi-strip
OURCFLAGS += -g -mcpu=750 -meabi -mhard-float -msdata -O2 -I$(LIBOGC_INC) -I$(PORTLIBS)/include -DGEKKO
LIBS += -L$(LIBOGC_LIB) -L$(PORTLIBS)/lib -lvorbisidec -lfreetype -lfat -lwiiuse -lbte -logc -lm -lwiikeyboard
endif
ifeq ($(PLATFORM),DARWIN)
OURCFLAGS += -fno-pic -I$(abspath Apple) -I$(abspath Apple/include)
@ -247,7 +253,9 @@ else
# -lGLU to build with gluBuild2DMipmaps
ifeq ($(RENDERTYPE),SDL)
ifeq (0,$(SDL_FRAMEWORK))
ifneq ($(PLATFORM),WII)
OURCFLAGS+= $(subst -Dmain=SDL_main,,$(shell $(SDLCONFIG) --cflags))
endif
LIBS+= -lSDL_mixer
else
OURCFLAGS += -DSDL_FRAMEWORK
@ -280,6 +288,9 @@ endif
ifneq (0,$(PROFILER))
OURLDFLAGS+=-pg
endif
ifeq ($(PLATFORM),WII)
MISCLINKOPTS+= -g -mrvl -meabi -mhard-float -msdata -Wl,--gc-sections -Wl,-Map,$(notdir $@).map
endif
ifeq ($(PRETTY_OUTPUT),1)
.SILENT:

View file

@ -36,11 +36,15 @@ ifeq (4,$(GCC_MAJOR))
endif
ifndef ARCH
ifeq ($(PLATFORM), WII)
ARCH=
else
ifeq ($(findstring i686, $(shell uname -m)), i686)
ARCH=-march=pentium3 $(M_TUNE_GENERIC) -mmmx # -msse2 -mfpmath=sse,387 -malign-double $(M_STACKREALIGN)
else
ARCH=
endif
endif
endif
BUILDCFLAGS=$(ARCH)
@ -157,6 +161,14 @@ ifeq ($(PLATFORM),SKYOS)
SDLCONFIG_CFLAGS=-I/boot/programs/sdk/include/sdl
LIBS+= -lSDL -lnet
endif
ifeq ($(PLATFORM),WII)
RENDERTYPE=SDL
EXESUFFIX=.elf
override WITHOUT_GTK=1
BUILDCFLAGS+= -g -mcpu=750 -meabi -mhard-float -msdata -O2 -DGEKKO -DHAVE_INTTYPES -D__POWERPC__ -I$(LIBOGC_INC) -I$(LIBOGC_INC)/SDL
SDLCONFIG=
LIBS+= -lSDL_mixer -lsmpeg -lSDL -laesnd
endif
ifeq ($(PLATFORM),QNX)
RENDERTYPE=SDL
override USE_OPENGL=0

View file

@ -15,7 +15,10 @@ else
endif
# for BUILD_ECHOFLAGS:
OURCFLAGS=$(BASECFLAGS) $(BUILDCFLAGS) -I$(INC) -I$(SRC) -DHAVE_VORBIS
OURCFLAGS=$(BASECFLAGS) $(BUILDCFLAGS) -I$(INC) -I$(SRC)
ifneq ($(PLATFORM),WII)
OURCFLAGS+= -DHAVE_VORBIS
endif
ifneq ($(RELEASE),0)
# Debugging disabled
debug+= $(F_NO_STACK_PROTECTOR)