From 27f9e258fc3f7cebc02831d9e42495689e973dea Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 20 Sep 2015 19:15:51 +0200 Subject: [PATCH] (CTR) Have to move ctr files back too --- Makefile.ctr | 24 ++++++++++++------------ {pkg/ctr => ctr}/2048.png | Bin {pkg/ctr => ctr}/Makefile.cores | 0 {pkg/ctr => ctr}/catsfc.png | Bin {pkg/ctr => ctr}/default.png | Bin {pkg/ctr => ctr}/fceumm.png | Bin {pkg/ctr => ctr}/gambatte.png | Bin {pkg/ctr => ctr}/genesis_plus_gx.png | Bin {pkg/ctr => ctr}/gpsp.png | Bin {pkg/ctr => ctr}/libretro_banner.png | Bin {pkg/ctr => ctr}/mednafen_ngp.png | Bin {pkg/ctr => ctr}/mednafen_vb.png | Bin {pkg/ctr => ctr}/mednafen_wswan.png | Bin {pkg/ctr => ctr}/mgba.png | Bin {pkg/ctr => ctr}/nestopia.png | Bin {pkg/ctr => ctr}/nxengine.png | Bin {pkg/ctr => ctr}/picodrive.png | Bin {pkg/ctr => ctr}/quicknes.png | Bin {pkg/ctr => ctr}/silent.wav | Bin {pkg/ctr => ctr}/snes9x_next.png | Bin {pkg/ctr => ctr}/tools/bannertool-linux | Bin {pkg/ctr => ctr}/tools/bannertool-mac | Bin {pkg/ctr => ctr}/tools/bannertool.exe | Bin {pkg/ctr => ctr}/tools/makerom-linux | Bin {pkg/ctr => ctr}/tools/makerom-mac | Bin {pkg/ctr => ctr}/tools/makerom.exe | Bin {pkg/ctr => ctr}/tools/template-3ds.rsf | 0 {pkg/ctr => ctr}/tools/template-cia.rsf | 0 28 files changed, 12 insertions(+), 12 deletions(-) rename {pkg/ctr => ctr}/2048.png (100%) rename {pkg/ctr => ctr}/Makefile.cores (100%) rename {pkg/ctr => ctr}/catsfc.png (100%) rename {pkg/ctr => ctr}/default.png (100%) rename {pkg/ctr => ctr}/fceumm.png (100%) rename {pkg/ctr => ctr}/gambatte.png (100%) rename {pkg/ctr => ctr}/genesis_plus_gx.png (100%) rename {pkg/ctr => ctr}/gpsp.png (100%) rename {pkg/ctr => ctr}/libretro_banner.png (100%) rename {pkg/ctr => ctr}/mednafen_ngp.png (100%) rename {pkg/ctr => ctr}/mednafen_vb.png (100%) rename {pkg/ctr => ctr}/mednafen_wswan.png (100%) rename {pkg/ctr => ctr}/mgba.png (100%) rename {pkg/ctr => ctr}/nestopia.png (100%) rename {pkg/ctr => ctr}/nxengine.png (100%) rename {pkg/ctr => ctr}/picodrive.png (100%) rename {pkg/ctr => ctr}/quicknes.png (100%) rename {pkg/ctr => ctr}/silent.wav (100%) rename {pkg/ctr => ctr}/snes9x_next.png (100%) rename {pkg/ctr => ctr}/tools/bannertool-linux (100%) rename {pkg/ctr => ctr}/tools/bannertool-mac (100%) rename {pkg/ctr => ctr}/tools/bannertool.exe (100%) rename {pkg/ctr => ctr}/tools/makerom-linux (100%) rename {pkg/ctr => ctr}/tools/makerom-mac (100%) rename {pkg/ctr => ctr}/tools/makerom.exe (100%) rename {pkg/ctr => ctr}/tools/template-3ds.rsf (100%) rename {pkg/ctr => ctr}/tools/template-cia.rsf (100%) diff --git a/Makefile.ctr b/Makefile.ctr index 75a999b97b..4e2a545d17 100644 --- a/Makefile.ctr +++ b/Makefile.ctr @@ -12,18 +12,18 @@ APP_DESCRIPTION = Retroarch 3DS APP_AUTHOR = Team Libretro APP_PRODUCT_CODE = RETROARCH-3DS APP_UNIQUE_ID = 0xBAC00 -APP_ICON = pkg/ctr/default.png -APP_BANNER = pkg/ctr/libretro_banner.png -APP_AUDIO = pkg/ctr/silent.wav -APP_CIA_RSF = pkg/ctr/tools/template-cia.rsf -APP_3DS_RSF = pkg/ctr/tools/template-3ds.rsf +APP_ICON = ctr/default.png +APP_BANNER = ctr/libretro_banner.png +APP_AUDIO = ctr/silent.wav +APP_CIA_RSF = ctr/tools/template-cia.rsf +APP_3DS_RSF = ctr/tools/template-3ds.rsf CTR_STACK_SIZE = 0x100000 CTR_HEAP_SIZE = 0x3400000 CTR_PROG_MEMSIZE = 0x500000 -include pkg/ctr/Makefile.cores +include ctr/Makefile.cores OBJS := @@ -336,14 +336,14 @@ NM := $(PREFIX)nm LD := $(CXX) ifneq ($(findstring Linux,$(shell uname -a)),) - MAKEROM = pkg/ctr/tools/makerom-linux - BANNERTOOL = pkg/ctr/tools/bannertool-linux + MAKEROM = ctr/tools/makerom-linux + BANNERTOOL = ctr/tools/bannertool-linux else ifneq ($(findstring Darwin,$(shell uname -a)),) - MAKEROM = pkg/ctr/tools/makerom-mac - BANNERTOOL = pkg/ctr/tools/bannertool-mac + MAKEROM = ctr/tools/makerom-mac + BANNERTOOL = ctr/tools/bannertool-mac else - MAKEROM = pkg/ctr/tools/makerom.exe - BANNERTOOL = pkg/ctr/tools/bannertool.exe + MAKEROM = ctr/tools/makerom.exe + BANNERTOOL = ctr/tools/bannertool.exe endif diff --git a/pkg/ctr/2048.png b/ctr/2048.png similarity index 100% rename from pkg/ctr/2048.png rename to ctr/2048.png diff --git a/pkg/ctr/Makefile.cores b/ctr/Makefile.cores similarity index 100% rename from pkg/ctr/Makefile.cores rename to ctr/Makefile.cores diff --git a/pkg/ctr/catsfc.png b/ctr/catsfc.png similarity index 100% rename from pkg/ctr/catsfc.png rename to ctr/catsfc.png diff --git a/pkg/ctr/default.png b/ctr/default.png similarity index 100% rename from pkg/ctr/default.png rename to ctr/default.png diff --git a/pkg/ctr/fceumm.png b/ctr/fceumm.png similarity index 100% rename from pkg/ctr/fceumm.png rename to ctr/fceumm.png diff --git a/pkg/ctr/gambatte.png b/ctr/gambatte.png similarity index 100% rename from pkg/ctr/gambatte.png rename to ctr/gambatte.png diff --git a/pkg/ctr/genesis_plus_gx.png b/ctr/genesis_plus_gx.png similarity index 100% rename from pkg/ctr/genesis_plus_gx.png rename to ctr/genesis_plus_gx.png diff --git a/pkg/ctr/gpsp.png b/ctr/gpsp.png similarity index 100% rename from pkg/ctr/gpsp.png rename to ctr/gpsp.png diff --git a/pkg/ctr/libretro_banner.png b/ctr/libretro_banner.png similarity index 100% rename from pkg/ctr/libretro_banner.png rename to ctr/libretro_banner.png diff --git a/pkg/ctr/mednafen_ngp.png b/ctr/mednafen_ngp.png similarity index 100% rename from pkg/ctr/mednafen_ngp.png rename to ctr/mednafen_ngp.png diff --git a/pkg/ctr/mednafen_vb.png b/ctr/mednafen_vb.png similarity index 100% rename from pkg/ctr/mednafen_vb.png rename to ctr/mednafen_vb.png diff --git a/pkg/ctr/mednafen_wswan.png b/ctr/mednafen_wswan.png similarity index 100% rename from pkg/ctr/mednafen_wswan.png rename to ctr/mednafen_wswan.png diff --git a/pkg/ctr/mgba.png b/ctr/mgba.png similarity index 100% rename from pkg/ctr/mgba.png rename to ctr/mgba.png diff --git a/pkg/ctr/nestopia.png b/ctr/nestopia.png similarity index 100% rename from pkg/ctr/nestopia.png rename to ctr/nestopia.png diff --git a/pkg/ctr/nxengine.png b/ctr/nxengine.png similarity index 100% rename from pkg/ctr/nxengine.png rename to ctr/nxengine.png diff --git a/pkg/ctr/picodrive.png b/ctr/picodrive.png similarity index 100% rename from pkg/ctr/picodrive.png rename to ctr/picodrive.png diff --git a/pkg/ctr/quicknes.png b/ctr/quicknes.png similarity index 100% rename from pkg/ctr/quicknes.png rename to ctr/quicknes.png diff --git a/pkg/ctr/silent.wav b/ctr/silent.wav similarity index 100% rename from pkg/ctr/silent.wav rename to ctr/silent.wav diff --git a/pkg/ctr/snes9x_next.png b/ctr/snes9x_next.png similarity index 100% rename from pkg/ctr/snes9x_next.png rename to ctr/snes9x_next.png diff --git a/pkg/ctr/tools/bannertool-linux b/ctr/tools/bannertool-linux similarity index 100% rename from pkg/ctr/tools/bannertool-linux rename to ctr/tools/bannertool-linux diff --git a/pkg/ctr/tools/bannertool-mac b/ctr/tools/bannertool-mac similarity index 100% rename from pkg/ctr/tools/bannertool-mac rename to ctr/tools/bannertool-mac diff --git a/pkg/ctr/tools/bannertool.exe b/ctr/tools/bannertool.exe similarity index 100% rename from pkg/ctr/tools/bannertool.exe rename to ctr/tools/bannertool.exe diff --git a/pkg/ctr/tools/makerom-linux b/ctr/tools/makerom-linux similarity index 100% rename from pkg/ctr/tools/makerom-linux rename to ctr/tools/makerom-linux diff --git a/pkg/ctr/tools/makerom-mac b/ctr/tools/makerom-mac similarity index 100% rename from pkg/ctr/tools/makerom-mac rename to ctr/tools/makerom-mac diff --git a/pkg/ctr/tools/makerom.exe b/ctr/tools/makerom.exe similarity index 100% rename from pkg/ctr/tools/makerom.exe rename to ctr/tools/makerom.exe diff --git a/pkg/ctr/tools/template-3ds.rsf b/ctr/tools/template-3ds.rsf similarity index 100% rename from pkg/ctr/tools/template-3ds.rsf rename to ctr/tools/template-3ds.rsf diff --git a/pkg/ctr/tools/template-cia.rsf b/ctr/tools/template-cia.rsf similarity index 100% rename from pkg/ctr/tools/template-cia.rsf rename to ctr/tools/template-cia.rsf