Makefile: Mess with Wii stuff to fix a majority of its make invocation circumstances.

git-svn-id: https://svn.eduke32.com/eduke32@6420 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2017-08-06 13:44:44 +00:00
parent 04bc041c2e
commit 8f0848d901
2 changed files with 25 additions and 20 deletions

View file

@ -127,6 +127,25 @@ endif
CROSS :=
CROSS_SUFFIX :=
CCFULLPATH = $(CC)
ifeq ($(PLATFORM),WII)
ifeq ($(strip $(DEVKITPPC)),)
$(error "Please set DEVKITPPC in your environment. export DEVKITPPC := <path to>devkitPPC")
endif
ifeq ($(HOSTPLATFORM),WINDOWS)
override DEVKITPRO := $(subst /c/,C:/,$(DEVKITPRO))
override DEVKITPPC := $(subst /c/,C:/,$(DEVKITPPC))
endif
export PATH := $(DEVKITPPC)/bin:$(PATH)
CROSS := powerpc-eabi-
CCFULLPATH = $(DEVKITPPC)/bin/$(CC)
endif
CC := $(CROSS)gcc$(CROSS_SUFFIX)
CXX := $(CROSS)g++$(CROSS_SUFFIX)
COBJC := $(CC) -x objective-c
@ -156,22 +175,6 @@ ifeq ($(AS),as)
override AS := nasm
endif
CCFULLPATH := $(CC)
ifeq ($(PLATFORM),WII)
ifeq ($(strip $(DEVKITPPC)),)
$(error "Please set DEVKITPPC in your environment. export DEVKITPPC := <path to>devkitPPC")
endif
include $(DEVKITPPC)/wii_rules
CCFULLPATH := $(DEVKITPPC)/bin/$(CC)
CROSS := powerpc-eabi-
RANLIB := powerpc-eabi-ranlib
STRIP := powerpc-eabi-strip
endif
ifeq ($(PLATFORM),$(filter $(PLATFORM),DINGOO GCW))
CROSS := mipsel-linux-
endif
@ -470,8 +473,12 @@ else ifeq ($(PLATFORM),DARWIN)
ASFORMAT += 64
endif
else ifeq ($(PLATFORM),WII)
LINKERFLAGS += -mrvl -meabi -mhard-float -Wl,--gc-sections
# -msdata=eabi
LIBOGC_INC := $(DEVKITPRO)/libogc/include
LIBOGC_LIB := $(DEVKITPRO)/libogc/lib/wii
COMMONFLAGS += -mrvl -mcpu=750 -meabi -mhard-float
LINKERFLAGS += -Wl,--gc-sections
# -msdata=eabiexport
COMPILERFLAGS += -DGEKKO -D__POWERPC__ -I$(LIBOGC_INC)
LIBDIRS += -L$(LIBOGC_LIB)
else ifeq ($(PLATFORM),$(filter $(PLATFORM),DINGOO GCW))

View file

@ -1,6 +1,4 @@
#define HW_RVL
#include "compat.h"
#ifdef __cplusplus