starred/Mu
1
0
Fork 0
mirror of https://github.com/libretro/Mu.git synced 2026-09-22 14:45:57 +00:00
Code Issues 18 Packages Projects Releases 2 Wiki Activity

Move EMU_* variables out of platform make files

Browse Source
This commit is contained in:
meepingsnesroms
2018-12-08 10:53:08 -08:00
parent 33c337ae50
commit c09e490d59
13 changed files with 65 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
libretroBuildSystem/Makefile.libretro
View File

@@ -1,7 +1,7 @@
DEBUG=0
DEBUG = 0
GIT_VERSION := " $(shell git rev-parse --short HEAD)"
STATIC_LINKING=0
STATIC_LINKING_LINK=0
STATIC_LINKING = 0
STATIC_LINKING_LINK = 0
CORE_DIR := .
BUILD_DIR = build
@@ -15,6 +15,10 @@ else ifeq ($(platform),linux_x86)
include $(BUILD_DIR)/Makefile.linux_x86
else ifeq ($(platform),linux_x86_64)
include $(BUILD_DIR)/Makefile.linux_x86_64
else ifeq ($(platform),osx_x86)
include $(BUILD_DIR)/Makefile.osx_x86
else ifeq ($(platform),osx_x86_64)
include $(BUILD_DIR)/Makefile.osx_x86_64
else ifeq ($(platform),mingw_x86)
include $(BUILD_DIR)/Makefile.mingw_x86
else ifeq ($(platform),mingw_x86_64)
@@ -118,7 +122,7 @@ else ifeq ($(platform), osx)
TARGET := $(TARGET_NAME)_libretro.$(EXT)
fpic := -fPIC
ifeq ($(arch),ppc)
CFLAGS += -D__ppc__ -DMSB_FIRST -DWORDS_BIGENDIAN=1 -DEMU_BIG_ENDIAN
CFLAGS += -D__ppc__ -DMSB_FIRST -DWORDS_BIGENDIAN=1
endif
OSXVER = $(shell sw_vers -productVersion | cut -d. -f 2)
OSX_GT_MOJAVE = $(shell (( $(OSXVER) >= 14)) && echo "YES")
@@ -143,8 +147,6 @@ ifeq ($(platform),ios-arm64)
CC = cc -arch arm64 -isysroot $(IOSSDK)
else
CC = cc -arch armv7 -isysroot $(IOSSDK)
# EMU_OPTIMIZE_FOR_ARM = 1
# EMU_NEW_ASM_SYNTAX = 1
endif
LD = armv7-apple-darwin11-ld
@@ -177,7 +179,6 @@ else ifeq ($(platform), qnx)
CC = qcc -Vgcc_ntoarmv7le
AR = qcc -Vgcc_ntoarmv7le
CFLAGS += -D__BLACKBERRY_QNX__
EMU_OPTIMIZE_FOR_ARM = 1
# PS3
else ifeq ($(platform), ps3)
@@ -185,7 +186,7 @@ else ifeq ($(platform), ps3)
TARGET := $(TARGET_NAME)_libretro_ps3.$(EXT)
CC = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-gcc.exe
AR = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-ar.exe
CFLAGS += -D__ppc__ -DMSB_FIRST -DWORDS_BIGENDIAN=1 -DEMU_BIG_ENDIAN
CFLAGS += -D__ppc__ -DMSB_FIRST -DWORDS_BIGENDIAN=1
STATIC_LINKING = 1
STATIC_LINKING_LINK = 1
@@ -195,7 +196,7 @@ else ifeq ($(platform), sncps3)
TARGET := $(TARGET_NAME)_libretro_ps3.$(EXT)
CC = $(CELL_SDK)/host-win32/sn/bin/ps3ppusnc.exe
AR = $(CELL_SDK)/host-win32/sn/bin/ps3snarl.exe
CFLAGS += -D__ppc__ -DMSB_FIRST -DWORDS_BIGENDIAN=1 -DEMU_BIG_ENDIAN
CFLAGS += -D__ppc__ -DMSB_FIRST -DWORDS_BIGENDIAN=1
STATIC_LINKING = 1
STATIC_LINKING_LINK = 1
@@ -205,7 +206,7 @@ else ifeq ($(platform), psl1ght)
TARGET := $(TARGET_NAME)_libretro_$(platform).$(EXT)
CC = $(PS3DEV)/ppu/bin/ppu-gcc$(EXE_EXT)
AR = $(PS3DEV)/ppu/bin/ppu-ar$(EXE_EXT)
CFLAGS += -D__ppc__ -DMSB_FIRST -DWORDS_BIGENDIAN=1 -DEMU_BIG_ENDIAN
CFLAGS += -D__ppc__ -DMSB_FIRST -DWORDS_BIGENDIAN=1
STATIC_LINKING = 1
STATIC_LINKING_LINK = 1
@@ -238,7 +239,6 @@ else ifeq ($(platform), vita)
CFLAGS += -DVITA
STATIC_LINKING = 1
STATIC_LINKING_LINK = 1
EMU_OPTIMIZE_FOR_ARM = 1
# CTR (3DS)
else ifeq ($(platform), ctr)
@@ -253,7 +253,6 @@ else ifeq ($(platform), ctr)
CFLAGS += -D_3DS
STATIC_LINKING = 1
STATIC_LINKING_LINK = 1
EMU_OPTIMIZE_FOR_ARM = 1
# Raspberry Pi 2
else ifeq ($(platform), rpi2)
@@ -264,7 +263,6 @@ else ifeq ($(platform), rpi2)
CFLAGS += -marm -mcpu=cortex-a7 -mfpu=neon-vfpv4 -mfloat-abi=hard -funsafe-math-optimizations
CFLAGS += -fomit-frame-pointer -ffast-math
HAVE_NEON = 1
EMU_OPTIMIZE_FOR_ARM = 1
# Raspberry Pi 3
else ifeq ($(platform), rpi3)
@@ -307,7 +305,6 @@ else ifeq ($(platform), classic_armv7_a7)
LDFLAGS += -static-libgcc -static-libstdc++
endif
endif
EMU_OPTIMIZE_FOR_ARM = 1
# Xbox 360
else ifeq ($(platform), xenon)
@@ -325,7 +322,7 @@ else ifeq ($(platform), ngc)
TARGET := $(TARGET_NAME)_libretro_$(platform).$(EXT)
CC = $(DEVKITPPC)/bin/powerpc-eabi-gcc$(EXE_EXT)
AR = $(DEVKITPPC)/bin/powerpc-eabi-ar$(EXE_EXT)
CFLAGS += -DGEKKO -DHW_DOL -mrvl -mcpu=750 -meabi -mhard-float -D__ppc__ -DMSB_FIRST -DWORDS_BIGENDIAN=1 -DEMU_BIG_ENDIAN
CFLAGS += -DGEKKO -DHW_DOL -mrvl -mcpu=750 -meabi -mhard-float -D__ppc__ -DMSB_FIRST -DWORDS_BIGENDIAN=1
CFLAGS += -U__INT32_TYPE__ -U __UINT32_TYPE__ -D__INT32_TYPE__=int
STATIC_LINKING = 1
STATIC_LINKING_LINK = 1
@@ -336,7 +333,7 @@ else ifeq ($(platform), wii)
TARGET := $(TARGET_NAME)_libretro_$(platform).$(EXT)
CC = $(DEVKITPPC)/bin/powerpc-eabi-gcc$(EXE_EXT)
AR = $(DEVKITPPC)/bin/powerpc-eabi-ar$(EXE_EXT)
CFLAGS += -DGEKKO -DHW_RVL -mrvl -mcpu=750 -meabi -mhard-float -D__ppc__ -DMSB_FIRST -DWORDS_BIGENDIAN=1 -DEMU_BIG_ENDIAN
CFLAGS += -DGEKKO -DHW_RVL -mrvl -mcpu=750 -meabi -mhard-float -D__ppc__ -DMSB_FIRST -DWORDS_BIGENDIAN=1
CFLAGS += -U__INT32_TYPE__ -U __UINT32_TYPE__ -D__INT32_TYPE__=int
STATIC_LINKING = 1
STATIC_LINKING_LINK = 1
@@ -347,7 +344,7 @@ else ifeq ($(platform), wiiu)
TARGET := $(TARGET_NAME)_libretro_$(platform).$(EXT)
CC = $(DEVKITPPC)/bin/powerpc-eabi-gcc$(EXE_EXT)
AR = $(DEVKITPPC)/bin/powerpc-eabi-ar$(EXE_EXT)
CFLAGS += -DGEKKO -DHW_RVL -mwup -mcpu=750 -meabi -mhard-float -D__ppc__ -DMSB_FIRST -DWORDS_BIGENDIAN=1 -DEMU_BIG_ENDIAN
CFLAGS += -DGEKKO -DHW_RVL -mwup -mcpu=750 -meabi -mhard-float -D__ppc__ -DMSB_FIRST -DWORDS_BIGENDIAN=1
CFLAGS += -U__INT32_TYPE__ -U __UINT32_TYPE__ -D__INT32_TYPE__=int
STATIC_LINKING = 1
STATIC_LINKING_LINK = 1

18
libretroBuildSystem/build/Makefile.common
View File

@@ -15,11 +15,27 @@ ifneq (,$(findstring msvc200,$(platform)))
endif
ifneq (,$(findstring msvc20,$(platform)))
#Mu is dependent on stdbool.h and the standard inline directive existing
# Mu is dependent on stdbool.h and the standard inline directive existing
INCFLAGS += -I$(CORE_DIR)/fixIncludes/stdbool
COREDEFINES += -Dinline=_inline -DINLINE=_inline
endif
ifneq (,$(filter ps3 sncps3 psl1ght ngc wii wiiu,$(platform)))
COREDEFINES += -DEMU_BIG_ENDIAN
else ifeq ($(platform), osx)
ifeq ($(arch), ppc)
COREDEFINES += -DEMU_BIG_ENDIAN
endif
endif
ifneq (,$(filter qnx vita ctr rpi2 classic_armv7_a7,$(platform)))
EMU_OPTIMIZE_FOR_ARM32 = 1
else ifneq (,$(findstring armv7,$(platform)))
EMU_OPTIMIZE_FOR_ARM32 = 1
else ifneq (,$(findstring armv6,$(platform)))
EMU_OPTIMIZE_FOR_ARM32 = 1
endif
include $(EMU_PATH)/makefile.all
COREDEFINES += $(EMU_DEFINES)

4
libretroBuildSystem/build/Makefile.ps3_ppc
View File

@@ -42,8 +42,8 @@ LIBEXT = .ps3_ppc.a
STATIC_LINKING = 1
platform = ps3
PLATDEFS = -D__CELLOS_LV2__
PLATCFLAGS = -DMSB_FIRST -DWORDS_BIGENDIAN=1 -DEMU_BIG_ENDIAN
PLATCXXFLAGS = -DMSB_FIRST -DWORDS_BIGENDIAN=1 -DEMU_BIG_ENDIAN
PLATCFLAGS = -DMSB_FIRST -DWORDS_BIGENDIAN=1
PLATCXXFLAGS = -DMSB_FIRST -DWORDS_BIGENDIAN=1
PLATLDFLAGS = -shared -lm
PLATLDXFLAGS = -shared -lm

1
libretroBuildSystem/build/Makefile.vita_arm
View File

@@ -46,7 +46,6 @@ PLATCFLAGS = -ftree-vectorize -mfloat-abi=hard -ffast-math -fsingle-precisio
PLATCXXFLAGS = -ftree-vectorize -mfloat-abi=hard -ffast-math -fsingle-precision-constant -funroll-loops -fno-short-enums
PLATLDFLAGS = -shared -lm -mthumb -mcpu=cortex-a9 -mfloat-abi=hard
PLATLDXFLAGS = -shared -lm -mthumb -mcpu=cortex-a9 -mfloat-abi=hard
EMU_OPTIMIZE_FOR_ARM = 1
################
# libretro setup

4
libretroBuildSystem/build/Makefile.wii_ppc
View File

@@ -42,8 +42,8 @@ LIBEXT = .wii_ppc.a
STATIC_LINKING = 1
platform = wii
PLATDEFS = -DGEKKO -DHW_RVL
PLATCFLAGS = -m32 -fstrict-aliasing -mrvl -mcpu=750 -meabi -mhard-float -DMSB_FIRST -DWORDS_BIGENDIAN=1 -DEMU_BIG_ENDIAN
PLATCXXFLAGS = -m32 -fstrict-aliasing -mrvl -mcpu=750 -meabi -mhard-float -DMSB_FIRST -DWORDS_BIGENDIAN=1 -DEMU_BIG_ENDIAN
PLATCFLAGS = -m32 -fstrict-aliasing -mrvl -mcpu=750 -meabi -mhard-float -DMSB_FIRST -DWORDS_BIGENDIAN=1
PLATCXXFLAGS = -m32 -fstrict-aliasing -mrvl -mcpu=750 -meabi -mhard-float -DMSB_FIRST -DWORDS_BIGENDIAN=1
PLATLDFLAGS = -shared -lm
PLATLDXFLAGS = -shared -lm

2
libretroBuildSystem/jni/Android.mk
View File

@@ -14,7 +14,7 @@ endif
#set ASM CPU core, only use with ARMv4<->7, ARMv8 is its own architecture
ifeq ($(TARGET_ARCH),arm)
ifneq ($(TARGET_ARCH_ABI),arm64-v8a)
EMU_OPTIMIZE_FOR_ARM = 1
EMU_OPTIMIZE_FOR_ARM32 = 1
endif
endif