Unverified Commit c76e1dc0 authored by Libretro-Admin's avatar Libretro-Admin Committed by GitHub
Browse files

Merge pull request #49 from webgeek1234/master

Fix mingw cross compile and add wii-u target
parents e9f6a709 6a89db47
......@@ -7,14 +7,14 @@ LIB68K = $(BASEDIR)/M68000
LIBGBZ = $(BASEDIR)/GBZ80
PRIVATE = $(BASEDIR)/Private
CXX = g++
CC = gcc
CPP = cpp
MOC = moc
SDT2GAS = perl $(EMULIB)/Tools/sdt2gas.pl
CFLAGS = -I. -I.. -I$(EMULIB)
DEFINES = -DZLIB
LIBS = -lz
CXX ?= g++
CC ?= gcc
CPP ?= cpp
MOC ?= moc
SDT2GAS ?= perl $(EMULIB)/Tools/sdt2gas.pl
CFLAGS += -I. -I.. -I$(EMULIB)
DEFINES += -DZLIB
LIBS += -lz
# EMULib sound, console, and other utility functions
OBJECTS = $(EMULIB)/EMULib.o $(EMULIB)/Sound.o \
......
......@@ -242,6 +242,13 @@ else ifeq ($(platform), wii)
AR = $(DEVKITPPC)/bin/powerpc-eabi-ar$(EXE_EXT)
PLATFORM_DEFINES += -DGEKKO -DHW_RVL -mrvl -mcpu=750 -meabi -mhard-float -DMSB_FIRST
STATIC_LINKING = 1
else ifeq ($(platform), wiiu)
TARGET := $(TARGET_NAME)_libretro_$(platform).a
CC = $(DEVKITPPC)/bin/powerpc-eabi-gcc$(EXE_EXT)
CC_AS = $(DEVKITPPC)/bin/powerpc-eabi-gcc$(EXE_EXT)
AR = $(DEVKITPPC)/bin/powerpc-eabi-ar$(EXE_EXT)
PLATFORM_DEFINES += -DGEKKO -DWIIU -DHW_RVL -mrvl -mcpu=750 -meabi -mhard-float -DMSB_FIRST
STATIC_LINKING = 1
# Nintendo Switch (libnx)
else ifeq ($(platform), libnx)
......@@ -483,8 +490,8 @@ else ifneq (,$(findstring windows_msvc2017,$(platform)))
else
TARGET := $(TARGET_NAME)_libretro.dll
CC = gcc
CC_AS = gcc
CC ?= gcc
CC_AS ?= gcc
SHARED := -shared -static-libgcc -static-libstdc++ -Wl,-no-undefined -Wl,-version-script=link.T
endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment