lifning
/
gpsp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add CPU_ARCH rules to Makefile.common

This commit is contained in:
twinaphex 2014-12-09 22:37:07 +01:00
parent a660cbd4c8
commit 8d2578eefc
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -47,6 +47,7 @@ ifeq ($(platform), unix)
TARGET := $(TARGET_NAME)_libretro.so TARGET := $(TARGET_NAME)_libretro.so
fpic := -fPIC fpic := -fPIC
FORCE_32BIT := -m32 FORCE_32BIT := -m32
CPU_ARCH := x86_32
SHARED := -shared $(FORCE_32BIT) -Wl,--version-script=link.T SHARED := -shared $(FORCE_32BIT) -Wl,--version-script=link.T
ifneq ($(findstring Haiku,$(shell uname -a)),) ifneq ($(findstring Haiku,$(shell uname -a)),)
LIBM := LIBM :=

10
Makefile.common
View File

@ -1,5 +1,7 @@
INCFLAGS := -I$(CORE_DIR)/libretro -I$(CORE_DIR)/src INCFLAGS := -I$(CORE_DIR)/libretro -I$(CORE_DIR)/src
SOURCES_ASM :=
ifeq ($(HAVE_GRIFFIN), 1) ifeq ($(HAVE_GRIFFIN), 1)
SOURCES_C := $(CORE_DIR)/gpsp_griffin.c SOURCES_C := $(CORE_DIR)/gpsp_griffin.c
else else
@ -16,6 +18,12 @@ SOURCES_C := $(CORE_DIR)/main.c \
endif endif
SOURCES_ASM := $(CORE_DIR)/x86/x86_stub.S ifeq ($(CPU_ARCH), x86_32)
SOURCES_ASM += $(CORE_DIR)/x86/x86_stub.S
endif
ifeq ($(CPU_ARCH), arm)
SOURCES_ASM += $(CORE_DIR)/arm/arm_stub.S \
$(CORE_DIR)/arm/video_blend.S
endif
INCFLAGS := -I$(CORE_DIR) INCFLAGS := -I$(CORE_DIR)