notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #458 from dmorilha/fixes-for-rpi-compilation
[pcsx_rearmed.git]
/
Makefile.libretro
diff --git
a/Makefile.libretro
b/Makefile.libretro
index
79732b1
..
741ecfa
100644
(file)
--- a/
Makefile.libretro
+++ b/
Makefile.libretro
@@
-206,11
+206,11
@@
else ifeq ($(platform), ctr)
CC = $(DEVKITARM)/bin/arm-none-eabi-gcc$(EXE_EXT)
CXX = $(DEVKITARM)/bin/arm-none-eabi-g++$(EXE_EXT)
AR = $(DEVKITARM)/bin/arm-none-eabi-ar$(EXE_EXT)
CC = $(DEVKITARM)/bin/arm-none-eabi-gcc$(EXE_EXT)
CXX = $(DEVKITARM)/bin/arm-none-eabi-g++$(EXE_EXT)
AR = $(DEVKITARM)/bin/arm-none-eabi-ar$(EXE_EXT)
- CFLAGS += -DARM11 -D_3DS -DNO_OS -DNO_DYLIB -DNO_SOCKET -DGPU_UNAI_USE_FLOATMATH -DGPU_UNAI_USE_FLOAT_DIV_MULTINV
+ CFLAGS += -DARM11 -D_3DS -DNO_OS -DNO_DYLIB -DNO_SOCKET -D
THREAD_ENABLED -D
GPU_UNAI_USE_FLOATMATH -DGPU_UNAI_USE_FLOAT_DIV_MULTINV
CFLAGS += -march=armv6k -mtune=mpcore -mfloat-abi=hard -marm -mfpu=vfp -mtp=soft
CFLAGS += -march=armv6k -mtune=mpcore -mfloat-abi=hard -marm -mfpu=vfp -mtp=soft
- CFLAGS += -Wall -mword-relocations
+ CFLAGS += -Wall -mword-relocations
-fcommon
CFLAGS += -fomit-frame-pointer -ffast-math -funroll-loops
CFLAGS += -fomit-frame-pointer -ffast-math -funroll-loops
- CFLAGS += -Ifrontend/3ds
+ CFLAGS += -Ifrontend/3ds
-I$(CTRULIB)/include
CFLAGS += -Werror=implicit-function-declaration
OBJS += frontend/3ds/utils.o
CFLAGS += -Werror=implicit-function-declaration
OBJS += frontend/3ds/utils.o
@@
-380,6
+380,14
@@
else ifneq (,$(findstring armv,$(platform)))
ARCH = arm
DYNAREC = ari64
ARCH = arm
DYNAREC = ari64
+# Emscripten
+else ifeq ($(platform), emscripten)
+ TARGET := $(TARGET_NAME)_libretro_$(platform).bc
+ fpic := -fPIC
+ SHARED := -shared -Wl,--no-undefined -Wl,--version-script=link.T
+ CFLAGS += -DNO_DYLIB -DNO_SOCKET
+ STATIC_LINKING = 1
+
# Windows
else
TARGET := $(TARGET_NAME)_libretro.dll
# Windows
else
TARGET := $(TARGET_NAME)_libretro.dll