* libndsfpc moved

git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@10038 3ad0048d-3df7-0310-abae-a5850022a9f2

151 files changed, 433 insertions, 86 deletions

diff --git a/packages/extra/libndsfpc/fpmake.inc b/packages/extra/libndsfpc/fpmake.inc
deleted file mode 100644
index 0432de4d86..0000000000
--- a/packages/extra/libndsfpc/fpmake.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-    StartPackage('libndsfpc');
-    {$IF defined(ALLPACKAGES)}
-    Directory:='extra/libndsfpc';
-    {$ELSEIF defined(EXTRAPACKAGES)}
-    Directory:='libndsfpc';
-    {$ENDIF}
-    OS:=[nds];
-    T:=Targets.AddUnit('nds7');
-    T:=Targets.AddUnit('nds9');
-    EndPackage;
diff --git a/packages/extra/libndsfpc/fpmake.pp b/packages/extra/libndsfpc/fpmake.pp
deleted file mode 100644
index 2ebb027e49..0000000000
--- a/packages/extra/libndsfpc/fpmake.pp
+++ /dev/null
@@ -1,16 +0,0 @@
-{$mode objfpc}{$H+}
-program fpmake;
-
-uses fpmkunit;
-
-Var
-  T : TTarget;
-
-begin
-  With Installer do 
-    begin
-    {$i fpmake.inc}
-    Run;
-    end;
-end.
-
diff --git a/packages/extra/libndsfpc/Makefile b/packages/libndsfpc/Makefile
index 1f97dd95c6..43930974ee 100644
--- a/packages/extra/libndsfpc/Makefile
+++ b/packages/libndsfpc/Makefile
@@ -1,11 +1,12 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2007/11/14]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/01/26]
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded
+MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded
 BSDs = freebsd netbsd openbsd darwin
 UNIXs = linux $(BSDs) solaris qnx
 LIMIT83fs = go32v2 os2 emx watcom
+OSNeedsComspecToRunBatch = go32v2 watcom
 FORCE:
 .PHONY: FORCE
 override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH)))
@@ -56,6 +57,11 @@ else
 SRCBATCHEXT=.bat
 endif
 endif
+ifdef COMSPEC
+ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),)
+RUNBATCH=$(COMSPEC) /C
+endif
+endif
 ifdef inUnix
 PATHSEP=/
 else
@@ -94,7 +100,7 @@ export ECHO
 endif
 override OS_TARGET_DEFAULT=nds
 override CPU_TARGET_DEFAULT=arm
-override DEFAULT_FPCDIR=../../..
+override DEFAULT_FPCDIR=../..
 ifndef FPC
 ifdef PP
 FPC=$(PP)
@@ -104,7 +110,11 @@ ifndef FPC
 FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(FPCPROG),)
 FPCPROG:=$(firstword $(FPCPROG))
+ifneq ($(CPU_TARGET),)
+FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB)
+else
 FPC:=$(shell $(FPCPROG) -PB)
+endif
 ifneq ($(findstring Error,$(FPC)),)
 override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH)))))
 endif
@@ -235,159 +245,483 @@ PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(F
 override PACKAGE_NAME=libndsfpc
 override PACKAGE_VERSION=0.1
 ifeq ($(FULL_TARGET),i386-linux)
-override TARGET_UNITS+=nds9 nds7 dswifi/dswifi9 dswifi/dswifi7 fat/fat fat/gbfs libmikmod/mikmod9 libmikmod/mikmod7
+override TARGET_UNITS+=nds9 nds7 dswifi9 dswifi7 fat gbfs mikmod9  mikmod7
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
-override TARGET_UNITS+=nds9 nds7 dswifi/dswifi9 dswifi/dswifi7 fat/fat fat/gbfs libmikmod/mikmod9 libmikmod/mikmod7
+override TARGET_UNITS+=nds9 nds7 dswifi9 dswifi7 fat gbfs mikmod9  mikmod7
 endif
 ifeq ($(FULL_TARGET),i386-win32)
-override TARGET_UNITS+=nds9 nds7 dswifi/dswifi9 dswifi/dswifi7 fat/fat fat/gbfs libmikmod/mikmod9 libmikmod/mikmod7
+override TARGET_UNITS+=nds9 nds7 dswifi9 dswifi7 fat gbfs mikmod9  mikmod7
 endif
 ifeq ($(FULL_TARGET),i386-os2)
-override TARGET_UNITS+=nds9 nds7 dswifi/dswifi9 dswifi/dswifi7 fat/fat fat/gbfs libmikmod/mikmod9 libmikmod/mikmod7
+override TARGET_UNITS+=nds9 nds7 dswifi9 dswifi7 fat gbfs mikmod9  mikmod7
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
-override TARGET_UNITS+=nds9 nds7 dswifi/dswifi9 dswifi/dswifi7 fat/fat fat/gbfs libmikmod/mikmod9 libmikmod/mikmod7
+override TARGET_UNITS+=nds9 nds7 dswifi9 dswifi7 fat gbfs mikmod9  mikmod7
 endif
 ifeq ($(FULL_TARGET),i386-beos)
-override TARGET_UNITS+=nds9 nds7 dswifi/dswifi9 dswifi/dswifi7 fat/fat fat/gbfs libmikmod/mikmod9 libmikmod/mikmod7
+override TARGET_UNITS+=nds9 nds7 dswifi9 dswifi7 fat gbfs mikmod9  mikmod7
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
-override TARGET_UNITS+=nds9 nds7 dswifi/dswifi9 dswifi/dswifi7 fat/fat fat/gbfs libmikmod/mikmod9 libmikmod/mikmod7
+override TARGET_UNITS+=nds9 nds7 dswifi9 dswifi7 fat gbfs mikmod9  mikmod7
 endif
 ifeq ($(FULL_TARGET),i386-solaris)
-override TARGET_UNITS+=nds9 nds7 dswifi/dswifi9 dswifi/dswifi7 fat/fat fat/gbfs libmikmod/mikmod9 libmikmod/mikmod7
+override TARGET_UNITS+=nds9 nds7 dswifi9 dswifi7 fat gbfs mikmod9  mikmod7
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
-override TARGET_UNITS+=nds9 nds7 dswifi/dswifi9 dswifi/dswifi7 fat/fat fat/gbfs libmikmod/mikmod9 libmikmod/mikmod7
+override TARGET_UNITS+=nds9 nds7 dswifi9 dswifi7 fat gbfs mikmod9  mikmod7
 endif
 ifeq ($(FULL_TARGET),i386-netware)
-override TARGET_UNITS+=nds9 nds7 dswifi/dswifi9 dswifi/dswifi7 fat/fat fat/gbfs libmikmod/mikmod9 libmikmod/mikmod7
+override TARGET_UNITS+=nds9 nds7 dswifi9 dswifi7 fat gbfs mikmod9  mikmod7
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
-override TARGET_UNITS+=nds9 nds7 dswifi/dswifi9 dswifi/dswifi7 fat/fat fat/gbfs libmikmod/mikmod9 libmikmod/mikmod7
+override TARGET_UNITS+=nds9 nds7 dswifi9 dswifi7 fat gbfs mikmod9  mikmod7
 endif
 ifeq ($(FULL_TARGET),i386-wdosx)
-override TARGET_UNITS+=nds9 nds7 dswifi/dswifi9 dswifi/dswifi7 fat/fat fat/gbfs libmikmod/mikmod9 libmikmod/mikmod7
+override TARGET_UNITS+=nds9 nds7 dswifi9 dswifi7 fat gbfs mikmod9  mikmod7
 endif
 ifeq ($(FULL_TARGET),i386-darwin)
-override TARGET_UNITS+=nds9 nds7 dswifi/dswifi9 dswifi/dswifi7 fat/fat fat/gbfs libmikmod/mikmod9 libmikmod/mikmod7
+override TARGET_UNITS+=nds9 nds7 dswifi9 dswifi7 fat gbfs mikmod9  mikmod7
 endif
 ifeq ($(FULL_TARGET),i386-emx)
-override TARGET_UNITS+=nds9 nds7 dswifi/dswifi9 dswifi/dswifi7 fat/fat fat/gbfs libmikmod/mikmod9 libmikmod/mikmod7
+override TARGET_UNITS+=nds9 nds7 dswifi9 dswifi7 fat gbfs mikmod9  mikmod7
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
-override TARGET_UNITS+=nds9 nds7 dswifi/dswifi9 dswifi/dswifi7 fat/fat fat/gbfs libmikmod/mikmod9 libmikmod/mikmod7
+override TARGET_UNITS+=nds9 nds7 dswifi9 dswifi7 fat gbfs mikmod9  mikmod7
 endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
-override TARGET_UNITS+=nds9 nds7 dswifi/dswifi9 dswifi/dswifi7 fat/fat fat/gbfs libmikmod/mikmod9 libmikmod/mikmod7
+override TARGET_UNITS+=nds9 nds7 dswifi9 dswifi7 fat gbfs mikmod9  mikmod7
 endif
 ifeq ($(FULL_TARGET),i386-wince)
-override TARGET_UNITS+=nds9 nds7 dswifi/dswifi9 dswifi/dswifi7 fat/fat fat/gbfs libmikmod/mikmod9 libmikmod/mikmod7
+override TARGET_UNITS+=nds9 nds7 dswifi9 dswifi7 fat gbfs mikmod9  mikmod7
 endif
 ifeq ($(FULL_TARGET),i386-embedded)
-override TARGET_UNITS+=nds9 nds7 dswifi/dswifi9 dswifi/dswifi7 fat/fat fat/gbfs libmikmod/mikmod9 libmikmod/mikmod7
+override TARGET_UNITS+=nds9 nds7 dswifi9 dswifi7 fat gbfs mikmod9  mikmod7
 endif
 ifeq ($(FULL_TARGET),i386-symbian)
-override TARGET_UNITS+=nds9 nds7 dswifi/dswifi9 dswifi/dswifi7 fat/fat fat/gbfs libmikmod/mikmod9 libmikmod/mikmod7
+override TARGET_UNITS+=nds9 nds7 dswifi9 dswifi7 fat gbfs mikmod9  mikmod7
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
-override TARGET_UNITS+=nds9 nds7 dswifi/dswifi9 dswifi/dswifi7 fat/fat fat/gbfs libmikmod/mikmod9 libmikmod/mikmod7
+override TARGET_UNITS+=nds9 nds7 dswifi9 dswifi7 fat gbfs mikmod9  mikmod7
 endif
 ifeq ($(FULL_TARGET),m68k-freebsd)
-override TARGET_UNITS+=nds9 nds7 dswifi/dswifi9 dswifi/dswifi7 fat/fat fat/gbfs libmikmod/mikmod9 libmikmod/mikmod7
+override TARGET_UNITS+=nds9 nds7 dswifi9 dswifi7 fat gbfs mikmod9  mikmod7
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
-override TARGET_UNITS+=nds9 nds7 dswifi/dswifi9 dswifi/dswifi7 fat/fat fat/gbfs libmikmod/mikmod9 libmikmod/mikmod7
+override TARGET_UNITS+=nds9 nds7 dswifi9 dswifi7 fat gbfs mikmod9  mikmod7
 endif
 ifeq ($(FULL_TARGET),m68k-amiga)
-override TARGET_UNITS+=nds9 nds7 dswifi/dswifi9 dswifi/dswifi7 fat/fat fat/gbfs libmikmod/mikmod9 libmikmod/mikmod7
+override TARGET_UNITS+=nds9 nds7 dswifi9 dswifi7 fat gbfs mikmod9  mikmod7
 endif
 ifeq ($(FULL_TARGET),m68k-atari)
-override TARGET_UNITS+=nds9 nds7 dswifi/dswifi9 dswifi/dswifi7 fat/fat fat/gbfs libmikmod/mikmod9 libmikmod/mikmod7
+override TARGET_UNITS+=nds9 nds7 dswifi9 dswifi7 fat gbfs mikmod9  mikmod7
 endif
 ifeq ($(FULL_TARGET),m68k-openbsd)
-override TARGET_UNITS+=nds9 nds7 dswifi/dswifi9 dswifi/dswifi7 fat/fat fat/gbfs libmikmod/mikmod9 libmikmod/mikmod7
+override TARGET_UNITS+=nds9 nds7 dswifi9 dswifi7 fat gbfs mikmod9  mikmod7
 endif
 ifeq ($(FULL_TARGET),m68k-palmos)
-override TARGET_UNITS+=nds9 nds7 dswifi/dswifi9 dswifi/dswifi7 fat/fat fat/gbfs libmikmod/mikmod9 libmikmod/mikmod7
+override TARGET_UNITS+=nds9 nds7 dswifi9 dswifi7 fat gbfs mikmod9  mikmod7
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
-override TARGET_UNITS+=nds9 nds7 dswifi/dswifi9 dswifi/dswifi7 fat/fat fat/gbfs libmikmod/mikmod9 libmikmod/mikmod7
+override TARGET_UNITS+=nds9 nds7 dswifi9 dswifi7 fat gbfs mikmod9  mikmod7
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
-override TARGET_UNITS+=nds9 nds7 dswifi/dswifi9 dswifi/dswifi7 fat/fat fat/gbfs libmikmod/mikmod9 libmikmod/mikmod7
+override TARGET_UNITS+=nds9 nds7 dswifi9 dswifi7 fat gbfs mikmod9  mikmod7
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
-override TARGET_UNITS+=nds9 nds7 dswifi/dswifi9 dswifi/dswifi7 fat/fat fat/gbfs libmikmod/mikmod9 libmikmod/mikmod7
+override TARGET_UNITS+=nds9 nds7 dswifi9 dswifi7 fat gbfs mikmod9  mikmod7
 endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
-override TARGET_UNITS+=nds9 nds7 dswifi/dswifi9 dswifi/dswifi7 fat/fat fat/gbfs libmikmod/mikmod9 libmikmod/mikmod7
+override TARGET_UNITS+=nds9 nds7 dswifi9 dswifi7 fat gbfs mikmod9  mikmod7
 endif
 ifeq ($(FULL_TARGET),powerpc-macos)
-override TARGET_UNITS+=nds9 nds7 dswifi/dswifi9 dswifi/dswifi7 fat/fat fat/gbfs libmikmod/mikmod9 libmikmod/mikmod7
+override TARGET_UNITS+=nds9 nds7 dswifi9 dswifi7 fat gbfs mikmod9  mikmod7
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
-override TARGET_UNITS+=nds9 nds7 dswifi/dswifi9 dswifi/dswifi7 fat/fat fat/gbfs libmikmod/mikmod9 libmikmod/mikmod7
+override TARGET_UNITS+=nds9 nds7 dswifi9 dswifi7 fat gbfs mikmod9  mikmod7
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
-override TARGET_UNITS+=nds9 nds7 dswifi/dswifi9 dswifi/dswifi7 fat/fat fat/gbfs libmikmod/mikmod9 libmikmod/mikmod7
+override TARGET_UNITS+=nds9 nds7 dswifi9 dswifi7 fat gbfs mikmod9  mikmod7
 endif
 ifeq ($(FULL_TARGET),powerpc-embedded)
-override TARGET_UNITS+=nds9 nds7 dswifi/dswifi9 dswifi/dswifi7 fat/fat fat/gbfs libmikmod/mikmod9 libmikmod/mikmod7
+override TARGET_UNITS+=nds9 nds7 dswifi9 dswifi7 fat gbfs mikmod9  mikmod7
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
-override TARGET_UNITS+=nds9 nds7 dswifi/dswifi9 dswifi/dswifi7 fat/fat fat/gbfs libmikmod/mikmod9 libmikmod/mikmod7
+override TARGET_UNITS+=nds9 nds7 dswifi9 dswifi7 fat gbfs mikmod9  mikmod7
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
-override TARGET_UNITS+=nds9 nds7 dswifi/dswifi9 dswifi/dswifi7 fat/fat fat/gbfs libmikmod/mikmod9 libmikmod/mikmod7
+override TARGET_UNITS+=nds9 nds7 dswifi9 dswifi7 fat gbfs mikmod9  mikmod7
 endif
 ifeq ($(FULL_TARGET),sparc-solaris)
-override TARGET_UNITS+=nds9 nds7 dswifi/dswifi9 dswifi/dswifi7 fat/fat fat/gbfs libmikmod/mikmod9 libmikmod/mikmod7
+override TARGET_UNITS+=nds9 nds7 dswifi9 dswifi7 fat gbfs mikmod9  mikmod7
 endif
 ifeq ($(FULL_TARGET),sparc-embedded)
-override TARGET_UNITS+=nds9 nds7 dswifi/dswifi9 dswifi/dswifi7 fat/fat fat/gbfs libmikmod/mikmod9 libmikmod/mikmod7
+override TARGET_UNITS+=nds9 nds7 dswifi9 dswifi7 fat gbfs mikmod9  mikmod7
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
-override TARGET_UNITS+=nds9 nds7 dswifi/dswifi9 dswifi/dswifi7 fat/fat fat/gbfs libmikmod/mikmod9 libmikmod/mikmod7
+override TARGET_UNITS+=nds9 nds7 dswifi9 dswifi7 fat gbfs mikmod9  mikmod7
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
-override TARGET_UNITS+=nds9 nds7 dswifi/dswifi9 dswifi/dswifi7 fat/fat fat/gbfs libmikmod/mikmod9 libmikmod/mikmod7
+override TARGET_UNITS+=nds9 nds7 dswifi9 dswifi7 fat gbfs mikmod9  mikmod7
+endif
+ifeq ($(FULL_TARGET),x86_64-darwin)
+override TARGET_UNITS+=nds9 nds7 dswifi9 dswifi7 fat gbfs mikmod9  mikmod7
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
-override TARGET_UNITS+=nds9 nds7 dswifi/dswifi9 dswifi/dswifi7 fat/fat fat/gbfs libmikmod/mikmod9 libmikmod/mikmod7
+override TARGET_UNITS+=nds9 nds7 dswifi9 dswifi7 fat gbfs mikmod9  mikmod7
 endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
-override TARGET_UNITS+=nds9 nds7 dswifi/dswifi9 dswifi/dswifi7 fat/fat fat/gbfs libmikmod/mikmod9 libmikmod/mikmod7
+override TARGET_UNITS+=nds9 nds7 dswifi9 dswifi7 fat gbfs mikmod9  mikmod7
 endif
 ifeq ($(FULL_TARGET),arm-linux)
-override TARGET_UNITS+=nds9 nds7 dswifi/dswifi9 dswifi/dswifi7 fat/fat fat/gbfs libmikmod/mikmod9 libmikmod/mikmod7
+override TARGET_UNITS+=nds9 nds7 dswifi9 dswifi7 fat gbfs mikmod9  mikmod7
 endif
 ifeq ($(FULL_TARGET),arm-palmos)
-override TARGET_UNITS+=nds9 nds7 dswifi/dswifi9 dswifi/dswifi7 fat/fat fat/gbfs libmikmod/mikmod9 libmikmod/mikmod7
+override TARGET_UNITS+=nds9 nds7 dswifi9 dswifi7 fat gbfs mikmod9  mikmod7
 endif
 ifeq ($(FULL_TARGET),arm-wince)
-override TARGET_UNITS+=nds9 nds7 dswifi/dswifi9 dswifi/dswifi7 fat/fat fat/gbfs libmikmod/mikmod9 libmikmod/mikmod7
+override TARGET_UNITS+=nds9 nds7 dswifi9 dswifi7 fat gbfs mikmod9  mikmod7
 endif
 ifeq ($(FULL_TARGET),arm-gba)
-override TARGET_UNITS+=nds9 nds7 dswifi/dswifi9 dswifi/dswifi7 fat/fat fat/gbfs libmikmod/mikmod9 libmikmod/mikmod7
+override TARGET_UNITS+=nds9 nds7 dswifi9 dswifi7 fat gbfs mikmod9  mikmod7
 endif
 ifeq ($(FULL_TARGET),arm-nds)
-override TARGET_UNITS+=nds9 nds7 dswifi/dswifi9 dswifi/dswifi7 fat/fat fat/gbfs libmikmod/mikmod9 libmikmod/mikmod7
+override TARGET_UNITS+=nds9 nds7 dswifi9 dswifi7 fat gbfs mikmod9  mikmod7
 endif
 ifeq ($(FULL_TARGET),arm-embedded)
-override TARGET_UNITS+=nds9 nds7 dswifi/dswifi9 dswifi/dswifi7 fat/fat fat/gbfs libmikmod/mikmod9 libmikmod/mikmod7
+override TARGET_UNITS+=nds9 nds7 dswifi9 dswifi7 fat gbfs mikmod9  mikmod7
 endif
 ifeq ($(FULL_TARGET),arm-symbian)
-override TARGET_UNITS+=nds9 nds7 dswifi/dswifi9 dswifi/dswifi7 fat/fat fat/gbfs libmikmod/mikmod9 libmikmod/mikmod7
+override TARGET_UNITS+=nds9 nds7 dswifi9 dswifi7 fat gbfs mikmod9  mikmod7
 endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
-override TARGET_UNITS+=nds9 nds7 dswifi/dswifi9 dswifi/dswifi7 fat/fat fat/gbfs libmikmod/mikmod9 libmikmod/mikmod7
+override TARGET_UNITS+=nds9 nds7 dswifi9 dswifi7 fat gbfs mikmod9  mikmod7
+endif
+ifeq ($(FULL_TARGET),powerpc64-darwin)
+override TARGET_UNITS+=nds9 nds7 dswifi9 dswifi7 fat gbfs mikmod9  mikmod7
 endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
-override TARGET_UNITS+=nds9 nds7 dswifi/dswifi9 dswifi/dswifi7 fat/fat fat/gbfs libmikmod/mikmod9 libmikmod/mikmod7
+override TARGET_UNITS+=nds9 nds7 dswifi9 dswifi7 fat gbfs mikmod9  mikmod7
 endif
 override INSTALL_FPCPACKAGE=y
+ifeq ($(FULL_TARGET),i386-linux)
+override COMPILER_INCLUDEDIR+=src src/dswifi src/fat src/libmikmod
+endif
+ifeq ($(FULL_TARGET),i386-go32v2)
+override COMPILER_INCLUDEDIR+=src src/dswifi src/fat src/libmikmod
+endif
+ifeq ($(FULL_TARGET),i386-win32)
+override COMPILER_INCLUDEDIR+=src src/dswifi src/fat src/libmikmod
+endif
+ifeq ($(FULL_TARGET),i386-os2)
+override COMPILER_INCLUDEDIR+=src src/dswifi src/fat src/libmikmod
+endif
+ifeq ($(FULL_TARGET),i386-freebsd)
+override COMPILER_INCLUDEDIR+=src src/dswifi src/fat src/libmikmod
+endif
+ifeq ($(FULL_TARGET),i386-beos)
+override COMPILER_INCLUDEDIR+=src src/dswifi src/fat src/libmikmod
+endif
+ifeq ($(FULL_TARGET),i386-netbsd)
+override COMPILER_INCLUDEDIR+=src src/dswifi src/fat src/libmikmod
+endif
+ifeq ($(FULL_TARGET),i386-solaris)
+override COMPILER_INCLUDEDIR+=src src/dswifi src/fat src/libmikmod
+endif
+ifeq ($(FULL_TARGET),i386-qnx)
+override COMPILER_INCLUDEDIR+=src src/dswifi src/fat src/libmikmod
+endif
+ifeq ($(FULL_TARGET),i386-netware)
+override COMPILER_INCLUDEDIR+=src src/dswifi src/fat src/libmikmod
+endif
+ifeq ($(FULL_TARGET),i386-openbsd)
+override COMPILER_INCLUDEDIR+=src src/dswifi src/fat src/libmikmod
+endif
+ifeq ($(FULL_TARGET),i386-wdosx)
+override COMPILER_INCLUDEDIR+=src src/dswifi src/fat src/libmikmod
+endif
+ifeq ($(FULL_TARGET),i386-darwin)
+override COMPILER_INCLUDEDIR+=src src/dswifi src/fat src/libmikmod
+endif
+ifeq ($(FULL_TARGET),i386-emx)
+override COMPILER_INCLUDEDIR+=src src/dswifi src/fat src/libmikmod
+endif
+ifeq ($(FULL_TARGET),i386-watcom)
+override COMPILER_INCLUDEDIR+=src src/dswifi src/fat src/libmikmod
+endif
+ifeq ($(FULL_TARGET),i386-netwlibc)
+override COMPILER_INCLUDEDIR+=src src/dswifi src/fat src/libmikmod
+endif
+ifeq ($(FULL_TARGET),i386-wince)
+override COMPILER_INCLUDEDIR+=src src/dswifi src/fat src/libmikmod
+endif
+ifeq ($(FULL_TARGET),i386-embedded)
+override COMPILER_INCLUDEDIR+=src src/dswifi src/fat src/libmikmod
+endif
+ifeq ($(FULL_TARGET),i386-symbian)
+override COMPILER_INCLUDEDIR+=src src/dswifi src/fat src/libmikmod
+endif
+ifeq ($(FULL_TARGET),m68k-linux)
+override COMPILER_INCLUDEDIR+=src src/dswifi src/fat src/libmikmod
+endif
+ifeq ($(FULL_TARGET),m68k-freebsd)
+override COMPILER_INCLUDEDIR+=src src/dswifi src/fat src/libmikmod
+endif
+ifeq ($(FULL_TARGET),m68k-netbsd)
+override COMPILER_INCLUDEDIR+=src src/dswifi src/fat src/libmikmod
+endif
+ifeq ($(FULL_TARGET),m68k-amiga)
+override COMPILER_INCLUDEDIR+=src src/dswifi src/fat src/libmikmod
+endif
+ifeq ($(FULL_TARGET),m68k-atari)
+override COMPILER_INCLUDEDIR+=src src/dswifi src/fat src/libmikmod
+endif
+ifeq ($(FULL_TARGET),m68k-openbsd)
+override COMPILER_INCLUDEDIR+=src src/dswifi src/fat src/libmikmod
+endif
+ifeq ($(FULL_TARGET),m68k-palmos)
+override COMPILER_INCLUDEDIR+=src src/dswifi src/fat src/libmikmod
+endif
+ifeq ($(FULL_TARGET),m68k-embedded)
+override COMPILER_INCLUDEDIR+=src src/dswifi src/fat src/libmikmod
+endif
+ifeq ($(FULL_TARGET),powerpc-linux)
+override COMPILER_INCLUDEDIR+=src src/dswifi src/fat src/libmikmod
+endif
+ifeq ($(FULL_TARGET),powerpc-netbsd)
+override COMPILER_INCLUDEDIR+=src src/dswifi src/fat src/libmikmod
+endif
+ifeq ($(FULL_TARGET),powerpc-amiga)
+override COMPILER_INCLUDEDIR+=src src/dswifi src/fat src/libmikmod
+endif
+ifeq ($(FULL_TARGET),powerpc-macos)
+override COMPILER_INCLUDEDIR+=src src/dswifi src/fat src/libmikmod
+endif
+ifeq ($(FULL_TARGET),powerpc-darwin)
+override COMPILER_INCLUDEDIR+=src src/dswifi src/fat src/libmikmod
+endif
+ifeq ($(FULL_TARGET),powerpc-morphos)
+override COMPILER_INCLUDEDIR+=src src/dswifi src/fat src/libmikmod
+endif
+ifeq ($(FULL_TARGET),powerpc-embedded)
+override COMPILER_INCLUDEDIR+=src src/dswifi src/fat src/libmikmod
+endif
+ifeq ($(FULL_TARGET),sparc-linux)
+override COMPILER_INCLUDEDIR+=src src/dswifi src/fat src/libmikmod
+endif
+ifeq ($(FULL_TARGET),sparc-netbsd)
+override COMPILER_INCLUDEDIR+=src src/dswifi src/fat src/libmikmod
+endif
+ifeq ($(FULL_TARGET),sparc-solaris)
+override COMPILER_INCLUDEDIR+=src src/dswifi src/fat src/libmikmod
+endif
+ifeq ($(FULL_TARGET),sparc-embedded)
+override COMPILER_INCLUDEDIR+=src src/dswifi src/fat src/libmikmod
+endif
+ifeq ($(FULL_TARGET),x86_64-linux)
+override COMPILER_INCLUDEDIR+=src src/dswifi src/fat src/libmikmod
+endif
+ifeq ($(FULL_TARGET),x86_64-freebsd)
+override COMPILER_INCLUDEDIR+=src src/dswifi src/fat src/libmikmod
+endif
+ifeq ($(FULL_TARGET),x86_64-darwin)
+override COMPILER_INCLUDEDIR+=src src/dswifi src/fat src/libmikmod
+endif
+ifeq ($(FULL_TARGET),x86_64-win64)
+override COMPILER_INCLUDEDIR+=src src/dswifi src/fat src/libmikmod
+endif
+ifeq ($(FULL_TARGET),x86_64-embedded)
+override COMPILER_INCLUDEDIR+=src src/dswifi src/fat src/libmikmod
+endif
+ifeq ($(FULL_TARGET),arm-linux)
+override COMPILER_INCLUDEDIR+=src src/dswifi src/fat src/libmikmod
+endif
+ifeq ($(FULL_TARGET),arm-palmos)
+override COMPILER_INCLUDEDIR+=src src/dswifi src/fat src/libmikmod
+endif
+ifeq ($(FULL_TARGET),arm-wince)
+override COMPILER_INCLUDEDIR+=src src/dswifi src/fat src/libmikmod
+endif
+ifeq ($(FULL_TARGET),arm-gba)
+override COMPILER_INCLUDEDIR+=src src/dswifi src/fat src/libmikmod
+endif
+ifeq ($(FULL_TARGET),arm-nds)
+override COMPILER_INCLUDEDIR+=src src/dswifi src/fat src/libmikmod
+endif
+ifeq ($(FULL_TARGET),arm-embedded)
+override COMPILER_INCLUDEDIR+=src src/dswifi src/fat src/libmikmod
+endif
+ifeq ($(FULL_TARGET),arm-symbian)
+override COMPILER_INCLUDEDIR+=src src/dswifi src/fat src/libmikmod
+endif
+ifeq ($(FULL_TARGET),powerpc64-linux)
+override COMPILER_INCLUDEDIR+=src src/dswifi src/fat src/libmikmod
+endif
+ifeq ($(FULL_TARGET),powerpc64-darwin)
+override COMPILER_INCLUDEDIR+=src src/dswifi src/fat src/libmikmod
+endif
+ifeq ($(FULL_TARGET),powerpc64-embedded)
+override COMPILER_INCLUDEDIR+=src src/dswifi src/fat src/libmikmod
+endif
+ifeq ($(FULL_TARGET),i386-linux)
+override COMPILER_SOURCEDIR+=src tests
+endif
+ifeq ($(FULL_TARGET),i386-go32v2)
+override COMPILER_SOURCEDIR+=src tests
+endif
+ifeq ($(FULL_TARGET),i386-win32)
+override COMPILER_SOURCEDIR+=src tests
+endif
+ifeq ($(FULL_TARGET),i386-os2)
+override COMPILER_SOURCEDIR+=src tests
+endif
+ifeq ($(FULL_TARGET),i386-freebsd)
+override COMPILER_SOURCEDIR+=src tests
+endif
+ifeq ($(FULL_TARGET),i386-beos)
+override COMPILER_SOURCEDIR+=src tests
+endif
+ifeq ($(FULL_TARGET),i386-netbsd)
+override COMPILER_SOURCEDIR+=src tests
+endif
+ifeq ($(FULL_TARGET),i386-solaris)
+override COMPILER_SOURCEDIR+=src tests
+endif
+ifeq ($(FULL_TARGET),i386-qnx)
+override COMPILER_SOURCEDIR+=src tests
+endif
+ifeq ($(FULL_TARGET),i386-netware)
+override COMPILER_SOURCEDIR+=src tests
+endif
+ifeq ($(FULL_TARGET),i386-openbsd)
+override COMPILER_SOURCEDIR+=src tests
+endif
+ifeq ($(FULL_TARGET),i386-wdosx)
+override COMPILER_SOURCEDIR+=src tests
+endif
+ifeq ($(FULL_TARGET),i386-darwin)
+override COMPILER_SOURCEDIR+=src tests
+endif
+ifeq ($(FULL_TARGET),i386-emx)
+override COMPILER_SOURCEDIR+=src tests
+endif
+ifeq ($(FULL_TARGET),i386-watcom)
+override COMPILER_SOURCEDIR+=src tests
+endif
+ifeq ($(FULL_TARGET),i386-netwlibc)
+override COMPILER_SOURCEDIR+=src tests
+endif
+ifeq ($(FULL_TARGET),i386-wince)
+override COMPILER_SOURCEDIR+=src tests
+endif
+ifeq ($(FULL_TARGET),i386-embedded)
+override COMPILER_SOURCEDIR+=src tests
+endif
+ifeq ($(FULL_TARGET),i386-symbian)
+override COMPILER_SOURCEDIR+=src tests
+endif
+ifeq ($(FULL_TARGET),m68k-linux)
+override COMPILER_SOURCEDIR+=src tests
+endif
+ifeq ($(FULL_TARGET),m68k-freebsd)
+override COMPILER_SOURCEDIR+=src tests
+endif
+ifeq ($(FULL_TARGET),m68k-netbsd)
+override COMPILER_SOURCEDIR+=src tests
+endif
+ifeq ($(FULL_TARGET),m68k-amiga)
+override COMPILER_SOURCEDIR+=src tests
+endif
+ifeq ($(FULL_TARGET),m68k-atari)
+override COMPILER_SOURCEDIR+=src tests
+endif
+ifeq ($(FULL_TARGET),m68k-openbsd)
+override COMPILER_SOURCEDIR+=src tests
+endif
+ifeq ($(FULL_TARGET),m68k-palmos)
+override COMPILER_SOURCEDIR+=src tests
+endif
+ifeq ($(FULL_TARGET),m68k-embedded)
+override COMPILER_SOURCEDIR+=src tests
+endif
+ifeq ($(FULL_TARGET),powerpc-linux)
+override COMPILER_SOURCEDIR+=src tests
+endif
+ifeq ($(FULL_TARGET),powerpc-netbsd)
+override COMPILER_SOURCEDIR+=src tests
+endif
+ifeq ($(FULL_TARGET),powerpc-amiga)
+override COMPILER_SOURCEDIR+=src tests
+endif
+ifeq ($(FULL_TARGET),powerpc-macos)
+override COMPILER_SOURCEDIR+=src tests
+endif
+ifeq ($(FULL_TARGET),powerpc-darwin)
+override COMPILER_SOURCEDIR+=src tests
+endif
+ifeq ($(FULL_TARGET),powerpc-morphos)
+override COMPILER_SOURCEDIR+=src tests
+endif
+ifeq ($(FULL_TARGET),powerpc-embedded)
+override COMPILER_SOURCEDIR+=src tests
+endif
+ifeq ($(FULL_TARGET),sparc-linux)
+override COMPILER_SOURCEDIR+=src tests
+endif
+ifeq ($(FULL_TARGET),sparc-netbsd)
+override COMPILER_SOURCEDIR+=src tests
+endif
+ifeq ($(FULL_TARGET),sparc-solaris)
+override COMPILER_SOURCEDIR+=src tests
+endif
+ifeq ($(FULL_TARGET),sparc-embedded)
+override COMPILER_SOURCEDIR+=src tests
+endif
+ifeq ($(FULL_TARGET),x86_64-linux)
+override COMPILER_SOURCEDIR+=src tests
+endif
+ifeq ($(FULL_TARGET),x86_64-freebsd)
+override COMPILER_SOURCEDIR+=src tests
+endif
+ifeq ($(FULL_TARGET),x86_64-darwin)
+override COMPILER_SOURCEDIR+=src tests
+endif
+ifeq ($(FULL_TARGET),x86_64-win64)
+override COMPILER_SOURCEDIR+=src tests
+endif
+ifeq ($(FULL_TARGET),x86_64-embedded)
+override COMPILER_SOURCEDIR+=src tests
+endif
+ifeq ($(FULL_TARGET),arm-linux)
+override COMPILER_SOURCEDIR+=src tests
+endif
+ifeq ($(FULL_TARGET),arm-palmos)
+override COMPILER_SOURCEDIR+=src tests
+endif
+ifeq ($(FULL_TARGET),arm-wince)
+override COMPILER_SOURCEDIR+=src tests
+endif
+ifeq ($(FULL_TARGET),arm-gba)
+override COMPILER_SOURCEDIR+=src tests
+endif
+ifeq ($(FULL_TARGET),arm-nds)
+override COMPILER_SOURCEDIR+=src tests
+endif
+ifeq ($(FULL_TARGET),arm-embedded)
+override COMPILER_SOURCEDIR+=src tests
+endif
+ifeq ($(FULL_TARGET),arm-symbian)
+override COMPILER_SOURCEDIR+=src tests
+endif
+ifeq ($(FULL_TARGET),powerpc64-linux)
+override COMPILER_SOURCEDIR+=src tests
+endif
+ifeq ($(FULL_TARGET),powerpc64-darwin)
+override COMPILER_SOURCEDIR+=src tests
+endif
+ifeq ($(FULL_TARGET),powerpc64-embedded)
+override COMPILER_SOURCEDIR+=src tests
+endif
 ifdef REQUIRE_UNITSDIR
 override UNITSDIR+=$(REQUIRE_UNITSDIR)
 endif
@@ -1149,7 +1483,7 @@ override FPCOPT+=-FD$(NEW_BINUTILS_PATH)
 endif
 ifndef CROSSBOOTSTRAP
 ifneq ($(BINUTILSPREFIX),)
-override FPCOPT+=-XP$(BINUTILSPREFIX) 
+override FPCOPT+=-XP$(BINUTILSPREFIX)
 endif
 ifneq ($(BINUTILSPREFIX),)
 override FPCOPT+=-Xr$(RLINKPATH)
@@ -1281,11 +1615,15 @@ ifeq (,$(findstring -s ,$(COMPILER)))
 EXECPPAS=
 else
 ifeq ($(FULL_SOURCE),$(FULL_TARGET))
+ifdef RUNBATCH
+EXECPPAS:=@$(RUNBATCH) $(PPAS)
+else
 EXECPPAS:=@$(PPAS)
 endif
 endif
+endif
 .PHONY: fpc_units
-ifneq ($(TARGET_UNITS),)
+ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),)
 override ALLTARGET+=fpc_units
 override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS))
 override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS))
@@ -1508,8 +1846,12 @@ endif
 ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
 else
+ifdef RUNBATCH
+	$(RUNBATCH) (ZIPWRAPPER)
+else
 	$(ZIPWRAPPER)
 endif
+endif
 	$(DEL) $(ZIPWRAPPER)
 else
 	$(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE)
diff --git a/packages/extra/libndsfpc/Makefile.fpc b/packages/libndsfpc/Makefile.fpc
index dcd1e37170..d93733b03a 100644
--- a/packages/extra/libndsfpc/Makefile.fpc
+++ b/packages/libndsfpc/Makefile.fpc
@@ -1,5 +1,5 @@
 #
-#   Makefile.fpc for gba units
+#   Makefile.fpc for nds units
 #
 
 [package]
@@ -7,12 +7,14 @@ name=libndsfpc
 version=0.1
 
 [target]
-units=nds9 nds7 dswifi/dswifi9 dswifi/dswifi7 fat/fat fat/gbfs libmikmod/mikmod9 \
-      libmikmod/mikmod7
+units=nds9 nds7 dswifi9 dswifi7 fat gbfs mikmod9  mikmod7
 examples=
 
 [compiler]
 options=
+includedir=src src/dswifi src/fat src/libmikmod
+sourcedir=src tests
+
 
 [install]
 fpcpackage=y
@@ -20,7 +22,7 @@ fpcpackage=y
 [default]
 cpu=arm
 target=nds
-fpcdir=../../..
+fpcdir=../..
 
 [require]
 nortl=y
diff --git a/packages/extra/libndsfpc/examples/devkitPro/Graphics/2D/16bit_color_bmp/data/drunkenlogo.git b/packages/libndsfpc/examples/devkitPro/Graphics/2D/16bit_color_bmp/data/drunkenlogo.git
index bc83d8b33c..bc83d8b33c 100644
--- a/packages/extra/libndsfpc/examples/devkitPro/Graphics/2D/16bit_color_bmp/data/drunkenlogo.git
+++ b/packages/libndsfpc/examples/devkitPro/Graphics/2D/16bit_color_bmp/data/drunkenlogo.git
diff --git a/packages/extra/libndsfpc/examples/devkitPro/Graphics/2D/16bit_color_bmp/data/drunkenlogo.png b/packages/libndsfpc/examples/devkitPro/Graphics/2D/16bit_color_bmp/data/drunkenlogo.png
index a99f433e87..a99f433e87 100644
--- a/packages/extra/libndsfpc/examples/devkitPro/Graphics/2D/16bit_color_bmp/data/drunkenlogo.png
+++ b/packages/libndsfpc/examples/devkitPro/Graphics/2D/16bit_color_bmp/data/drunkenlogo.png
diff --git a/packages/extra/libndsfpc/examples/devkitPro/Graphics/2D/16bit_color_bmp/main.pp b/packages/libndsfpc/examples/devkitPro/Graphics/2D/16bit_color_bmp/main.pp
index 9516b0ea2a..9516b0ea2a 100644
--- a/packages/extra/libndsfpc/examples/devkitPro/Graphics/2D/16bit_color_bmp/main.pp
+++ b/packages/libndsfpc/examples/devkitPro/Graphics/2D/16bit_color_bmp/main.pp
diff --git a/packages/extra/libndsfpc/examples/devkitPro/Graphics/2D/256_color_bmp/data/drunkenlogo.git b/packages/libndsfpc/examples/devkitPro/Graphics/2D/256_color_bmp/data/drunkenlogo.git
index f3358514b8..f3358514b8 100644
--- a/packages/extra/libndsfpc/examples/devkitPro/Graphics/2D/256_color_bmp/data/drunkenlogo.git
+++ b/packages/libndsfpc/examples/devkitPro/Graphics/2D/256_color_bmp/data/drunkenlogo.git
diff --git a/packages/extra/libndsfpc/examples/devkitPro/Graphics/2D/256_color_bmp/data/drunkenlogo.png b/packages/libndsfpc/examples/devkitPro/Graphics/2D/256_color_bmp/data/drunkenlogo.png
index ea66c9e42f..ea66c9e42f 100644
--- a/packages/extra/libndsfpc/examples/devkitPro/Graphics/2D/256_color_bmp/data/drunkenlogo.png
+++ b/packages/libndsfpc/examples/devkitPro/Graphics/2D/256_color_bmp/data/drunkenlogo.png
diff --git a/packages/extra/libndsfpc/examples/devkitPro/Graphics/2D/256_color_bmp/main.pp b/packages/libndsfpc/examples/devkitPro/Graphics/2D/256_color_bmp/main.pp
index 45fb64df94..45fb64df94 100644
--- a/packages/extra/libndsfpc/examples/devkitPro/Graphics/2D/256_color_bmp/main.pp
+++ b/packages/libndsfpc/examples/devkitPro/Graphics/2D/256_color_bmp/main.pp
diff --git a/packages/extra/libndsfpc/examples/devkitPro/Graphics/2D/BG_Rotation/drunkenlogo.bin.o b/packages/libndsfpc/examples/devkitPro/Graphics/2D/BG_Rotation/drunkenlogo.bin.o
index ce9052e475..ce9052e475 100644
--- a/packages/extra/libndsfpc/examples/devkitPro/Graphics/2D/BG_Rotation/drunkenlogo.bin.o
+++ b/packages/libndsfpc/examples/devkitPro/Graphics/2D/BG_Rotation/drunkenlogo.bin.o
diff --git a/packages/extra/libndsfpc/examples/devkitPro/Graphics/2D/BG_Rotation/main.pp b/packages/libndsfpc/examples/devkitPro/Graphics/2D/BG_Rotation/main.pp
index 6b5695c06b..6b5695c06b 100644
--- a/packages/extra/libndsfpc/examples/devkitPro/Graphics/2D/BG_Rotation/main.pp
+++ b/packages/libndsfpc/examples/devkitPro/Graphics/2D/BG_Rotation/main.pp
diff --git a/packages/extra/libndsfpc/examples/devkitPro/Graphics/2D/BG_Rotation/palette.bin.o b/packages/libndsfpc/examples/devkitPro/Graphics/2D/BG_Rotation/palette.bin.o
index 6a5fb61a46..6a5fb61a46 100644
--- a/packages/extra/libndsfpc/examples/devkitPro/Graphics/2D/BG_Rotation/palette.bin.o
+++ b/packages/libndsfpc/examples/devkitPro/Graphics/2D/BG_Rotation/palette.bin.o
diff --git a/packages/extra/libndsfpc/examples/devkitPro/Graphics/2D/Complex_2D/data/ball.pcx b/packages/libndsfpc/examples/devkitPro/Graphics/2D/Complex_2D/data/ball.pcx
index d7120162ac..d7120162ac 100644
--- a/packages/extra/libndsfpc/examples/devkitPro/Graphics/2D/Complex_2D/data/ball.pcx
+++ b/packages/libndsfpc/examples/devkitPro/Graphics/2D/Complex_2D/data/ball.pcx
diff --git a/packages/extra/libndsfpc/examples/devkitPro/Graphics/2D/Complex_2D/main.pp b/packages/libndsfpc/examples/devkitPro/Graphics/2D/Complex_2D/main.pp
index 5a5231fcec..5a5231fcec 100644
--- a/packages/extra/libndsfpc/examples/devkitPro/Graphics/2D/Complex_2D/main.pp
+++ b/packages/libndsfpc/examples/devkitPro/Graphics/2D/Complex_2D/main.pp
diff --git a/packages/extra/libndsfpc/examples/devkitPro/Graphics/2D/Double_Buffer/main.pp b/packages/libndsfpc/examples/devkitPro/Graphics/2D/Double_Buffer/main.pp
index c565b907c9..c565b907c9 100644
--- a/packages/extra/libndsfpc/examples/devkitPro/Graphics/2D/Double_Buffer/main.pp
+++ b/packages/libndsfpc/examples/devkitPro/Graphics/2D/Double_Buffer/main.pp
diff --git a/packages/extra/libndsfpc/examples/devkitPro/Graphics/2D/Sprite_Bitmap/main.pp b/packages/libndsfpc/examples/devkitPro/Graphics/2D/Sprite_Bitmap/main.pp
index 960eb38626..960eb38626 100644
--- a/packages/extra/libndsfpc/examples/devkitPro/Graphics/2D/Sprite_Bitmap/main.pp
+++ b/packages/libndsfpc/examples/devkitPro/Graphics/2D/Sprite_Bitmap/main.pp
diff --git a/packages/extra/libndsfpc/examples/devkitPro/Graphics/2D/ansi_console/main.pp b/packages/libndsfpc/examples/devkitPro/Graphics/2D/ansi_console/main.pp
index 2ed40611b5..2ed40611b5 100644
--- a/packages/extra/libndsfpc/examples/devkitPro/Graphics/2D/ansi_console/main.pp
+++ b/packages/libndsfpc/examples/devkitPro/Graphics/2D/ansi_console/main.pp
diff --git a/packages/extra/libndsfpc/examples/devkitPro/Graphics/2D/custom_font/data/font.bmp b/packages/libndsfpc/examples/devkitPro/Graphics/2D/custom_font/data/font.bmp
index bc6ca47475..bc6ca47475 100644
--- a/packages/extra/libndsfpc/examples/devkitPro/Graphics/2D/custom_font/data/font.bmp
+++ b/packages/libndsfpc/examples/devkitPro/Graphics/2D/custom_font/data/font.bmp
diff --git a/packages/extra/libndsfpc/examples/devkitPro/Graphics/2D/custom_font/data/font.git b/packages/libndsfpc/examples/devkitPro/Graphics/2D/custom_font/data/font.git
index f3358514b8..f3358514b8 100644
--- a/packages/extra/libndsfpc/examples/devkitPro/Graphics/2D/custom_font/data/font.git
+++ b/packages/libndsfpc/examples/devkitPro/Graphics/2D/custom_font/data/font.git
diff --git a/packages/extra/libndsfpc/examples/devkitPro/Graphics/2D/custom_font/main.pp b/packages/libndsfpc/examples/devkitPro/Graphics/2D/custom_font/main.pp
index 08ea8218d6..08ea8218d6 100644
--- a/packages/extra/libndsfpc/examples/devkitPro/Graphics/2D/custom_font/main.pp
+++ b/packages/libndsfpc/examples/devkitPro/Graphics/2D/custom_font/main.pp
diff --git a/packages/extra/libndsfpc/examples/devkitPro/Graphics/2D/hello_world/main.pp b/packages/libndsfpc/examples/devkitPro/Graphics/2D/hello_world/main.pp
index 462aa78490..462aa78490 100644
--- a/packages/extra/libndsfpc/examples/devkitPro/Graphics/2D/hello_world/main.pp
+++ b/packages/libndsfpc/examples/devkitPro/Graphics/2D/hello_world/main.pp
diff --git a/packages/extra/libndsfpc/examples/devkitPro/Graphics/2D/rotscale_text/data/font.bmp b/packages/libndsfpc/examples/devkitPro/Graphics/2D/rotscale_text/data/font.bmp
index bc6ca47475..bc6ca47475 100644
--- a/packages/extra/libndsfpc/examples/devkitPro/Graphics/2D/rotscale_text/data/font.bmp
+++ b/packages/libndsfpc/examples/devkitPro/Graphics/2D/rotscale_text/data/font.bmp
diff --git a/packages/extra/libndsfpc/examples/devkitPro/Graphics/2D/rotscale_text/data/font.git b/packages/libndsfpc/examples/devkitPro/Graphics/2D/rotscale_text/data/font.git
index f3358514b8..f3358514b8 100644
--- a/packages/extra/libndsfpc/examples/devkitPro/Graphics/2D/rotscale_text/data/font.git
+++ b/packages/libndsfpc/examples/devkitPro/Graphics/2D/rotscale_text/data/font.git
diff --git a/packages/extra/libndsfpc/examples/devkitPro/Graphics/2D/rotscale_text/main.pp b/packages/libndsfpc/examples/devkitPro/Graphics/2D/rotscale_text/main.pp
index 3d2fcb5051..3d2fcb5051 100644
--- a/packages/extra/libndsfpc/examples/devkitPro/Graphics/2D/rotscale_text/main.pp
+++ b/packages/libndsfpc/examples/devkitPro/Graphics/2D/rotscale_text/main.pp
diff --git a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/BoxTest/main.pp b/packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/BoxTest/main.pp
index 28acf75ff8..28acf75ff8 100644
--- a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/BoxTest/main.pp
+++ b/packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/BoxTest/main.pp
diff --git a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Display_List/main.pp b/packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Display_List/main.pp
index 04d53d7889..04d53d7889 100644
--- a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Display_List/main.pp
+++ b/packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Display_List/main.pp
diff --git a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Display_List_2/data/teapot.bin b/packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Display_List_2/data/teapot.bin
index 5fb08a6ac6..5fb08a6ac6 100644
--- a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Display_List_2/data/teapot.bin
+++ b/packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Display_List_2/data/teapot.bin
diff --git a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Display_List_2/main.pp b/packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Display_List_2/main.pp
index 10e8385c15..10e8385c15 100644
--- a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Display_List_2/main.pp
+++ b/packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Display_List_2/main.pp
diff --git a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Env_Mapping/data/cafe.bin b/packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Env_Mapping/data/cafe.bin
index 3a3dc3975f..3a3dc3975f 100644
--- a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Env_Mapping/data/cafe.bin
+++ b/packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Env_Mapping/data/cafe.bin
diff --git a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Env_Mapping/data/teapot.bin b/packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Env_Mapping/data/teapot.bin
index 423968b900..423968b900 100644
--- a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Env_Mapping/data/teapot.bin
+++ b/packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Env_Mapping/data/teapot.bin
diff --git a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Env_Mapping/main.pp b/packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Env_Mapping/main.pp
index a7982062d2..a7982062d2 100644
--- a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Env_Mapping/main.pp
+++ b/packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Env_Mapping/main.pp
diff --git a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Ortho/data/drunkenlogo.pcx b/packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Ortho/data/drunkenlogo.pcx
index 610722bec6..610722bec6 100644
--- a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Ortho/data/drunkenlogo.pcx
+++ b/packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Ortho/data/drunkenlogo.pcx
diff --git a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Ortho/main.pp b/packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Ortho/main.pp
index 1c3c737660..1c3c737660 100644
--- a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Ortho/main.pp
+++ b/packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Ortho/main.pp
diff --git a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data.inc b/packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data.inc
index 88d68cf7a1..88d68cf7a1 100644
--- a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data.inc
+++ b/packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data.inc
diff --git a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture.bin b/packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture.bin
index 423699d1f7..423699d1f7 100644
--- a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture.bin
+++ b/packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture.bin
diff --git a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture1_RGB16_pal.bin b/packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture1_RGB16_pal.bin
index e9b04b72bf..e9b04b72bf 100644
--- a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture1_RGB16_pal.bin
+++ b/packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture1_RGB16_pal.bin
diff --git a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture1_RGB16_tex.bin b/packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture1_RGB16_tex.bin
index 03068e687d..03068e687d 100644
--- a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture1_RGB16_tex.bin
+++ b/packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture1_RGB16_tex.bin
diff --git a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture2_RGB16_pal.bin b/packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture2_RGB16_pal.bin
index 9b1d466d21..9b1d466d21 100644
--- a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture2_RGB16_pal.bin
+++ b/packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture2_RGB16_pal.bin
diff --git a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture2_RGB16_tex.bin b/packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture2_RGB16_tex.bin
index 1e4cd1c853..1e4cd1c853 100644
--- a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture2_RGB16_tex.bin
+++ b/packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture2_RGB16_tex.bin
diff --git a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture3_RGB16_pal.bin b/packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture3_RGB16_pal.bin
index 174ed18640..174ed18640 100644
--- a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture3_RGB16_pal.bin
+++ b/packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture3_RGB16_pal.bin
diff --git a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture3_RGB16_tex.bin b/packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture3_RGB16_tex.bin
index 5254cb965d..5254cb965d 100644
--- a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture3_RGB16_tex.bin
+++ b/packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture3_RGB16_tex.bin
diff --git a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture4_RGB16_pal.bin b/packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture4_RGB16_pal.bin
index 0d7b385707..0d7b385707 100644
--- a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture4_RGB16_pal.bin
+++ b/packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture4_RGB16_pal.bin
diff --git a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture4_RGB16_tex.bin b/packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture4_RGB16_tex.bin
index ade6231da9..ade6231da9 100644
--- a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture4_RGB16_tex.bin
+++ b/packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture4_RGB16_tex.bin
diff --git a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture5_RGB16_pal.bin b/packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture5_RGB16_pal.bin
index 0ee8f0fa71..0ee8f0fa71 100644
--- a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture5_RGB16_pal.bin
+++ b/packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture5_RGB16_pal.bin
diff --git a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture5_RGB16_tex.bin b/packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture5_RGB16_tex.bin
index 036f1a1bec..036f1a1bec 100644
--- a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture5_RGB16_tex.bin
+++ b/packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture5_RGB16_tex.bin
diff --git a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture6_RGB4_pal.bin b/packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture6_RGB4_pal.bin
index 18a6bc0b4f..18a6bc0b4f 100644
--- a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture6_RGB4_pal.bin
+++ b/packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture6_RGB4_pal.bin
diff --git a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture6_RGB4_tex.bin b/packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture6_RGB4_tex.bin
index 0acb3a4efd..0acb3a4efd 100644
--- a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture6_RGB4_tex.bin
+++ b/packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture6_RGB4_tex.bin
diff --git a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture7_RGB4_pal.bin b/packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture7_RGB4_pal.bin
index 2664fc4571..2664fc4571 100644
--- a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture7_RGB4_pal.bin
+++ b/packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture7_RGB4_pal.bin
diff --git a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture7_RGB4_tex.bin b/packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture7_RGB4_tex.bin
index b6d1e38795..b6d1e38795 100644
--- a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture7_RGB4_tex.bin
+++ b/packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture7_RGB4_tex.bin
diff --git a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture8_RGB32_A3_pal.bin b/packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture8_RGB32_A3_pal.bin
index d770464540..d770464540 100644
--- a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture8_RGB32_A3_pal.bin
+++ b/packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture8_RGB32_A3_pal.bin
diff --git a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture8_RGB32_A3_tex.bin b/packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture8_RGB32_A3_tex.bin
index 7084002f86..7084002f86 100644
--- a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture8_RGB32_A3_tex.bin
+++ b/packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture8_RGB32_A3_tex.bin
diff --git a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture9_RGB32_A3_pal.bin b/packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture9_RGB32_A3_pal.bin
index f855ce6411..f855ce6411 100644
--- a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture9_RGB32_A3_pal.bin
+++ b/packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture9_RGB32_A3_pal.bin
diff --git a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture9_RGB32_A3_tex.bin b/packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture9_RGB32_A3_tex.bin
index 8ca2cfe3b0..8ca2cfe3b0 100644
--- a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture9_RGB32_A3_tex.bin
+++ b/packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture9_RGB32_A3_tex.bin
diff --git a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/main.pp b/packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/main.pp
index 40d4b45bf4..40d4b45bf4 100644
--- a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/main.pp
+++ b/packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/main.pp
diff --git a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Picking/data/cone.bin b/packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Picking/data/cone.bin
index 577dd5649b..577dd5649b 100644
--- a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Picking/data/cone.bin
+++ b/packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Picking/data/cone.bin
diff --git a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Picking/data/cylinder.bin b/packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Picking/data/cylinder.bin
index 8f38f8f02c..8f38f8f02c 100644
--- a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Picking/data/cylinder.bin
+++ b/packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Picking/data/cylinder.bin
diff --git a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Picking/data/sphere.bin b/packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Picking/data/sphere.bin
index 008e7fec60..008e7fec60 100644
--- a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Picking/data/sphere.bin
+++ b/packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Picking/data/sphere.bin
diff --git a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Picking/main.pp b/packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Picking/main.pp
index 86bfefd0c2..86bfefd0c2 100644
--- a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Picking/main.pp
+++ b/packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Picking/main.pp
diff --git a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Simple_Quad/main.pp b/packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Simple_Quad/main.pp
index de3745258e..de3745258e 100644
--- a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Simple_Quad/main.pp
+++ b/packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Simple_Quad/main.pp
diff --git a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Simple_Tri/main.pp b/packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Simple_Tri/main.pp
index f926b57106..f926b57106 100644
--- a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Simple_Tri/main.pp
+++ b/packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Simple_Tri/main.pp
diff --git a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Textured_Cube/data/texture.bin b/packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Textured_Cube/data/texture.bin
index 423699d1f7..423699d1f7 100644
--- a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Textured_Cube/data/texture.bin
+++ b/packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Textured_Cube/data/texture.bin
diff --git a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Textured_Cube/main.pp b/packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Textured_Cube/main.pp
index 0f4b096414..0f4b096414 100644
--- a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Textured_Cube/main.pp
+++ b/packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Textured_Cube/main.pp
diff --git a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Textured_Quad/data/texture.bin b/packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Textured_Quad/data/texture.bin
index 423699d1f7..423699d1f7 100644
--- a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Textured_Quad/data/texture.bin
+++ b/packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Textured_Quad/data/texture.bin
diff --git a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Textured_Quad/main.pp b/packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Textured_Quad/main.pp
index 5875b83967..5875b83967 100644
--- a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Textured_Quad/main.pp
+++ b/packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Textured_Quad/main.pp
diff --git a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Toon_Shading/data/statue.bin b/packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Toon_Shading/data/statue.bin
index 3c5bba2c5e..3c5bba2c5e 100644
--- a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Toon_Shading/data/statue.bin
+++ b/packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Toon_Shading/data/statue.bin
diff --git a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Toon_Shading/main.pp b/packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Toon_Shading/main.pp
index c684925071..c684925071 100644
--- a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Toon_Shading/main.pp
+++ b/packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Toon_Shading/main.pp
diff --git a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson01/main.pp b/packages/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson01/main.pp
index d54c23d0cd..d54c23d0cd 100644
--- a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson01/main.pp
+++ b/packages/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson01/main.pp
diff --git a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson02/main1.pp b/packages/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson02/main1.pp
index 53030bf443..53030bf443 100644
--- a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson02/main1.pp
+++ b/packages/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson02/main1.pp
diff --git a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson03/main.pp b/packages/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson03/main.pp
index 99b33da711..99b33da711 100644
--- a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson03/main.pp
+++ b/packages/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson03/main.pp
diff --git a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson04/main.pp b/packages/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson04/main.pp
index cd1dc0fd1d..cd1dc0fd1d 100644
--- a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson04/main.pp
+++ b/packages/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson04/main.pp
diff --git a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson05/main.pp b/packages/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson05/main.pp
index 4f14b1d674..4f14b1d674 100644
--- a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson05/main.pp
+++ b/packages/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson05/main.pp
diff --git a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson06/drunkenlogo.pcx.o b/packages/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson06/drunkenlogo.pcx.o
index f24743fd17..f24743fd17 100644
--- a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson06/drunkenlogo.pcx.o
+++ b/packages/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson06/drunkenlogo.pcx.o
diff --git a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson06/main.pp b/packages/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson06/main.pp
index e11b1826e2..e11b1826e2 100644
--- a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson06/main.pp
+++ b/packages/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson06/main.pp
diff --git a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson07/drunkenlogo.pcx.o b/packages/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson07/drunkenlogo.pcx.o
index f24743fd17..f24743fd17 100644
--- a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson07/drunkenlogo.pcx.o
+++ b/packages/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson07/drunkenlogo.pcx.o
diff --git a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson07/main.pp b/packages/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson07/main.pp
index c0b5b08e88..c0b5b08e88 100644
--- a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson07/main.pp
+++ b/packages/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson07/main.pp
diff --git a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson08/drunkenlogo.pcx.o b/packages/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson08/drunkenlogo.pcx.o
index f24743fd17..f24743fd17 100644
--- a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson08/drunkenlogo.pcx.o
+++ b/packages/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson08/drunkenlogo.pcx.o
diff --git a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson08/main.pp b/packages/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson08/main.pp
index 84841f1146..84841f1146 100644
--- a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson08/main.pp
+++ b/packages/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson08/main.pp
diff --git a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson09/Star.pcx.o b/packages/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson09/Star.pcx.o
index 2f8299a83b..2f8299a83b 100644
--- a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson09/Star.pcx.o
+++ b/packages/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson09/Star.pcx.o
diff --git a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson09/main.pp b/packages/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson09/main.pp
index 2fb3dcefd7..2fb3dcefd7 100644
--- a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson09/main.pp
+++ b/packages/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson09/main.pp
diff --git a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson11/drunkenlogo.pcx.o b/packages/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson11/drunkenlogo.pcx.o
index f24743fd17..f24743fd17 100644
--- a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson11/drunkenlogo.pcx.o
+++ b/packages/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson11/drunkenlogo.pcx.o
diff --git a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson11/main.pp b/packages/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson11/main.pp
index 5db0e790e9..5db0e790e9 100644
--- a/packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson11/main.pp
+++ b/packages/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson11/main.pp
diff --git a/packages/extra/libndsfpc/examples/devkitPro/debugging/exceptionTest/main.pp b/packages/libndsfpc/examples/devkitPro/debugging/exceptionTest/main.pp
index 957e4f2dca..957e4f2dca 100644
--- a/packages/extra/libndsfpc/examples/devkitPro/debugging/exceptionTest/main.pp
+++ b/packages/libndsfpc/examples/devkitPro/debugging/exceptionTest/main.pp
diff --git a/packages/extra/libndsfpc/examples/devkitPro/input/TouchTest/balldata.bin.o b/packages/libndsfpc/examples/devkitPro/input/TouchTest/balldata.bin.o
index 50fc3aba31..50fc3aba31 100644
--- a/packages/extra/libndsfpc/examples/devkitPro/input/TouchTest/balldata.bin.o
+++ b/packages/libndsfpc/examples/devkitPro/input/TouchTest/balldata.bin.o
diff --git a/packages/extra/libndsfpc/examples/devkitPro/input/TouchTest/ballpalette.bin.o b/packages/libndsfpc/examples/devkitPro/input/TouchTest/ballpalette.bin.o
index 5a8f857c0f..5a8f857c0f 100644
--- a/packages/extra/libndsfpc/examples/devkitPro/input/TouchTest/ballpalette.bin.o
+++ b/packages/libndsfpc/examples/devkitPro/input/TouchTest/ballpalette.bin.o
diff --git a/packages/extra/libndsfpc/examples/devkitPro/input/TouchTest/main.pp b/packages/libndsfpc/examples/devkitPro/input/TouchTest/main.pp
index bec3a00376..bec3a00376 100644
--- a/packages/extra/libndsfpc/examples/devkitPro/input/TouchTest/main.pp
+++ b/packages/libndsfpc/examples/devkitPro/input/TouchTest/main.pp
diff --git a/packages/extra/libndsfpc/examples/devkitPro/sound/SimpleSound/blaster.raw.o b/packages/libndsfpc/examples/devkitPro/sound/SimpleSound/blaster.raw.o
index edc8f9b82f..edc8f9b82f 100644
--- a/packages/extra/libndsfpc/examples/devkitPro/sound/SimpleSound/blaster.raw.o
+++ b/packages/libndsfpc/examples/devkitPro/sound/SimpleSound/blaster.raw.o
diff --git a/packages/extra/libndsfpc/examples/devkitPro/sound/SimpleSound/ion.raw.o b/packages/libndsfpc/examples/devkitPro/sound/SimpleSound/ion.raw.o
index 656d0ba6fb..656d0ba6fb 100644
--- a/packages/extra/libndsfpc/examples/devkitPro/sound/SimpleSound/ion.raw.o
+++ b/packages/libndsfpc/examples/devkitPro/sound/SimpleSound/ion.raw.o
diff --git a/packages/extra/libndsfpc/examples/devkitPro/sound/SimpleSound/main.pp b/packages/libndsfpc/examples/devkitPro/sound/SimpleSound/main.pp
index 1ac73f6c34..1ac73f6c34 100644
--- a/packages/extra/libndsfpc/examples/devkitPro/sound/SimpleSound/main.pp
+++ b/packages/libndsfpc/examples/devkitPro/sound/SimpleSound/main.pp
diff --git a/packages/extra/libndsfpc/examples/devkitPro/sound/SimpleSound/saberoff.raw.o b/packages/libndsfpc/examples/devkitPro/sound/SimpleSound/saberoff.raw.o
index 65ca2b4773..65ca2b4773 100644
--- a/packages/extra/libndsfpc/examples/devkitPro/sound/SimpleSound/saberoff.raw.o
+++ b/packages/libndsfpc/examples/devkitPro/sound/SimpleSound/saberoff.raw.o
diff --git a/packages/extra/libndsfpc/examples/dswifi/main7.pp b/packages/libndsfpc/examples/dswifi/main7.pp
index 342d24cf01..342d24cf01 100644
--- a/packages/extra/libndsfpc/examples/dswifi/main7.pp
+++ b/packages/libndsfpc/examples/dswifi/main7.pp
diff --git a/packages/extra/libndsfpc/examples/dswifi/main9.pp b/packages/libndsfpc/examples/dswifi/main9.pp
index fb11077416..fb11077416 100644
--- a/packages/extra/libndsfpc/examples/dswifi/main9.pp
+++ b/packages/libndsfpc/examples/dswifi/main9.pp
diff --git a/packages/extra/libndsfpc/examples/libfat/main.pp b/packages/libndsfpc/examples/libfat/main.pp
index 5c1babc3a7..5c1babc3a7 100644
--- a/packages/extra/libndsfpc/examples/libfat/main.pp
+++ b/packages/libndsfpc/examples/libfat/main.pp
diff --git a/packages/extra/libndsfpc/examples/libfat/test1.txt b/packages/libndsfpc/examples/libfat/test1.txt
index 845b08fe32..845b08fe32 100644
--- a/packages/extra/libndsfpc/examples/libfat/test1.txt
+++ b/packages/libndsfpc/examples/libfat/test1.txt
diff --git a/packages/extra/libndsfpc/examples/libmikmod/data/module.bin.o b/packages/libndsfpc/examples/libmikmod/data/module.bin.o
index 881d268ee4..881d268ee4 100644
--- a/packages/extra/libndsfpc/examples/libmikmod/data/module.bin.o
+++ b/packages/libndsfpc/examples/libmikmod/data/module.bin.o
diff --git a/packages/extra/libndsfpc/examples/libmikmod/main7.pp b/packages/libndsfpc/examples/libmikmod/main7.pp
index 68e8f36570..68e8f36570 100644
--- a/packages/extra/libndsfpc/examples/libmikmod/main7.pp
+++ b/packages/libndsfpc/examples/libmikmod/main7.pp
diff --git a/packages/extra/libndsfpc/examples/libmikmod/main9.pp b/packages/libndsfpc/examples/libmikmod/main9.pp
index 7abaad91d8..7abaad91d8 100644
--- a/packages/extra/libndsfpc/examples/libmikmod/main9.pp
+++ b/packages/libndsfpc/examples/libmikmod/main9.pp
diff --git a/packages/libndsfpc/fpmake.pp b/packages/libndsfpc/fpmake.pp
new file mode 100644
index 0000000000..86501349d4
--- /dev/null
+++ b/packages/libndsfpc/fpmake.pp
@@ -0,0 +1,29 @@
+{$ifndef ALLPACKAGES}
+{$mode objfpc}{$H+}
+program fpmake;
+
+uses fpmkunit;
+
+Var
+  P : TPackage;
+  T : TTarget;
+begin
+  With Installer do
+    begin
+{$endif ALLPACKAGES}
+
+    P:=AddPackage('libndsfpc');
+{$ifdef ALLPACKAGES}
+    P.Directory:='libndsfpc';
+{$endif ALLPACKAGES}
+    P.Version:='2.0.0';
+    P.SourcePath.Add('src');
+//    P.Dependencies.Add('x11');
+
+    // not linux compilable, skip
+
+{$ifndef ALLPACKAGES}
+    Run;
+    end;
+end.
+{$endif ALLPACKAGES}
diff --git a/packages/extra/libndsfpc/dswifi/dswifi7.inc b/packages/libndsfpc/src/dswifi/dswifi7.inc
index 9a7e1ed445..9a7e1ed445 100644
--- a/packages/extra/libndsfpc/dswifi/dswifi7.inc
+++ b/packages/libndsfpc/src/dswifi/dswifi7.inc
diff --git a/packages/extra/libndsfpc/dswifi/dswifi7.pp b/packages/libndsfpc/src/dswifi/dswifi7.pp
index 635142b1a5..635142b1a5 100644
--- a/packages/extra/libndsfpc/dswifi/dswifi7.pp
+++ b/packages/libndsfpc/src/dswifi/dswifi7.pp
diff --git a/packages/extra/libndsfpc/dswifi/dswifi9.inc b/packages/libndsfpc/src/dswifi/dswifi9.inc
index 2fdec8a9d8..2fdec8a9d8 100644
--- a/packages/extra/libndsfpc/dswifi/dswifi9.inc
+++ b/packages/libndsfpc/src/dswifi/dswifi9.inc
diff --git a/packages/extra/libndsfpc/dswifi/dswifi9.pp b/packages/libndsfpc/src/dswifi/dswifi9.pp
index dca1b60719..dca1b60719 100644
--- a/packages/extra/libndsfpc/dswifi/dswifi9.pp
+++ b/packages/libndsfpc/src/dswifi/dswifi9.pp
diff --git a/packages/extra/libndsfpc/dswifi/dswifi_version.inc b/packages/libndsfpc/src/dswifi/dswifi_version.inc
index 5515bb84c0..5515bb84c0 100644
--- a/packages/extra/libndsfpc/dswifi/dswifi_version.inc
+++ b/packages/libndsfpc/src/dswifi/dswifi_version.inc
diff --git a/packages/extra/libndsfpc/dswifi/netdb.inc b/packages/libndsfpc/src/dswifi/netdb.inc
index 0041ecadd5..0041ecadd5 100644
--- a/packages/extra/libndsfpc/dswifi/netdb.inc
+++ b/packages/libndsfpc/src/dswifi/netdb.inc
diff --git a/packages/extra/libndsfpc/dswifi/netinet/in.inc b/packages/libndsfpc/src/dswifi/netinet/in.inc
index a43a1367fc..a43a1367fc 100644
--- a/packages/extra/libndsfpc/dswifi/netinet/in.inc
+++ b/packages/libndsfpc/src/dswifi/netinet/in.inc
diff --git a/packages/extra/libndsfpc/dswifi/sgIP_errno.inc b/packages/libndsfpc/src/dswifi/sgIP_errno.inc
index 14cefe7cac..14cefe7cac 100644
--- a/packages/extra/libndsfpc/dswifi/sgIP_errno.inc
+++ b/packages/libndsfpc/src/dswifi/sgIP_errno.inc
diff --git a/packages/extra/libndsfpc/dswifi/sys/socket.inc b/packages/libndsfpc/src/dswifi/sys/socket.inc
index 3f4e6a1988..3f4e6a1988 100644
--- a/packages/extra/libndsfpc/dswifi/sys/socket.inc
+++ b/packages/libndsfpc/src/dswifi/sys/socket.inc
diff --git a/packages/extra/libndsfpc/fat/fat.inc b/packages/libndsfpc/src/fat/fat.inc
index 83bd8e10bb..83bd8e10bb 100644
--- a/packages/extra/libndsfpc/fat/fat.inc
+++ b/packages/libndsfpc/src/fat/fat.inc
diff --git a/packages/extra/libndsfpc/fat/fat.pp b/packages/libndsfpc/src/fat/fat.pp
index 502209f339..502209f339 100644
--- a/packages/extra/libndsfpc/fat/fat.pp
+++ b/packages/libndsfpc/src/fat/fat.pp
diff --git a/packages/extra/libndsfpc/fat/gbfs.inc b/packages/libndsfpc/src/fat/gbfs.inc
index 027809703f..027809703f 100644
--- a/packages/extra/libndsfpc/fat/gbfs.inc
+++ b/packages/libndsfpc/src/fat/gbfs.inc
diff --git a/packages/extra/libndsfpc/fat/gbfs.pp b/packages/libndsfpc/src/fat/gbfs.pp
index 2ceb8949da..2ceb8949da 100644
--- a/packages/extra/libndsfpc/fat/gbfs.pp
+++ b/packages/libndsfpc/src/fat/gbfs.pp
diff --git a/packages/extra/libndsfpc/libmikmod/inc/mikmod.inc b/packages/libndsfpc/src/libmikmod/inc/mikmod.inc
index 0c9204761b..0c9204761b 100644
--- a/packages/extra/libndsfpc/libmikmod/inc/mikmod.inc
+++ b/packages/libndsfpc/src/libmikmod/inc/mikmod.inc
diff --git a/packages/extra/libndsfpc/libmikmod/mikmod7.pp b/packages/libndsfpc/src/libmikmod/mikmod7.pp
index c228dbf3a9..c228dbf3a9 100644
--- a/packages/extra/libndsfpc/libmikmod/mikmod7.pp
+++ b/packages/libndsfpc/src/libmikmod/mikmod7.pp
diff --git a/packages/extra/libndsfpc/libmikmod/mikmod9.pp b/packages/libndsfpc/src/libmikmod/mikmod9.pp
index e4ac249101..e4ac249101 100644
--- a/packages/extra/libndsfpc/libmikmod/mikmod9.pp
+++ b/packages/libndsfpc/src/libmikmod/mikmod9.pp
diff --git a/packages/extra/libndsfpc/nds/arm7/audio.inc b/packages/libndsfpc/src/nds/arm7/audio.inc
index e06f7954a6..e06f7954a6 100644
--- a/packages/extra/libndsfpc/nds/arm7/audio.inc
+++ b/packages/libndsfpc/src/nds/arm7/audio.inc
diff --git a/packages/extra/libndsfpc/nds/arm7/clock.inc b/packages/libndsfpc/src/nds/arm7/clock.inc
index d95d4be2d1..d95d4be2d1 100644
--- a/packages/extra/libndsfpc/nds/arm7/clock.inc
+++ b/packages/libndsfpc/src/nds/arm7/clock.inc
diff --git a/packages/extra/libndsfpc/nds/arm7/serial.inc b/packages/libndsfpc/src/nds/arm7/serial.inc
index 8a30b9c7f5..8a30b9c7f5 100644
--- a/packages/extra/libndsfpc/nds/arm7/serial.inc
+++ b/packages/libndsfpc/src/nds/arm7/serial.inc
diff --git a/packages/extra/libndsfpc/nds/arm7/touch.inc b/packages/libndsfpc/src/nds/arm7/touch.inc
index 5230a74152..5230a74152 100644
--- a/packages/extra/libndsfpc/nds/arm7/touch.inc
+++ b/packages/libndsfpc/src/nds/arm7/touch.inc
diff --git a/packages/extra/libndsfpc/nds/arm9/background.inc b/packages/libndsfpc/src/nds/arm9/background.inc
index f4453dc7f9..f4453dc7f9 100644
--- a/packages/extra/libndsfpc/nds/arm9/background.inc
+++ b/packages/libndsfpc/src/nds/arm9/background.inc
diff --git a/packages/extra/libndsfpc/nds/arm9/boxtest.inc b/packages/libndsfpc/src/nds/arm9/boxtest.inc
index 976e927778..976e927778 100644
--- a/packages/extra/libndsfpc/nds/arm9/boxtest.inc
+++ b/packages/libndsfpc/src/nds/arm9/boxtest.inc
diff --git a/packages/extra/libndsfpc/nds/arm9/cache.inc b/packages/libndsfpc/src/nds/arm9/cache.inc
index f5ec28b5e4..f5ec28b5e4 100644
--- a/packages/extra/libndsfpc/nds/arm9/cache.inc
+++ b/packages/libndsfpc/src/nds/arm9/cache.inc
diff --git a/packages/extra/libndsfpc/nds/arm9/console.inc b/packages/libndsfpc/src/nds/arm9/console.inc
index 0c3421b823..0c3421b823 100644
--- a/packages/extra/libndsfpc/nds/arm9/console.inc
+++ b/packages/libndsfpc/src/nds/arm9/console.inc
diff --git a/packages/extra/libndsfpc/nds/arm9/exceptions.inc b/packages/libndsfpc/src/nds/arm9/exceptions.inc
index 5dc10c5329..5dc10c5329 100644
--- a/packages/extra/libndsfpc/nds/arm9/exceptions.inc
+++ b/packages/libndsfpc/src/nds/arm9/exceptions.inc
diff --git a/packages/extra/libndsfpc/nds/arm9/image.inc b/packages/libndsfpc/src/nds/arm9/image.inc
index 5eba23e25a..5eba23e25a 100644
--- a/packages/extra/libndsfpc/nds/arm9/image.inc
+++ b/packages/libndsfpc/src/nds/arm9/image.inc
diff --git a/packages/extra/libndsfpc/nds/arm9/input.inc b/packages/libndsfpc/src/nds/arm9/input.inc
index 821706258d..821706258d 100644
--- a/packages/extra/libndsfpc/nds/arm9/input.inc
+++ b/packages/libndsfpc/src/nds/arm9/input.inc
diff --git a/packages/extra/libndsfpc/nds/arm9/math.inc b/packages/libndsfpc/src/nds/arm9/math.inc
index 0cf3bfc88f..0cf3bfc88f 100644
--- a/packages/extra/libndsfpc/nds/arm9/math.inc
+++ b/packages/libndsfpc/src/nds/arm9/math.inc
diff --git a/packages/extra/libndsfpc/nds/arm9/ndsmotion.inc b/packages/libndsfpc/src/nds/arm9/ndsmotion.inc
index 65008566dd..65008566dd 100644
--- a/packages/extra/libndsfpc/nds/arm9/ndsmotion.inc
+++ b/packages/libndsfpc/src/nds/arm9/ndsmotion.inc
diff --git a/packages/extra/libndsfpc/nds/arm9/pcx.inc b/packages/libndsfpc/src/nds/arm9/pcx.inc
index 6bbf176ee2..6bbf176ee2 100644
--- a/packages/extra/libndsfpc/nds/arm9/pcx.inc
+++ b/packages/libndsfpc/src/nds/arm9/pcx.inc
diff --git a/packages/extra/libndsfpc/nds/arm9/postest.inc b/packages/libndsfpc/src/nds/arm9/postest.inc
index 8b1d134894..8b1d134894 100644
--- a/packages/extra/libndsfpc/nds/arm9/postest.inc
+++ b/packages/libndsfpc/src/nds/arm9/postest.inc
diff --git a/packages/extra/libndsfpc/nds/arm9/rumble.inc b/packages/libndsfpc/src/nds/arm9/rumble.inc
index 5fe9f6fefa..5fe9f6fefa 100644
--- a/packages/extra/libndsfpc/nds/arm9/rumble.inc
+++ b/packages/libndsfpc/src/nds/arm9/rumble.inc
diff --git a/packages/extra/libndsfpc/nds/arm9/sound.inc b/packages/libndsfpc/src/nds/arm9/sound.inc
index c3979aef47..c3979aef47 100644
--- a/packages/extra/libndsfpc/nds/arm9/sound.inc
+++ b/packages/libndsfpc/src/nds/arm9/sound.inc
diff --git a/packages/extra/libndsfpc/nds/arm9/sprite.inc b/packages/libndsfpc/src/nds/arm9/sprite.inc
index 504d71611f..504d71611f 100644
--- a/packages/extra/libndsfpc/nds/arm9/sprite.inc
+++ b/packages/libndsfpc/src/nds/arm9/sprite.inc
diff --git a/packages/extra/libndsfpc/nds/arm9/trig_lut.inc b/packages/libndsfpc/src/nds/arm9/trig_lut.inc
index a054f86f36..a054f86f36 100644
--- a/packages/extra/libndsfpc/nds/arm9/trig_lut.inc
+++ b/packages/libndsfpc/src/nds/arm9/trig_lut.inc
diff --git a/packages/extra/libndsfpc/nds/arm9/video.inc b/packages/libndsfpc/src/nds/arm9/video.inc
index 9772a6949d..9772a6949d 100644
--- a/packages/extra/libndsfpc/nds/arm9/video.inc
+++ b/packages/libndsfpc/src/nds/arm9/video.inc
diff --git a/packages/extra/libndsfpc/nds/arm9/videoGL.inc b/packages/libndsfpc/src/nds/arm9/videoGL.inc
index e7bed53055..e7bed53055 100644
--- a/packages/extra/libndsfpc/nds/arm9/videoGL.inc
+++ b/packages/libndsfpc/src/nds/arm9/videoGL.inc
diff --git a/packages/extra/libndsfpc/nds/bios.inc b/packages/libndsfpc/src/nds/bios.inc
index 9796342148..9796342148 100644
--- a/packages/extra/libndsfpc/nds/bios.inc
+++ b/packages/libndsfpc/src/nds/bios.inc
diff --git a/packages/extra/libndsfpc/nds/card.inc b/packages/libndsfpc/src/nds/card.inc
index 8f399d6ae8..8f399d6ae8 100644
--- a/packages/extra/libndsfpc/nds/card.inc
+++ b/packages/libndsfpc/src/nds/card.inc
diff --git a/packages/extra/libndsfpc/nds/dma.inc b/packages/libndsfpc/src/nds/dma.inc
index 4118bb78f8..4118bb78f8 100644
--- a/packages/extra/libndsfpc/nds/dma.inc
+++ b/packages/libndsfpc/src/nds/dma.inc
diff --git a/packages/extra/libndsfpc/nds/helper.inc b/packages/libndsfpc/src/nds/helper.inc
index 4664e02e56..4664e02e56 100644
--- a/packages/extra/libndsfpc/nds/helper.inc
+++ b/packages/libndsfpc/src/nds/helper.inc
diff --git a/packages/extra/libndsfpc/nds/interrupts.inc b/packages/libndsfpc/src/nds/interrupts.inc
index 1571a70e27..1571a70e27 100644
--- a/packages/extra/libndsfpc/nds/interrupts.inc
+++ b/packages/libndsfpc/src/nds/interrupts.inc
diff --git a/packages/extra/libndsfpc/nds/ipc.inc b/packages/libndsfpc/src/nds/ipc.inc
index 9054ac512d..9054ac512d 100644
--- a/packages/extra/libndsfpc/nds/ipc.inc
+++ b/packages/libndsfpc/src/nds/ipc.inc
diff --git a/packages/extra/libndsfpc/nds/jtypes.inc b/packages/libndsfpc/src/nds/jtypes.inc
index 65fd1b23b9..65fd1b23b9 100644
--- a/packages/extra/libndsfpc/nds/jtypes.inc
+++ b/packages/libndsfpc/src/nds/jtypes.inc
diff --git a/packages/extra/libndsfpc/nds/memory.inc b/packages/libndsfpc/src/nds/memory.inc
index a5519a1421..a5519a1421 100644
--- a/packages/extra/libndsfpc/nds/memory.inc
+++ b/packages/libndsfpc/src/nds/memory.inc
diff --git a/packages/extra/libndsfpc/nds/nds.inc b/packages/libndsfpc/src/nds/nds.inc
index 42da1454f0..42da1454f0 100644
--- a/packages/extra/libndsfpc/nds/nds.inc
+++ b/packages/libndsfpc/src/nds/nds.inc
diff --git a/packages/extra/libndsfpc/nds/ndsinclude.inc b/packages/libndsfpc/src/nds/ndsinclude.inc
index 485cc4856b..485cc4856b 100644
--- a/packages/extra/libndsfpc/nds/ndsinclude.inc
+++ b/packages/libndsfpc/src/nds/ndsinclude.inc
diff --git a/packages/extra/libndsfpc/nds/registers_alt.inc b/packages/libndsfpc/src/nds/registers_alt.inc
index f63b197b96..f63b197b96 100644
--- a/packages/extra/libndsfpc/nds/registers_alt.inc
+++ b/packages/libndsfpc/src/nds/registers_alt.inc
diff --git a/packages/extra/libndsfpc/nds/reload.inc b/packages/libndsfpc/src/nds/reload.inc
index 2af937abb8..2af937abb8 100644
--- a/packages/extra/libndsfpc/nds/reload.inc
+++ b/packages/libndsfpc/src/nds/reload.inc
diff --git a/packages/extra/libndsfpc/nds/system.inc b/packages/libndsfpc/src/nds/system.inc
index 34edb63c0c..34edb63c0c 100644
--- a/packages/extra/libndsfpc/nds/system.inc
+++ b/packages/libndsfpc/src/nds/system.inc
diff --git a/packages/extra/libndsfpc/nds/timers.inc b/packages/libndsfpc/src/nds/timers.inc
index 2a601812d1..2a601812d1 100644
--- a/packages/extra/libndsfpc/nds/timers.inc
+++ b/packages/libndsfpc/src/nds/timers.inc
diff --git a/packages/extra/libndsfpc/nds7.pp b/packages/libndsfpc/src/nds7.pp
index 4318e0754b..4318e0754b 100644
--- a/packages/extra/libndsfpc/nds7.pp
+++ b/packages/libndsfpc/src/nds7.pp
diff --git a/packages/extra/libndsfpc/nds9.pp b/packages/libndsfpc/src/nds9.pp
index 540fc72aa4..540fc72aa4 100644
--- a/packages/extra/libndsfpc/nds9.pp
+++ b/packages/libndsfpc/src/nds9.pp