@@ -13,7 +13,6 @@ filter_out1 = $(filter-out $(firstword $1),$1)
1313filter_out2 = $(call filter_out1,$(call filter_out1,$1))
1414unixpath = $(subst \,/,$1)
1515unixcygpath = /$(subst :,,$(call unixpath,$1))
16- export DEPSDIR := $(CURDIR)/
1716
1817ifeq ($(platform),)
1918 platform = unix
@@ -278,22 +277,23 @@ else ifeq ($(platform), switch)
278277
279278# Nintendo Switch (libnx)
280279else ifeq ($(platform), libnx)
281- include $(DEVKITPRO)/libnx/switch_rules
282- EXT=a
283- TARGET := $(TARGET_NAME)_libretro_$(platform).$(EXT)
284- DEFINES := -DSWITCH=1 -U__linux__ -U__linux -DRARCH_INTERNAL
285- CFLAGS := $(DEFINES) -g \
286- -O2 \
280+ export DEPSDIR := $(CURDIR)/
281+ include $(DEVKITPRO)/libnx/switch_rules
282+ EXT=a
283+ TARGET := $(TARGET_NAME)_libretro_$(platform).$(EXT)
284+ DEFINES := -DSWITCH=1 -U__linux__ -U__linux -DRARCH_INTERNAL
285+ CFLAGS := $(DEFINES) -g \
286+ -O2 \
287287 -fPIE -I$(LIBNX)/include/ -ffunction-sections -fdata-sections -ftls-model=local-exec -Wl,--allow-multiple-definition -specs=$(LIBNX)/switch.specs
288- CFLAGS += $(INCDIRS)
289- CFLAGS += $(INCLUDE) -D__SWITCH__ -DHAVE_LIBNX
290- # Replaced -fno-rtti -fno-exceptions with -fexceptions, using C++14
291- CXXFLAGS := $(ASFLAGS) $(CFLAGS) -fexceptions -std=c++14
292- CFLAGS += -std=gnu11
293- PLATFORM_DEFINES += -DARM -march=armv8-a -mtune=cortex-a57 -mtp=soft
294- STATIC_LINKING = 1
295- #PLATFORM_DEFINES += -D_INCL_PHYSFS_PLATFORMS -DPHYSFS_PLATFORM_UNIX=1 -DPHYSFS_PLATFORM_POSIX=1
296- #PLATFORM_DEFINES += -Dpthread_t=Thread -Dpthread_mutex_t=Mutex -Dpthread_mutexattr_t='void*' -Dpthread_attr_t=int -Dpthread_cond_t=CondVar -Dpthread_condattr_t='int' -D_SYS__PTHREADTYPES_H_
288+ CFLAGS += $(INCDIRS)
289+ CFLAGS += $(INCLUDE) -D__SWITCH__ -DHAVE_LIBNX
290+ # Replaced -fno-rtti -fno-exceptions with -fexceptions, using C++14
291+ CXXFLAGS := $(ASFLAGS) $(CFLAGS) -fexceptions -std=c++14
292+ CFLAGS += -std=gnu11
293+ PLATFORM_DEFINES += -DARM -march=armv8-a -mtune=cortex-a57 -mtp=soft
294+ STATIC_LINKING = 1
295+ #PLATFORM_DEFINES += -D_INCL_PHYSFS_PLATFORMS -DPHYSFS_PLATFORM_UNIX=1 -DPHYSFS_PLATFORM_POSIX=1
296+ #PLATFORM_DEFINES += -Dpthread_t=Thread -Dpthread_mutex_t=Mutex -Dpthread_mutexattr_t='void*' -Dpthread_attr_t=int -Dpthread_cond_t=CondVar -Dpthread_condattr_t='int' -D_SYS__PTHREADTYPES_H_
297297
298298# ARM
299299else ifneq (,$(findstring armv,$(platform)))
0 commit comments