Manually merge files

2019-06-29 16:26:03 +02:00
parent d4e1da0174 4b341e039a
commit 8168d2c2f9
54 changed files with 2703 additions and 88 deletions
--- a/sysmodules/rosalina/Makefile
+++ b/sysmodules/rosalina/Makefile
@@ -28,7 +28,7 @@ INCLUDES	:=	include include/gdb include/menus include/redshift
 ARCH	:=	-march=armv6k -mtune=mpcore -mfloat-abi=hard -mtp=soft
 DEFINES :=	-DARM11 -D_3DS

-CFLAGS	:=	-g -std=gnu11 -Wall -Wextra -Werror -O2 -mword-relocations \
+CFLAGS	:=	-g -std=gnu11 -Wall -Wextra -O2 -mword-relocations \
 			-fomit-frame-pointer -ffunction-sections -fdata-sections \
 			$(ARCH) $(DEFINES)