Merge pull request #295 from webgeek1234/master
Fix mingw cross compile and fix wii-u compile on newer devkitpro versions
This commit is contained in:
@@ -279,7 +279,7 @@ else ifeq ($(platform), wiiu)
|
|||||||
TARGET := $(TARGET_NAME)_libretro_$(platform).a
|
TARGET := $(TARGET_NAME)_libretro_$(platform).a
|
||||||
CC = $(DEVKITPPC)/bin/powerpc-eabi-gcc$(EXE_EXT)
|
CC = $(DEVKITPPC)/bin/powerpc-eabi-gcc$(EXE_EXT)
|
||||||
AR = $(DEVKITPPC)/bin/powerpc-eabi-ar$(EXE_EXT)
|
AR = $(DEVKITPPC)/bin/powerpc-eabi-ar$(EXE_EXT)
|
||||||
PLATFORM_DEFINES := -DGEKKO -DHW_RVL -mwup -mcpu=750 -meabi -mhard-float
|
PLATFORM_DEFINES := -DGEKKO -DHW_RVL -mcpu=750 -meabi -mhard-float
|
||||||
PLATFORM_DEFINES += -U__INT32_TYPE__ -U __UINT32_TYPE__ -D__INT32_TYPE__=int
|
PLATFORM_DEFINES += -U__INT32_TYPE__ -U __UINT32_TYPE__ -D__INT32_TYPE__=int
|
||||||
ENDIANNESS_DEFINES += -DMSB_FIRST
|
ENDIANNESS_DEFINES += -DMSB_FIRST
|
||||||
STATIC_LINKING=1
|
STATIC_LINKING=1
|
||||||
@@ -612,7 +612,7 @@ CFLAGS += -D_CRT_SECURE_NO_DEPRECATE
|
|||||||
# Windows
|
# Windows
|
||||||
else
|
else
|
||||||
TARGET := $(TARGET_NAME)_libretro.dll
|
TARGET := $(TARGET_NAME)_libretro.dll
|
||||||
CC = gcc
|
CC ?= gcc
|
||||||
SHARED := -shared -static-libgcc -static-libstdc++ -s -Wl,--version-script=src/drivers/libretro/link.T
|
SHARED := -shared -static-libgcc -static-libstdc++ -s -Wl,--version-script=src/drivers/libretro/link.T
|
||||||
PSS_STYLE :=2
|
PSS_STYLE :=2
|
||||||
endif
|
endif
|
||||||
|
|||||||
Reference in New Issue
Block a user