diff --git a/backends/platform/3ds/3ds.mk b/backends/platform/3ds/3ds.mk index 923699cc768..0876552fea1 100644 --- a/backends/platform/3ds/3ds.mk +++ b/backends/platform/3ds/3ds.mk @@ -9,11 +9,6 @@ APP_RSF := $(srcdir)/backends/platform/3ds/app/scummvm.rsf APP_BANNER_IMAGE:= $(srcdir)/backends/platform/3ds/app/banner.png APP_BANNER_AUDIO:= $(srcdir)/backends/platform/3ds/app/banner.wav -ARCH := -march=armv6k -mtune=mpcore -mfloat-abi=hard -mtp=soft -CXXFLAGS += -std=gnu++11 -ASFLAGS += -mfloat-abi=hard -LDFLAGS += -specs=3dsx.specs $(ARCH) -L$(DEVKITPRO)/libctru/lib -L$(DEVKITPRO)/portlibs/3ds/lib - .PHONY: clean_3ds dist_3ds clean: clean_3ds diff --git a/configure b/configure index b286469ed6d..aa2e278f4e0 100755 --- a/configure +++ b/configure @@ -2544,17 +2544,17 @@ case $_host_os in append_var DEFINES "-D__3DS__" append_var DEFINES "-DARM" append_var DEFINES "-DARM11" - append_var CXXFLAGS "-march=armv6k" - append_var CXXFLAGS "-mtune=mpcore" + append_var CXXFLAGS "-march=armv6k -mtune=mpcore -mfloat-abi=hard -mtp=soft" append_var CXXFLAGS "-mword-relocations" - append_var CXXFLAGS "-mfloat-abi=hard" append_var CXXFLAGS "-ffunction-sections" append_var CXXFLAGS "-fomit-frame-pointer" append_var CXXFLAGS "-I$DEVKITPRO/libctru/include" append_var CXXFLAGS "-I$DEVKITPRO/portlibs/3ds/include" + append_var LDFLAGS "-march=armv6k -mtune=mpcore -mfloat-abi=hard -mtp=soft" append_var LDFLAGS "-L$DEVKITPRO/libctru/lib" append_var LDFLAGS "-L$DEVKITPRO/portlibs/3ds/lib" - append_var LIBS "-lcitro3d -lctru" + append_var LDFLAGS "-specs=3dsx.specs -lctru" + append_var LIBS "-lcitro3d" ;; amigaos*) append_var LDFLAGS "-Wl,--export-dynamic"