aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTwinaphex2016-01-27 05:08:18 +0100
committerTwinaphex2016-01-27 05:08:18 +0100
commit81def24a904cf870d10b7b3b0a0aca53eedbeba1 (patch)
treeb0089925cf31e3ae361332b992d8ac812d80334a
parentf4f4201f42bfb2acb98c654a3b384e79b1de588e (diff)
parent79e732f010d48046a54ea6fb42a7bc027d4cbbe1 (diff)
downloadsnesemu-81def24a904cf870d10b7b3b0a0aca53eedbeba1.tar.gz
snesemu-81def24a904cf870d10b7b3b0a0aca53eedbeba1.tar.bz2
snesemu-81def24a904cf870d10b7b3b0a0aca53eedbeba1.zip
Merge pull request #14 from tuluse/master
Move psp sdk include to after including Makefile.common so it's not overwritten
-rw-r--r--Makefile5
1 files changed, 4 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 8793d87..daceccd 100644
--- a/Makefile
+++ b/Makefile
@@ -153,7 +153,6 @@ else ifeq ($(platform), psp1)
-fomit-frame-pointer -fgcse-sm -fgcse-las -fgcse-after-reload \
-fweb -fpeel-loops
DEFS += -DPSP -D_PSP_FW_VERSION=371
- INCFLAGS += -I$(shell psp-config --pspsdk-path)/include
STATIC_LINKING := 1
# Vita
@@ -212,6 +211,10 @@ LIBRETRO_DIR := .
include Makefile.common
+ifeq ($(platform), psp1)
+ INCFLAGS += -I$(shell psp-config --pspsdk-path)/include
+endif
+
OBJECTS := $(SOURCES_C:.c=.o)
LDFLAGS += $(fpic) $(SHARED)