summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authoraliaspider2015-09-14 04:04:25 +0100
committeraliaspider2015-09-14 04:04:25 +0100
commitc52e81510fd6a9964329c0c8589fc0d0c35481b2 (patch)
tree2519983d31d872d069ee06e1acdbf39ea5619423 /Makefile
parentc1d061e20459e863075c66adb21280a8cdbb0031 (diff)
downloadpicogpsp-c52e81510fd6a9964329c0c8589fc0d0c35481b2.tar.gz
picogpsp-c52e81510fd6a9964329c0c8589fc0d0c35481b2.tar.bz2
picogpsp-c52e81510fd6a9964329c0c8589fc0d0c35481b2.zip
(CTR/3DS) fix the 'all' target not being the default target.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile7
1 files changed, 4 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 0f90efd..9c20d8f 100644
--- a/Makefile
+++ b/Makefile
@@ -208,6 +208,7 @@ else ifeq ($(platform), ctr)
CFLAGS += -march=armv6k -mtune=mpcore -mfloat-abi=hard
CFLAGS += -Wall -mword-relocations
CFLAGS += -fomit-frame-pointer -ffast-math
+ CXXFLAGS = $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++11
CPU_ARCH := arm
# dynarec unavailable on ninjhax 2.0
HAVE_DYNAREC = 1
@@ -345,9 +346,6 @@ endif
CFLAGS += -I$(CTRULIB)/include
-3ds/libkhax/khaxinit.o: 3ds/libkhax/khaxinit.cpp
- $(CXX) $(INCFLAGS) $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++11 $(OPTIMIZE) -c -o $@ $<
-
endif
endif
@@ -379,6 +377,9 @@ libco/libco.o: libco/libco.c
%.o: %.c
$(CC) $(INCFLAGS) $(CFLAGS) $(OPTIMIZE) -c -o $@ $<
+%.o: %.cpp
+ $(CXX) $(INCFLAGS) $(CXXFLAGS) $(OPTIMIZE) -c -o $@ $<
+
clean-objs:
rm -rf $(OBJECTS)