diff --git a/.gitattributes b/.gitattributes index f70d0a3b7a..fea9404dc1 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1208,156 +1208,6 @@ packages/extra/gnome1/zvt/zvt/libzvt.pp svneol=native#text/plain packages/extra/gnome1/zvt/zvt/lists.inc svneol=native#text/plain packages/extra/gnome1/zvt/zvt/vt.inc svneol=native#text/plain packages/extra/gnome1/zvt/zvt/vtx.inc svneol=native#text/plain -packages/extra/libndsfpc/Makefile svneol=native#text/plain -packages/extra/libndsfpc/Makefile.fpc svneol=native#text/plain -packages/extra/libndsfpc/dswifi/dswifi7.inc svneol=native#text/plain -packages/extra/libndsfpc/dswifi/dswifi7.pp svneol=native#text/plain -packages/extra/libndsfpc/dswifi/dswifi9.inc svneol=native#text/plain -packages/extra/libndsfpc/dswifi/dswifi9.pp svneol=native#text/plain -packages/extra/libndsfpc/dswifi/dswifi_version.inc svneol=native#text/plain -packages/extra/libndsfpc/dswifi/netdb.inc svneol=native#text/plain -packages/extra/libndsfpc/dswifi/netinet/in.inc svneol=native#text/plain -packages/extra/libndsfpc/dswifi/sgIP_errno.inc svneol=native#text/plain -packages/extra/libndsfpc/dswifi/sys/socket.inc svneol=native#text/plain -packages/extra/libndsfpc/examples/devkitPro/Graphics/2D/16bit_color_bmp/data/drunkenlogo.git svneol=native#text/plain -packages/extra/libndsfpc/examples/devkitPro/Graphics/2D/16bit_color_bmp/data/drunkenlogo.png -text svneol=unset#image/png -packages/extra/libndsfpc/examples/devkitPro/Graphics/2D/16bit_color_bmp/main.pp svneol=native#text/plain -packages/extra/libndsfpc/examples/devkitPro/Graphics/2D/256_color_bmp/data/drunkenlogo.git svneol=native#text/plain -packages/extra/libndsfpc/examples/devkitPro/Graphics/2D/256_color_bmp/data/drunkenlogo.png -text svneol=unset#image/png -packages/extra/libndsfpc/examples/devkitPro/Graphics/2D/256_color_bmp/main.pp svneol=native#text/plain -packages/extra/libndsfpc/examples/devkitPro/Graphics/2D/BG_Rotation/drunkenlogo.bin.o -text -packages/extra/libndsfpc/examples/devkitPro/Graphics/2D/BG_Rotation/main.pp svneol=native#text/plain -packages/extra/libndsfpc/examples/devkitPro/Graphics/2D/BG_Rotation/palette.bin.o -text -packages/extra/libndsfpc/examples/devkitPro/Graphics/2D/Complex_2D/data/ball.pcx -text svneol=unset#image/pcx -packages/extra/libndsfpc/examples/devkitPro/Graphics/2D/Complex_2D/main.pp svneol=native#text/plain -packages/extra/libndsfpc/examples/devkitPro/Graphics/2D/Double_Buffer/main.pp svneol=native#text/plain -packages/extra/libndsfpc/examples/devkitPro/Graphics/2D/Sprite_Bitmap/main.pp svneol=native#text/plain -packages/extra/libndsfpc/examples/devkitPro/Graphics/2D/ansi_console/main.pp svneol=native#text/plain -packages/extra/libndsfpc/examples/devkitPro/Graphics/2D/custom_font/data/font.bmp -text svneol=unset#image/bmp -packages/extra/libndsfpc/examples/devkitPro/Graphics/2D/custom_font/data/font.git svneol=native#text/plain -packages/extra/libndsfpc/examples/devkitPro/Graphics/2D/custom_font/main.pp svneol=native#text/plain -packages/extra/libndsfpc/examples/devkitPro/Graphics/2D/hello_world/main.pp svneol=native#text/plain -packages/extra/libndsfpc/examples/devkitPro/Graphics/2D/rotscale_text/data/font.bmp -text svneol=unset#image/bmp -packages/extra/libndsfpc/examples/devkitPro/Graphics/2D/rotscale_text/data/font.git svneol=native#text/plain -packages/extra/libndsfpc/examples/devkitPro/Graphics/2D/rotscale_text/main.pp svneol=native#text/plain -packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/BoxTest/main.pp svneol=native#text/plain -packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Display_List/main.pp svneol=native#text/plain -packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Display_List_2/data/teapot.bin -text -packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Display_List_2/main.pp svneol=native#text/plain -packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Env_Mapping/data/cafe.bin -text -packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Env_Mapping/data/teapot.bin -text -packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Env_Mapping/main.pp svneol=native#text/plain -packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Ortho/data/drunkenlogo.pcx -text svneol=unset#image/pcx -packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Ortho/main.pp svneol=native#text/plain -packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data.inc svneol=native#text/plain -packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture.bin -text svneol=unset#application/octet-stream -packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture1_RGB16_pal.bin -text svneol=unset#application/octet-stream -packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture1_RGB16_tex.bin -text -packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture2_RGB16_pal.bin -text -packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture2_RGB16_tex.bin -text -packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture3_RGB16_pal.bin -text -packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture3_RGB16_tex.bin -text -packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture4_RGB16_pal.bin -text -packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture4_RGB16_tex.bin -text -packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture5_RGB16_pal.bin -text svneol=unset#application/octet-stream -packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture5_RGB16_tex.bin -text -packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture6_RGB4_pal.bin -text svneol=unset#application/octet-stream -packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture6_RGB4_tex.bin -text -packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture7_RGB4_pal.bin -text svneol=unset#application/octet-stream -packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture7_RGB4_tex.bin -text -packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture8_RGB32_A3_pal.bin -text -packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture8_RGB32_A3_tex.bin -text -packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture9_RGB32_A3_pal.bin -text -packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture9_RGB32_A3_tex.bin -text -packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/main.pp svneol=native#text/plain -packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Picking/data/cone.bin -text -packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Picking/data/cylinder.bin -text -packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Picking/data/sphere.bin -text -packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Picking/main.pp svneol=native#text/plain -packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Simple_Quad/main.pp svneol=native#text/plain -packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Simple_Tri/main.pp svneol=native#text/plain -packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Textured_Cube/data/texture.bin -text svneol=unset#application/octet-stream -packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Textured_Cube/main.pp svneol=native#text/plain -packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Textured_Quad/data/texture.bin -text svneol=unset#application/octet-stream -packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Textured_Quad/main.pp svneol=native#text/plain -packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Toon_Shading/data/statue.bin -text -packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Toon_Shading/main.pp svneol=native#text/plain -packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson01/main.pp svneol=native#text/plain -packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson02/main1.pp svneol=native#text/plain -packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson03/main.pp svneol=native#text/plain -packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson04/main.pp svneol=native#text/plain -packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson05/main.pp svneol=native#text/plain -packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson06/drunkenlogo.pcx.o -text -packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson06/main.pp svneol=native#text/plain -packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson07/drunkenlogo.pcx.o -text -packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson07/main.pp svneol=native#text/plain -packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson08/drunkenlogo.pcx.o -text -packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson08/main.pp svneol=native#text/plain -packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson09/Star.pcx.o -text -packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson09/main.pp svneol=native#text/plain -packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson11/drunkenlogo.pcx.o -text -packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson11/main.pp svneol=native#text/plain -packages/extra/libndsfpc/examples/devkitPro/debugging/exceptionTest/main.pp svneol=native#text/plain -packages/extra/libndsfpc/examples/devkitPro/input/TouchTest/balldata.bin.o -text -packages/extra/libndsfpc/examples/devkitPro/input/TouchTest/ballpalette.bin.o -text -packages/extra/libndsfpc/examples/devkitPro/input/TouchTest/main.pp svneol=native#text/plain -packages/extra/libndsfpc/examples/devkitPro/sound/SimpleSound/blaster.raw.o -text -packages/extra/libndsfpc/examples/devkitPro/sound/SimpleSound/ion.raw.o -text -packages/extra/libndsfpc/examples/devkitPro/sound/SimpleSound/main.pp svneol=native#text/plain -packages/extra/libndsfpc/examples/devkitPro/sound/SimpleSound/saberoff.raw.o -text -packages/extra/libndsfpc/examples/dswifi/main7.pp svneol=native#text/plain -packages/extra/libndsfpc/examples/dswifi/main9.pp svneol=native#text/plain -packages/extra/libndsfpc/examples/libfat/main.pp svneol=native#text/plain -packages/extra/libndsfpc/examples/libfat/test1.txt svneol=native#text/plain -packages/extra/libndsfpc/examples/libmikmod/data/module.bin.o -text -packages/extra/libndsfpc/examples/libmikmod/main7.pp svneol=native#text/plain -packages/extra/libndsfpc/examples/libmikmod/main9.pp svneol=native#text/plain -packages/extra/libndsfpc/fat/fat.inc svneol=native#text/plain -packages/extra/libndsfpc/fat/fat.pp svneol=native#text/plain -packages/extra/libndsfpc/fat/gbfs.inc svneol=native#text/plain -packages/extra/libndsfpc/fat/gbfs.pp svneol=native#text/plain -packages/extra/libndsfpc/fpmake.inc svneol=native#text/plain -packages/extra/libndsfpc/fpmake.pp svneol=native#text/plain -packages/extra/libndsfpc/libmikmod/inc/mikmod.inc svneol=native#text/plain -packages/extra/libndsfpc/libmikmod/mikmod7.pp svneol=native#text/plain -packages/extra/libndsfpc/libmikmod/mikmod9.pp svneol=native#text/plain -packages/extra/libndsfpc/nds/arm7/audio.inc svneol=native#text/plain -packages/extra/libndsfpc/nds/arm7/clock.inc svneol=native#text/plain -packages/extra/libndsfpc/nds/arm7/serial.inc svneol=native#text/plain -packages/extra/libndsfpc/nds/arm7/touch.inc svneol=native#text/plain -packages/extra/libndsfpc/nds/arm9/background.inc svneol=native#text/plain -packages/extra/libndsfpc/nds/arm9/boxtest.inc svneol=native#text/plain -packages/extra/libndsfpc/nds/arm9/cache.inc svneol=native#text/plain -packages/extra/libndsfpc/nds/arm9/console.inc svneol=native#text/plain -packages/extra/libndsfpc/nds/arm9/exceptions.inc svneol=native#text/plain -packages/extra/libndsfpc/nds/arm9/image.inc svneol=native#text/plain -packages/extra/libndsfpc/nds/arm9/input.inc svneol=native#text/plain -packages/extra/libndsfpc/nds/arm9/math.inc svneol=native#text/plain -packages/extra/libndsfpc/nds/arm9/ndsmotion.inc svneol=native#text/plain -packages/extra/libndsfpc/nds/arm9/pcx.inc svneol=native#text/plain -packages/extra/libndsfpc/nds/arm9/postest.inc svneol=native#text/plain -packages/extra/libndsfpc/nds/arm9/rumble.inc svneol=native#text/plain -packages/extra/libndsfpc/nds/arm9/sound.inc svneol=native#text/plain -packages/extra/libndsfpc/nds/arm9/sprite.inc svneol=native#text/plain -packages/extra/libndsfpc/nds/arm9/trig_lut.inc svneol=native#text/plain -packages/extra/libndsfpc/nds/arm9/video.inc svneol=native#text/plain -packages/extra/libndsfpc/nds/arm9/videoGL.inc svneol=native#text/plain -packages/extra/libndsfpc/nds/bios.inc svneol=native#text/plain -packages/extra/libndsfpc/nds/card.inc svneol=native#text/plain -packages/extra/libndsfpc/nds/dma.inc svneol=native#text/plain -packages/extra/libndsfpc/nds/helper.inc svneol=native#text/plain -packages/extra/libndsfpc/nds/interrupts.inc svneol=native#text/plain -packages/extra/libndsfpc/nds/ipc.inc svneol=native#text/plain -packages/extra/libndsfpc/nds/jtypes.inc svneol=native#text/plain -packages/extra/libndsfpc/nds/memory.inc svneol=native#text/plain -packages/extra/libndsfpc/nds/nds.inc svneol=native#text/plain -packages/extra/libndsfpc/nds/ndsinclude.inc svneol=native#text/plain -packages/extra/libndsfpc/nds/registers_alt.inc svneol=native#text/plain -packages/extra/libndsfpc/nds/reload.inc svneol=native#text/plain -packages/extra/libndsfpc/nds/system.inc svneol=native#text/plain -packages/extra/libndsfpc/nds/timers.inc svneol=native#text/plain -packages/extra/libndsfpc/nds7.pp svneol=native#text/plain -packages/extra/libndsfpc/nds9.pp svneol=native#text/plain packages/extra/os2units/clkdll/Makefile svneol=native#text/plain packages/extra/os2units/clkdll/Makefile.fpc svneol=native#text/plain packages/extra/os2units/clkdll/fpmake.inc svneol=native#text/plain @@ -3591,6 +3441,155 @@ packages/libgd/fpmake.pp svneol=native#text/plain packages/libgd/src/gd.pp svneol=native#text/plain packages/libgd/tests/gdtest.pp svneol=native#text/plain packages/libgd/tests/gdtestcgi.pp svneol=native#text/plain +packages/libndsfpc/Makefile svneol=native#text/plain +packages/libndsfpc/Makefile.fpc svneol=native#text/plain +packages/libndsfpc/examples/devkitPro/Graphics/2D/16bit_color_bmp/data/drunkenlogo.git svneol=native#text/plain +packages/libndsfpc/examples/devkitPro/Graphics/2D/16bit_color_bmp/data/drunkenlogo.png -text svneol=unset#image/png +packages/libndsfpc/examples/devkitPro/Graphics/2D/16bit_color_bmp/main.pp svneol=native#text/plain +packages/libndsfpc/examples/devkitPro/Graphics/2D/256_color_bmp/data/drunkenlogo.git svneol=native#text/plain +packages/libndsfpc/examples/devkitPro/Graphics/2D/256_color_bmp/data/drunkenlogo.png -text svneol=unset#image/png +packages/libndsfpc/examples/devkitPro/Graphics/2D/256_color_bmp/main.pp svneol=native#text/plain +packages/libndsfpc/examples/devkitPro/Graphics/2D/BG_Rotation/drunkenlogo.bin.o -text +packages/libndsfpc/examples/devkitPro/Graphics/2D/BG_Rotation/main.pp svneol=native#text/plain +packages/libndsfpc/examples/devkitPro/Graphics/2D/BG_Rotation/palette.bin.o -text +packages/libndsfpc/examples/devkitPro/Graphics/2D/Complex_2D/data/ball.pcx -text svneol=unset#image/pcx +packages/libndsfpc/examples/devkitPro/Graphics/2D/Complex_2D/main.pp svneol=native#text/plain +packages/libndsfpc/examples/devkitPro/Graphics/2D/Double_Buffer/main.pp svneol=native#text/plain +packages/libndsfpc/examples/devkitPro/Graphics/2D/Sprite_Bitmap/main.pp svneol=native#text/plain +packages/libndsfpc/examples/devkitPro/Graphics/2D/ansi_console/main.pp svneol=native#text/plain +packages/libndsfpc/examples/devkitPro/Graphics/2D/custom_font/data/font.bmp -text svneol=unset#image/bmp +packages/libndsfpc/examples/devkitPro/Graphics/2D/custom_font/data/font.git svneol=native#text/plain +packages/libndsfpc/examples/devkitPro/Graphics/2D/custom_font/main.pp svneol=native#text/plain +packages/libndsfpc/examples/devkitPro/Graphics/2D/hello_world/main.pp svneol=native#text/plain +packages/libndsfpc/examples/devkitPro/Graphics/2D/rotscale_text/data/font.bmp -text svneol=unset#image/bmp +packages/libndsfpc/examples/devkitPro/Graphics/2D/rotscale_text/data/font.git svneol=native#text/plain +packages/libndsfpc/examples/devkitPro/Graphics/2D/rotscale_text/main.pp svneol=native#text/plain +packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/BoxTest/main.pp svneol=native#text/plain +packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Display_List/main.pp svneol=native#text/plain +packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Display_List_2/data/teapot.bin -text +packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Display_List_2/main.pp svneol=native#text/plain +packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Env_Mapping/data/cafe.bin -text +packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Env_Mapping/data/teapot.bin -text +packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Env_Mapping/main.pp svneol=native#text/plain +packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Ortho/data/drunkenlogo.pcx -text svneol=unset#image/pcx +packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Ortho/main.pp svneol=native#text/plain +packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data.inc svneol=native#text/plain +packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture.bin -text svneol=unset#application/octet-stream +packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture1_RGB16_pal.bin -text svneol=unset#application/octet-stream +packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture1_RGB16_tex.bin -text +packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture2_RGB16_pal.bin -text +packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture2_RGB16_tex.bin -text +packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture3_RGB16_pal.bin -text +packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture3_RGB16_tex.bin -text +packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture4_RGB16_pal.bin -text +packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture4_RGB16_tex.bin -text +packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture5_RGB16_pal.bin -text svneol=unset#application/octet-stream +packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture5_RGB16_tex.bin -text +packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture6_RGB4_pal.bin -text svneol=unset#application/octet-stream +packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture6_RGB4_tex.bin -text +packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture7_RGB4_pal.bin -text svneol=unset#application/octet-stream +packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture7_RGB4_tex.bin -text +packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture8_RGB32_A3_pal.bin -text +packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture8_RGB32_A3_tex.bin -text +packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture9_RGB32_A3_pal.bin -text +packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture9_RGB32_A3_tex.bin -text +packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/main.pp svneol=native#text/plain +packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Picking/data/cone.bin -text +packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Picking/data/cylinder.bin -text +packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Picking/data/sphere.bin -text +packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Picking/main.pp svneol=native#text/plain +packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Simple_Quad/main.pp svneol=native#text/plain +packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Simple_Tri/main.pp svneol=native#text/plain +packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Textured_Cube/data/texture.bin -text svneol=unset#application/octet-stream +packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Textured_Cube/main.pp svneol=native#text/plain +packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Textured_Quad/data/texture.bin -text svneol=unset#application/octet-stream +packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Textured_Quad/main.pp svneol=native#text/plain +packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Toon_Shading/data/statue.bin -text +packages/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Toon_Shading/main.pp svneol=native#text/plain +packages/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson01/main.pp svneol=native#text/plain +packages/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson02/main1.pp svneol=native#text/plain +packages/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson03/main.pp svneol=native#text/plain +packages/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson04/main.pp svneol=native#text/plain +packages/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson05/main.pp svneol=native#text/plain +packages/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson06/drunkenlogo.pcx.o -text +packages/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson06/main.pp svneol=native#text/plain +packages/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson07/drunkenlogo.pcx.o -text +packages/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson07/main.pp svneol=native#text/plain +packages/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson08/drunkenlogo.pcx.o -text +packages/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson08/main.pp svneol=native#text/plain +packages/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson09/Star.pcx.o -text +packages/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson09/main.pp svneol=native#text/plain +packages/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson11/drunkenlogo.pcx.o -text +packages/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson11/main.pp svneol=native#text/plain +packages/libndsfpc/examples/devkitPro/debugging/exceptionTest/main.pp svneol=native#text/plain +packages/libndsfpc/examples/devkitPro/input/TouchTest/balldata.bin.o -text +packages/libndsfpc/examples/devkitPro/input/TouchTest/ballpalette.bin.o -text +packages/libndsfpc/examples/devkitPro/input/TouchTest/main.pp svneol=native#text/plain +packages/libndsfpc/examples/devkitPro/sound/SimpleSound/blaster.raw.o -text +packages/libndsfpc/examples/devkitPro/sound/SimpleSound/ion.raw.o -text +packages/libndsfpc/examples/devkitPro/sound/SimpleSound/main.pp svneol=native#text/plain +packages/libndsfpc/examples/devkitPro/sound/SimpleSound/saberoff.raw.o -text +packages/libndsfpc/examples/dswifi/main7.pp svneol=native#text/plain +packages/libndsfpc/examples/dswifi/main9.pp svneol=native#text/plain +packages/libndsfpc/examples/libfat/main.pp svneol=native#text/plain +packages/libndsfpc/examples/libfat/test1.txt svneol=native#text/plain +packages/libndsfpc/examples/libmikmod/data/module.bin.o -text +packages/libndsfpc/examples/libmikmod/main7.pp svneol=native#text/plain +packages/libndsfpc/examples/libmikmod/main9.pp svneol=native#text/plain +packages/libndsfpc/fpmake.pp svneol=native#text/plain +packages/libndsfpc/src/dswifi/dswifi7.inc svneol=native#text/plain +packages/libndsfpc/src/dswifi/dswifi7.pp svneol=native#text/plain +packages/libndsfpc/src/dswifi/dswifi9.inc svneol=native#text/plain +packages/libndsfpc/src/dswifi/dswifi9.pp svneol=native#text/plain +packages/libndsfpc/src/dswifi/dswifi_version.inc svneol=native#text/plain +packages/libndsfpc/src/dswifi/netdb.inc svneol=native#text/plain +packages/libndsfpc/src/dswifi/netinet/in.inc svneol=native#text/plain +packages/libndsfpc/src/dswifi/sgIP_errno.inc svneol=native#text/plain +packages/libndsfpc/src/dswifi/sys/socket.inc svneol=native#text/plain +packages/libndsfpc/src/fat/fat.inc svneol=native#text/plain +packages/libndsfpc/src/fat/fat.pp svneol=native#text/plain +packages/libndsfpc/src/fat/gbfs.inc svneol=native#text/plain +packages/libndsfpc/src/fat/gbfs.pp svneol=native#text/plain +packages/libndsfpc/src/libmikmod/inc/mikmod.inc svneol=native#text/plain +packages/libndsfpc/src/libmikmod/mikmod7.pp svneol=native#text/plain +packages/libndsfpc/src/libmikmod/mikmod9.pp svneol=native#text/plain +packages/libndsfpc/src/nds/arm7/audio.inc svneol=native#text/plain +packages/libndsfpc/src/nds/arm7/clock.inc svneol=native#text/plain +packages/libndsfpc/src/nds/arm7/serial.inc svneol=native#text/plain +packages/libndsfpc/src/nds/arm7/touch.inc svneol=native#text/plain +packages/libndsfpc/src/nds/arm9/background.inc svneol=native#text/plain +packages/libndsfpc/src/nds/arm9/boxtest.inc svneol=native#text/plain +packages/libndsfpc/src/nds/arm9/cache.inc svneol=native#text/plain +packages/libndsfpc/src/nds/arm9/console.inc svneol=native#text/plain +packages/libndsfpc/src/nds/arm9/exceptions.inc svneol=native#text/plain +packages/libndsfpc/src/nds/arm9/image.inc svneol=native#text/plain +packages/libndsfpc/src/nds/arm9/input.inc svneol=native#text/plain +packages/libndsfpc/src/nds/arm9/math.inc svneol=native#text/plain +packages/libndsfpc/src/nds/arm9/ndsmotion.inc svneol=native#text/plain +packages/libndsfpc/src/nds/arm9/pcx.inc svneol=native#text/plain +packages/libndsfpc/src/nds/arm9/postest.inc svneol=native#text/plain +packages/libndsfpc/src/nds/arm9/rumble.inc svneol=native#text/plain +packages/libndsfpc/src/nds/arm9/sound.inc svneol=native#text/plain +packages/libndsfpc/src/nds/arm9/sprite.inc svneol=native#text/plain +packages/libndsfpc/src/nds/arm9/trig_lut.inc svneol=native#text/plain +packages/libndsfpc/src/nds/arm9/video.inc svneol=native#text/plain +packages/libndsfpc/src/nds/arm9/videoGL.inc svneol=native#text/plain +packages/libndsfpc/src/nds/bios.inc svneol=native#text/plain +packages/libndsfpc/src/nds/card.inc svneol=native#text/plain +packages/libndsfpc/src/nds/dma.inc svneol=native#text/plain +packages/libndsfpc/src/nds/helper.inc svneol=native#text/plain +packages/libndsfpc/src/nds/interrupts.inc svneol=native#text/plain +packages/libndsfpc/src/nds/ipc.inc svneol=native#text/plain +packages/libndsfpc/src/nds/jtypes.inc svneol=native#text/plain +packages/libndsfpc/src/nds/memory.inc svneol=native#text/plain +packages/libndsfpc/src/nds/nds.inc svneol=native#text/plain +packages/libndsfpc/src/nds/ndsinclude.inc svneol=native#text/plain +packages/libndsfpc/src/nds/registers_alt.inc svneol=native#text/plain +packages/libndsfpc/src/nds/reload.inc svneol=native#text/plain +packages/libndsfpc/src/nds/system.inc svneol=native#text/plain +packages/libndsfpc/src/nds/timers.inc svneol=native#text/plain +packages/libndsfpc/src/nds7.pp svneol=native#text/plain +packages/libndsfpc/src/nds9.pp svneol=native#text/plain packages/libpng/Makefile svneol=native#text/plain packages/libpng/Makefile.fpc svneol=native#text/plain packages/libpng/fpmake.pp svneol=native#text/plain 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 similarity index 72% rename from packages/extra/libndsfpc/Makefile rename to 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)) @@ -1507,8 +1845,12 @@ else endif ifdef inUnix /bin/sh $(ZIPWRAPPER) +else +ifdef RUNBATCH + $(RUNBATCH) (ZIPWRAPPER) else $(ZIPWRAPPER) +endif endif $(DEL) $(ZIPWRAPPER) else diff --git a/packages/extra/libndsfpc/Makefile.fpc b/packages/libndsfpc/Makefile.fpc similarity index 51% rename from packages/extra/libndsfpc/Makefile.fpc rename to 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 similarity index 100% rename from packages/extra/libndsfpc/examples/devkitPro/Graphics/2D/16bit_color_bmp/data/drunkenlogo.git rename to 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 similarity index 100% rename from packages/extra/libndsfpc/examples/devkitPro/Graphics/2D/16bit_color_bmp/data/drunkenlogo.png rename to 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 similarity index 100% rename from packages/extra/libndsfpc/examples/devkitPro/Graphics/2D/16bit_color_bmp/main.pp rename to 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 similarity index 100% rename from packages/extra/libndsfpc/examples/devkitPro/Graphics/2D/256_color_bmp/data/drunkenlogo.git rename to 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 similarity index 100% rename from packages/extra/libndsfpc/examples/devkitPro/Graphics/2D/256_color_bmp/data/drunkenlogo.png rename to 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 similarity index 100% rename from packages/extra/libndsfpc/examples/devkitPro/Graphics/2D/256_color_bmp/main.pp rename to 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 similarity index 100% rename from packages/extra/libndsfpc/examples/devkitPro/Graphics/2D/BG_Rotation/drunkenlogo.bin.o rename to 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 similarity index 100% rename from packages/extra/libndsfpc/examples/devkitPro/Graphics/2D/BG_Rotation/main.pp rename to 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 similarity index 100% rename from packages/extra/libndsfpc/examples/devkitPro/Graphics/2D/BG_Rotation/palette.bin.o rename to 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 similarity index 100% rename from packages/extra/libndsfpc/examples/devkitPro/Graphics/2D/Complex_2D/data/ball.pcx rename to 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 similarity index 100% rename from packages/extra/libndsfpc/examples/devkitPro/Graphics/2D/Complex_2D/main.pp rename to 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 similarity index 100% rename from packages/extra/libndsfpc/examples/devkitPro/Graphics/2D/Double_Buffer/main.pp rename to 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 similarity index 100% rename from packages/extra/libndsfpc/examples/devkitPro/Graphics/2D/Sprite_Bitmap/main.pp rename to 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 similarity index 100% rename from packages/extra/libndsfpc/examples/devkitPro/Graphics/2D/ansi_console/main.pp rename to 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 similarity index 100% rename from packages/extra/libndsfpc/examples/devkitPro/Graphics/2D/custom_font/data/font.bmp rename to 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 similarity index 100% rename from packages/extra/libndsfpc/examples/devkitPro/Graphics/2D/custom_font/data/font.git rename to 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 similarity index 100% rename from packages/extra/libndsfpc/examples/devkitPro/Graphics/2D/custom_font/main.pp rename to 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 similarity index 100% rename from packages/extra/libndsfpc/examples/devkitPro/Graphics/2D/hello_world/main.pp rename to 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 similarity index 100% rename from packages/extra/libndsfpc/examples/devkitPro/Graphics/2D/rotscale_text/data/font.bmp rename to 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 similarity index 100% rename from packages/extra/libndsfpc/examples/devkitPro/Graphics/2D/rotscale_text/data/font.git rename to 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 similarity index 100% rename from packages/extra/libndsfpc/examples/devkitPro/Graphics/2D/rotscale_text/main.pp rename to 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 similarity index 100% rename from packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/BoxTest/main.pp rename to 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 similarity index 100% rename from packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Display_List/main.pp rename to 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 similarity index 100% rename from packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Display_List_2/data/teapot.bin rename to 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 similarity index 100% rename from packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Display_List_2/main.pp rename to 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 similarity index 100% rename from packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Env_Mapping/data/cafe.bin rename to 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 similarity index 100% rename from packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Env_Mapping/data/teapot.bin rename to 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 similarity index 100% rename from packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Env_Mapping/main.pp rename to 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 similarity index 100% rename from packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Ortho/data/drunkenlogo.pcx rename to 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 similarity index 100% rename from packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Ortho/main.pp rename to 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 similarity index 100% rename from packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data.inc rename to 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 similarity index 100% rename from packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture.bin rename to 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 similarity index 100% rename from packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture1_RGB16_pal.bin rename to 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 similarity index 100% rename from packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture1_RGB16_tex.bin rename to 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 similarity index 100% rename from packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture2_RGB16_pal.bin rename to 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 similarity index 100% rename from packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture2_RGB16_tex.bin rename to 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 similarity index 100% rename from packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture3_RGB16_pal.bin rename to 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 similarity index 100% rename from packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture3_RGB16_tex.bin rename to 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 similarity index 100% rename from packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture4_RGB16_pal.bin rename to 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 similarity index 100% rename from packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture4_RGB16_tex.bin rename to 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 similarity index 100% rename from packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture5_RGB16_pal.bin rename to 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 similarity index 100% rename from packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture5_RGB16_tex.bin rename to 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 similarity index 100% rename from packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture6_RGB4_pal.bin rename to 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 similarity index 100% rename from packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture6_RGB4_tex.bin rename to 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 similarity index 100% rename from packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture7_RGB4_pal.bin rename to 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 similarity index 100% rename from packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture7_RGB4_tex.bin rename to 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 similarity index 100% rename from packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture8_RGB32_A3_pal.bin rename to 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 similarity index 100% rename from packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture8_RGB32_A3_tex.bin rename to 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 similarity index 100% rename from packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture9_RGB32_A3_pal.bin rename to 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 similarity index 100% rename from packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/data/texture9_RGB32_A3_tex.bin rename to 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 similarity index 100% rename from packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Paletted_Cube/main.pp rename to 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 similarity index 100% rename from packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Picking/data/cone.bin rename to 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 similarity index 100% rename from packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Picking/data/cylinder.bin rename to 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 similarity index 100% rename from packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Picking/data/sphere.bin rename to 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 similarity index 100% rename from packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Picking/main.pp rename to 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 similarity index 100% rename from packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Simple_Quad/main.pp rename to 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 similarity index 100% rename from packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Simple_Tri/main.pp rename to 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 similarity index 100% rename from packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Textured_Cube/data/texture.bin rename to 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 similarity index 100% rename from packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Textured_Cube/main.pp rename to 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 similarity index 100% rename from packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Textured_Quad/data/texture.bin rename to 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 similarity index 100% rename from packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Textured_Quad/main.pp rename to 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 similarity index 100% rename from packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Toon_Shading/data/statue.bin rename to 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 similarity index 100% rename from packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/Misc/Toon_Shading/main.pp rename to 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 similarity index 100% rename from packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson01/main.pp rename to 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 similarity index 100% rename from packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson02/main1.pp rename to 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 similarity index 100% rename from packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson03/main.pp rename to 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 similarity index 100% rename from packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson04/main.pp rename to 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 similarity index 100% rename from packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson05/main.pp rename to 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 similarity index 100% rename from packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson06/drunkenlogo.pcx.o rename to 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 similarity index 100% rename from packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson06/main.pp rename to 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 similarity index 100% rename from packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson07/drunkenlogo.pcx.o rename to 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 similarity index 100% rename from packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson07/main.pp rename to 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 similarity index 100% rename from packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson08/drunkenlogo.pcx.o rename to 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 similarity index 100% rename from packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson08/main.pp rename to 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 similarity index 100% rename from packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson09/Star.pcx.o rename to 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 similarity index 100% rename from packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson09/main.pp rename to 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 similarity index 100% rename from packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson11/drunkenlogo.pcx.o rename to 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 similarity index 100% rename from packages/extra/libndsfpc/examples/devkitPro/Graphics/3D/nehe/lesson11/main.pp rename to 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 similarity index 100% rename from packages/extra/libndsfpc/examples/devkitPro/debugging/exceptionTest/main.pp rename to 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 similarity index 100% rename from packages/extra/libndsfpc/examples/devkitPro/input/TouchTest/balldata.bin.o rename to 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 similarity index 100% rename from packages/extra/libndsfpc/examples/devkitPro/input/TouchTest/ballpalette.bin.o rename to 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 similarity index 100% rename from packages/extra/libndsfpc/examples/devkitPro/input/TouchTest/main.pp rename to 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 similarity index 100% rename from packages/extra/libndsfpc/examples/devkitPro/sound/SimpleSound/blaster.raw.o rename to 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 similarity index 100% rename from packages/extra/libndsfpc/examples/devkitPro/sound/SimpleSound/ion.raw.o rename to 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 similarity index 100% rename from packages/extra/libndsfpc/examples/devkitPro/sound/SimpleSound/main.pp rename to 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 similarity index 100% rename from packages/extra/libndsfpc/examples/devkitPro/sound/SimpleSound/saberoff.raw.o rename to 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 similarity index 100% rename from packages/extra/libndsfpc/examples/dswifi/main7.pp rename to packages/libndsfpc/examples/dswifi/main7.pp diff --git a/packages/extra/libndsfpc/examples/dswifi/main9.pp b/packages/libndsfpc/examples/dswifi/main9.pp similarity index 100% rename from packages/extra/libndsfpc/examples/dswifi/main9.pp rename to packages/libndsfpc/examples/dswifi/main9.pp diff --git a/packages/extra/libndsfpc/examples/libfat/main.pp b/packages/libndsfpc/examples/libfat/main.pp similarity index 100% rename from packages/extra/libndsfpc/examples/libfat/main.pp rename to packages/libndsfpc/examples/libfat/main.pp diff --git a/packages/extra/libndsfpc/examples/libfat/test1.txt b/packages/libndsfpc/examples/libfat/test1.txt similarity index 100% rename from packages/extra/libndsfpc/examples/libfat/test1.txt rename to 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 similarity index 100% rename from packages/extra/libndsfpc/examples/libmikmod/data/module.bin.o rename to 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 similarity index 100% rename from packages/extra/libndsfpc/examples/libmikmod/main7.pp rename to packages/libndsfpc/examples/libmikmod/main7.pp diff --git a/packages/extra/libndsfpc/examples/libmikmod/main9.pp b/packages/libndsfpc/examples/libmikmod/main9.pp similarity index 100% rename from packages/extra/libndsfpc/examples/libmikmod/main9.pp rename to 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 similarity index 100% rename from packages/extra/libndsfpc/dswifi/dswifi7.inc rename to packages/libndsfpc/src/dswifi/dswifi7.inc diff --git a/packages/extra/libndsfpc/dswifi/dswifi7.pp b/packages/libndsfpc/src/dswifi/dswifi7.pp similarity index 100% rename from packages/extra/libndsfpc/dswifi/dswifi7.pp rename to packages/libndsfpc/src/dswifi/dswifi7.pp diff --git a/packages/extra/libndsfpc/dswifi/dswifi9.inc b/packages/libndsfpc/src/dswifi/dswifi9.inc similarity index 100% rename from packages/extra/libndsfpc/dswifi/dswifi9.inc rename to packages/libndsfpc/src/dswifi/dswifi9.inc diff --git a/packages/extra/libndsfpc/dswifi/dswifi9.pp b/packages/libndsfpc/src/dswifi/dswifi9.pp similarity index 100% rename from packages/extra/libndsfpc/dswifi/dswifi9.pp rename to packages/libndsfpc/src/dswifi/dswifi9.pp diff --git a/packages/extra/libndsfpc/dswifi/dswifi_version.inc b/packages/libndsfpc/src/dswifi/dswifi_version.inc similarity index 100% rename from packages/extra/libndsfpc/dswifi/dswifi_version.inc rename to packages/libndsfpc/src/dswifi/dswifi_version.inc diff --git a/packages/extra/libndsfpc/dswifi/netdb.inc b/packages/libndsfpc/src/dswifi/netdb.inc similarity index 100% rename from packages/extra/libndsfpc/dswifi/netdb.inc rename to packages/libndsfpc/src/dswifi/netdb.inc diff --git a/packages/extra/libndsfpc/dswifi/netinet/in.inc b/packages/libndsfpc/src/dswifi/netinet/in.inc similarity index 100% rename from packages/extra/libndsfpc/dswifi/netinet/in.inc rename to 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 similarity index 100% rename from packages/extra/libndsfpc/dswifi/sgIP_errno.inc rename to 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 similarity index 100% rename from packages/extra/libndsfpc/dswifi/sys/socket.inc rename to packages/libndsfpc/src/dswifi/sys/socket.inc diff --git a/packages/extra/libndsfpc/fat/fat.inc b/packages/libndsfpc/src/fat/fat.inc similarity index 100% rename from packages/extra/libndsfpc/fat/fat.inc rename to packages/libndsfpc/src/fat/fat.inc diff --git a/packages/extra/libndsfpc/fat/fat.pp b/packages/libndsfpc/src/fat/fat.pp similarity index 100% rename from packages/extra/libndsfpc/fat/fat.pp rename to packages/libndsfpc/src/fat/fat.pp diff --git a/packages/extra/libndsfpc/fat/gbfs.inc b/packages/libndsfpc/src/fat/gbfs.inc similarity index 100% rename from packages/extra/libndsfpc/fat/gbfs.inc rename to packages/libndsfpc/src/fat/gbfs.inc diff --git a/packages/extra/libndsfpc/fat/gbfs.pp b/packages/libndsfpc/src/fat/gbfs.pp similarity index 100% rename from packages/extra/libndsfpc/fat/gbfs.pp rename to packages/libndsfpc/src/fat/gbfs.pp diff --git a/packages/extra/libndsfpc/libmikmod/inc/mikmod.inc b/packages/libndsfpc/src/libmikmod/inc/mikmod.inc similarity index 100% rename from packages/extra/libndsfpc/libmikmod/inc/mikmod.inc rename to packages/libndsfpc/src/libmikmod/inc/mikmod.inc diff --git a/packages/extra/libndsfpc/libmikmod/mikmod7.pp b/packages/libndsfpc/src/libmikmod/mikmod7.pp similarity index 100% rename from packages/extra/libndsfpc/libmikmod/mikmod7.pp rename to packages/libndsfpc/src/libmikmod/mikmod7.pp diff --git a/packages/extra/libndsfpc/libmikmod/mikmod9.pp b/packages/libndsfpc/src/libmikmod/mikmod9.pp similarity index 100% rename from packages/extra/libndsfpc/libmikmod/mikmod9.pp rename to packages/libndsfpc/src/libmikmod/mikmod9.pp diff --git a/packages/extra/libndsfpc/nds/arm7/audio.inc b/packages/libndsfpc/src/nds/arm7/audio.inc similarity index 100% rename from packages/extra/libndsfpc/nds/arm7/audio.inc rename to 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 similarity index 100% rename from packages/extra/libndsfpc/nds/arm7/clock.inc rename to 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 similarity index 100% rename from packages/extra/libndsfpc/nds/arm7/serial.inc rename to 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 similarity index 100% rename from packages/extra/libndsfpc/nds/arm7/touch.inc rename to 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 similarity index 100% rename from packages/extra/libndsfpc/nds/arm9/background.inc rename to 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 similarity index 100% rename from packages/extra/libndsfpc/nds/arm9/boxtest.inc rename to 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 similarity index 100% rename from packages/extra/libndsfpc/nds/arm9/cache.inc rename to 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 similarity index 100% rename from packages/extra/libndsfpc/nds/arm9/console.inc rename to 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 similarity index 100% rename from packages/extra/libndsfpc/nds/arm9/exceptions.inc rename to 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 similarity index 100% rename from packages/extra/libndsfpc/nds/arm9/image.inc rename to 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 similarity index 100% rename from packages/extra/libndsfpc/nds/arm9/input.inc rename to 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 similarity index 100% rename from packages/extra/libndsfpc/nds/arm9/math.inc rename to 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 similarity index 100% rename from packages/extra/libndsfpc/nds/arm9/ndsmotion.inc rename to 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 similarity index 100% rename from packages/extra/libndsfpc/nds/arm9/pcx.inc rename to 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 similarity index 100% rename from packages/extra/libndsfpc/nds/arm9/postest.inc rename to 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 similarity index 100% rename from packages/extra/libndsfpc/nds/arm9/rumble.inc rename to 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 similarity index 100% rename from packages/extra/libndsfpc/nds/arm9/sound.inc rename to 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 similarity index 100% rename from packages/extra/libndsfpc/nds/arm9/sprite.inc rename to 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 similarity index 100% rename from packages/extra/libndsfpc/nds/arm9/trig_lut.inc rename to 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 similarity index 100% rename from packages/extra/libndsfpc/nds/arm9/video.inc rename to 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 similarity index 100% rename from packages/extra/libndsfpc/nds/arm9/videoGL.inc rename to packages/libndsfpc/src/nds/arm9/videoGL.inc diff --git a/packages/extra/libndsfpc/nds/bios.inc b/packages/libndsfpc/src/nds/bios.inc similarity index 100% rename from packages/extra/libndsfpc/nds/bios.inc rename to packages/libndsfpc/src/nds/bios.inc diff --git a/packages/extra/libndsfpc/nds/card.inc b/packages/libndsfpc/src/nds/card.inc similarity index 100% rename from packages/extra/libndsfpc/nds/card.inc rename to packages/libndsfpc/src/nds/card.inc diff --git a/packages/extra/libndsfpc/nds/dma.inc b/packages/libndsfpc/src/nds/dma.inc similarity index 100% rename from packages/extra/libndsfpc/nds/dma.inc rename to packages/libndsfpc/src/nds/dma.inc diff --git a/packages/extra/libndsfpc/nds/helper.inc b/packages/libndsfpc/src/nds/helper.inc similarity index 100% rename from packages/extra/libndsfpc/nds/helper.inc rename to packages/libndsfpc/src/nds/helper.inc diff --git a/packages/extra/libndsfpc/nds/interrupts.inc b/packages/libndsfpc/src/nds/interrupts.inc similarity index 100% rename from packages/extra/libndsfpc/nds/interrupts.inc rename to packages/libndsfpc/src/nds/interrupts.inc diff --git a/packages/extra/libndsfpc/nds/ipc.inc b/packages/libndsfpc/src/nds/ipc.inc similarity index 100% rename from packages/extra/libndsfpc/nds/ipc.inc rename to packages/libndsfpc/src/nds/ipc.inc diff --git a/packages/extra/libndsfpc/nds/jtypes.inc b/packages/libndsfpc/src/nds/jtypes.inc similarity index 100% rename from packages/extra/libndsfpc/nds/jtypes.inc rename to packages/libndsfpc/src/nds/jtypes.inc diff --git a/packages/extra/libndsfpc/nds/memory.inc b/packages/libndsfpc/src/nds/memory.inc similarity index 100% rename from packages/extra/libndsfpc/nds/memory.inc rename to packages/libndsfpc/src/nds/memory.inc diff --git a/packages/extra/libndsfpc/nds/nds.inc b/packages/libndsfpc/src/nds/nds.inc similarity index 100% rename from packages/extra/libndsfpc/nds/nds.inc rename to packages/libndsfpc/src/nds/nds.inc diff --git a/packages/extra/libndsfpc/nds/ndsinclude.inc b/packages/libndsfpc/src/nds/ndsinclude.inc similarity index 100% rename from packages/extra/libndsfpc/nds/ndsinclude.inc rename to packages/libndsfpc/src/nds/ndsinclude.inc diff --git a/packages/extra/libndsfpc/nds/registers_alt.inc b/packages/libndsfpc/src/nds/registers_alt.inc similarity index 100% rename from packages/extra/libndsfpc/nds/registers_alt.inc rename to packages/libndsfpc/src/nds/registers_alt.inc diff --git a/packages/extra/libndsfpc/nds/reload.inc b/packages/libndsfpc/src/nds/reload.inc similarity index 100% rename from packages/extra/libndsfpc/nds/reload.inc rename to packages/libndsfpc/src/nds/reload.inc diff --git a/packages/extra/libndsfpc/nds/system.inc b/packages/libndsfpc/src/nds/system.inc similarity index 100% rename from packages/extra/libndsfpc/nds/system.inc rename to packages/libndsfpc/src/nds/system.inc diff --git a/packages/extra/libndsfpc/nds/timers.inc b/packages/libndsfpc/src/nds/timers.inc similarity index 100% rename from packages/extra/libndsfpc/nds/timers.inc rename to packages/libndsfpc/src/nds/timers.inc diff --git a/packages/extra/libndsfpc/nds7.pp b/packages/libndsfpc/src/nds7.pp similarity index 100% rename from packages/extra/libndsfpc/nds7.pp rename to packages/libndsfpc/src/nds7.pp diff --git a/packages/extra/libndsfpc/nds9.pp b/packages/libndsfpc/src/nds9.pp similarity index 100% rename from packages/extra/libndsfpc/nds9.pp rename to packages/libndsfpc/src/nds9.pp