diff --git a/.gitignore b/.gitignore index 09489ef..08254ac 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,5 @@ C/build/ *.ppg *.smdh *.elf +.vscode/settings.json +/3DSsource/compile_commands.json diff --git a/3DSsource/3DSController.3ds b/3DSsource/3DSController-NG.3ds similarity index 99% rename from 3DSsource/3DSController.3ds rename to 3DSsource/3DSController-NG.3ds index fff88ad..25361aa 100644 Binary files a/3DSsource/3DSController.3ds and b/3DSsource/3DSController-NG.3ds differ diff --git a/3DSsource/3DSController.3dsx b/3DSsource/3DSController-NG.3dsx similarity index 100% rename from 3DSsource/3DSController.3dsx rename to 3DSsource/3DSController-NG.3dsx diff --git a/3DSsource/3DSController.cia b/3DSsource/3DSController-NG.cia similarity index 99% rename from 3DSsource/3DSController.cia rename to 3DSsource/3DSController-NG.cia index d2b6a8d..07d4e61 100644 Binary files a/3DSsource/3DSController.cia and b/3DSsource/3DSController-NG.cia differ diff --git a/3DSsource/3DSController.elf b/3DSsource/3DSController.elf deleted file mode 100755 index 4f4773d..0000000 Binary files a/3DSsource/3DSController.elf and /dev/null differ diff --git a/3DSsource/3DSController.smdh b/3DSsource/3DSController.smdh deleted file mode 100644 index cefd80c..0000000 Binary files a/3DSsource/3DSController.smdh and /dev/null differ diff --git a/3DSsource/3DSControllerstripped.elf b/3DSsource/3DSControllerstripped.elf deleted file mode 100755 index 899c37b..0000000 Binary files a/3DSsource/3DSControllerstripped.elf and /dev/null differ diff --git a/3DSsource/Makefile b/3DSsource/Makefile index 60a8993..2a970ef 100644 --- a/3DSsource/Makefile +++ b/3DSsource/Makefile @@ -26,7 +26,7 @@ include $(DEVKITARM)/3ds_rules # - icon.png # - /default_icon.png #--------------------------------------------------------------------------------- -TARGET := 3DSController +TARGET := 3DSController-NG BUILD := build SOURCES := source DATA := data diff --git a/3DSsource/compile_commands.json b/3DSsource/compile_commands.json index dd1e027..9618c84 100644 --- a/3DSsource/compile_commands.json +++ b/3DSsource/compile_commands.json @@ -12,19 +12,18 @@ "-march=armv6k", "-mtune=mpcore", "-mfloat-abi=hard", - "-I/home/user/3DSController/3DS/include", + "-I/home/fijxu/Documents/gitperomio/3DSController/3DSsource/include", "-I/opt/devkitpro/libctru/include", - "-I/home/user/3DSController/3DS/build", - "-I/opt/devkitpro/devkitARM/arm-none-eabi/include/", + "-I/home/fijxu/Documents/gitperomio/3DSController/3DSsource/build", "-D__3DS__", "-c", "-o", "drawing.o", - "/home/user/3DSController/3DS/source/drawing.c" + "/home/fijxu/Documents/gitperomio/3DSController/3DSsource/source/drawing.c" ], - "directory": "/home/user/3DSController/3DS/build", - "file": "/home/user/3DSController/3DS/source/drawing.c", - "output": "/home/user/3DSController/3DS/build/drawing.o" + "directory": "/home/fijxu/Documents/gitperomio/3DSController/3DSsource/build", + "file": "/home/fijxu/Documents/gitperomio/3DSController/3DSsource/source/drawing.c", + "output": "/home/fijxu/Documents/gitperomio/3DSController/3DSsource/build/drawing.o" }, { "arguments": [ @@ -39,18 +38,18 @@ "-march=armv6k", "-mtune=mpcore", "-mfloat-abi=hard", - "-I/home/user/3DSController/3DS/include", + "-I/home/fijxu/Documents/gitperomio/3DSController/3DSsource/include", "-I/opt/devkitpro/libctru/include", - "-I/home/user/3DSController/3DS/build", + "-I/home/fijxu/Documents/gitperomio/3DSController/3DSsource/build", "-D__3DS__", "-c", "-o", "inet_pton.o", - "/home/user/3DSController/3DS/source/inet_pton.c" + "/home/fijxu/Documents/gitperomio/3DSController/3DSsource/source/inet_pton.c" ], - "directory": "/home/user/3DSController/3DS/build", - "file": "/home/user/3DSController/3DS/source/inet_pton.c", - "output": "/home/user/3DSController/3DS/build/inet_pton.o" + "directory": "/home/fijxu/Documents/gitperomio/3DSController/3DSsource/build", + "file": "/home/fijxu/Documents/gitperomio/3DSController/3DSsource/source/inet_pton.c", + "output": "/home/fijxu/Documents/gitperomio/3DSController/3DSsource/build/inet_pton.o" }, { "arguments": [ @@ -65,18 +64,18 @@ "-march=armv6k", "-mtune=mpcore", "-mfloat-abi=hard", - "-I/home/user/3DSController/3DS/include", + "-I/home/fijxu/Documents/gitperomio/3DSController/3DSsource/include", "-I/opt/devkitpro/libctru/include", - "-I/home/user/3DSController/3DS/build", + "-I/home/fijxu/Documents/gitperomio/3DSController/3DSsource/build", "-D__3DS__", "-c", "-o", "input.o", - "/home/user/3DSController/3DS/source/input.c" + "/home/fijxu/Documents/gitperomio/3DSController/3DSsource/source/input.c" ], - "directory": "/home/user/3DSController/3DS/build", - "file": "/home/user/3DSController/3DS/source/input.c", - "output": "/home/user/3DSController/3DS/build/input.o" + "directory": "/home/fijxu/Documents/gitperomio/3DSController/3DSsource/build", + "file": "/home/fijxu/Documents/gitperomio/3DSController/3DSsource/source/input.c", + "output": "/home/fijxu/Documents/gitperomio/3DSController/3DSsource/build/input.o" }, { "arguments": [ @@ -91,18 +90,18 @@ "-march=armv6k", "-mtune=mpcore", "-mfloat-abi=hard", - "-I/home/user/3DSController/3DS/include", + "-I/home/fijxu/Documents/gitperomio/3DSController/3DSsource/include", "-I/opt/devkitpro/libctru/include", - "-I/home/user/3DSController/3DS/build", + "-I/home/fijxu/Documents/gitperomio/3DSController/3DSsource/build", "-D__3DS__", "-c", "-o", "keyboard.o", - "/home/user/3DSController/3DS/source/keyboard.c" + "/home/fijxu/Documents/gitperomio/3DSController/3DSsource/source/keyboard.c" ], - "directory": "/home/user/3DSController/3DS/build", - "file": "/home/user/3DSController/3DS/source/keyboard.c", - "output": "/home/user/3DSController/3DS/build/keyboard.o" + "directory": "/home/fijxu/Documents/gitperomio/3DSController/3DSsource/build", + "file": "/home/fijxu/Documents/gitperomio/3DSController/3DSsource/source/keyboard.c", + "output": "/home/fijxu/Documents/gitperomio/3DSController/3DSsource/build/keyboard.o" }, { "arguments": [ @@ -117,18 +116,69 @@ "-march=armv6k", "-mtune=mpcore", "-mfloat-abi=hard", - "-I/home/user/3DSController/3DS/include", + "-I/home/fijxu/Documents/gitperomio/3DSController/3DSsource/include", "-I/opt/devkitpro/libctru/include", - "-I/home/user/3DSController/3DS/build", - "-I/opt/devkitpro/devkitARM/arm-none-eabi/include/", + "-I/home/fijxu/Documents/gitperomio/3DSController/3DSsource/build", "-D__3DS__", "-c", "-o", "main.o", - "/home/user/3DSController/3DS/source/main.c" + "/home/fijxu/Documents/gitperomio/3DSController/3DSsource/source/main.c" ], - "directory": "/home/user/3DSController/3DS/build", - "file": "/home/user/3DSController/3DS/source/main.c", - "output": "/home/user/3DSController/3DS/build/main.o" + "directory": "/home/fijxu/Documents/gitperomio/3DSController/3DSsource/build", + "file": "/home/fijxu/Documents/gitperomio/3DSController/3DSsource/source/main.c", + "output": "/home/fijxu/Documents/gitperomio/3DSController/3DSsource/build/main.o" + }, + { + "arguments": [ + "/opt/devkitpro/devkitARM/bin/arm-none-eabi-gcc", + "-g", + "-Wall", + "-O2", + "-mword-relocations", + "-fomit-frame-pointer", + "-ffast-math", + "-fms-extensions", + "-march=armv6k", + "-mtune=mpcore", + "-mfloat-abi=hard", + "-I/home/fijxu/Documents/gitperomio/3DSController/3DSsource/include", + "-I/opt/devkitpro/libctru/include", + "-I/home/fijxu/Documents/gitperomio/3DSController/3DSsource/build", + "-D__3DS__", + "-c", + "-o", + "settings.o", + "/home/fijxu/Documents/gitperomio/3DSController/3DSsource/source/settings.c" + ], + "directory": "/home/fijxu/Documents/gitperomio/3DSController/3DSsource/build", + "file": "/home/fijxu/Documents/gitperomio/3DSController/3DSsource/source/settings.c", + "output": "/home/fijxu/Documents/gitperomio/3DSController/3DSsource/build/settings.o" + }, + { + "arguments": [ + "/opt/devkitpro/devkitARM/bin/arm-none-eabi-gcc", + "-g", + "-Wall", + "-O2", + "-mword-relocations", + "-fomit-frame-pointer", + "-ffast-math", + "-fms-extensions", + "-march=armv6k", + "-mtune=mpcore", + "-mfloat-abi=hard", + "-I/home/fijxu/Documents/gitperomio/3DSController/3DSsource/include", + "-I/opt/devkitpro/libctru/include", + "-I/home/fijxu/Documents/gitperomio/3DSController/3DSsource/build", + "-D__3DS__", + "-c", + "-o", + "wireless.o", + "/home/fijxu/Documents/gitperomio/3DSController/3DSsource/source/wireless.c" + ], + "directory": "/home/fijxu/Documents/gitperomio/3DSController/3DSsource/build", + "file": "/home/fijxu/Documents/gitperomio/3DSController/3DSsource/source/wireless.c", + "output": "/home/fijxu/Documents/gitperomio/3DSController/3DSsource/build/wireless.o" } ]