Source code reorgnaizations

2025-06-26 05:32:47 +00:00 · 2017-09-04 16:18:07 +02:00 · 2017-09-04 16:18:07 +02:00 · 8d1f39d235
commit 8d1f39d235
parent ebf904a2c2
22 changed files with 7 additions and 6 deletions
--- a/.gitignore
+++ b/.gitignore
@ -39,4 +39,5 @@

 # User additions
 /data/aeskeydb.bin
+/data/aeskeydb_.bin
 /zzz_backup
--- a/4
+++ b/4
@ -21,9 +21,9 @@ ifeq ($(SAFEMODE),1)
 	export TARGET	:=	SafeMode9
 endif
 BUILD		:=	build
-SOURCES		:=	source source/common source/filesys source/crypto source/fatfs source/nand source/virtual source/game source/gamecart source/quicklz source/system
+SOURCES		:=	source source/common source/filesys source/crypto source/fatfs source/nand source/virtual source/game source/gamecart source/quicklz source/system source/utils
 DATA		:=	data
-INCLUDES	:=	common source source/common source/font source/filesys source/crypto source/fatfs source/nand source/virtual source/game source/gamecart source/quicklz source/system
+INCLUDES	:=	common source source/common source/font source/filesys source/crypto source/fatfs source/nand source/virtual source/game source/gamecart source/quicklz source/system source/utils

 #---------------------------------------------------------------------------------
 # options for code generation
--- a/source/common/common.h
+++ b/source/common/common.h
@ -78,7 +78,7 @@
 // buffer area defines (in use by sddata.c)
 #define SDCRYPT_BUFFER      ((u8*)0x21400000)
 #define SDCRYPT_BUFFER_SIZE (0x100000)
-// buffer area defines (in use by fsscript.c)
+// buffer area defines (in use by scripting.c)
 #define SCRIPT_BUFFER       ((u8*)0x21500000)
 #define SCRIPT_BUFFER_SIZE  (0x100000)
 // buffer area defines (in use by vgame.c)
--- a/source/common/font.h
+++ b/source/common/font.h
--- a/source/common/font_6x10.h
+++ b/source/common/font_6x10.h
--- a/source/common/font_acorn_8x8.h
+++ b/source/common/font_acorn_8x8.h
--- a/source/common/font_gb_7x6.h
+++ b/source/common/font_gb_7x6.h
--- a/source/common/font_orig.h
+++ b/source/common/font_orig.h
--- a/source/filesys/filetype.c
+++ b/source/filesys/filetype.c
@ -5,7 +5,7 @@
 #include "game.h"
 #include "keydb.h"
 #include "ctrtransfer.h"
-#include "fsscript.h"
+#include "scripting.h"

 u32 IdentifyFileType(const char* path) {
    const u8 romfs_magic[] = { ROMFS_MAGIC };
--- a/source/godmode.c
+++ b/source/godmode.c
@ -6,7 +6,7 @@
 #include "fsutil.h"
 #include "fsperm.h"
 #include "fsgame.h"
-#include "fsscript.h"
+#include "scripting.h"
 #include "gameutil.h"
 #include "keydbutil.h"
 #include "nandutil.h"
--- a/source/utils/ctrtransfer.c
+++ b/source/utils/ctrtransfer.c
--- a/source/utils/ctrtransfer.h
+++ b/source/utils/ctrtransfer.h
--- a/source/utils/gameutil.c
+++ b/source/utils/gameutil.c
--- a/source/utils/gameutil.h
+++ b/source/utils/gameutil.h
--- a/source/utils/keydbutil.c
+++ b/source/utils/keydbutil.c
--- a/source/utils/keydbutil.h
+++ b/source/utils/keydbutil.h
--- a/source/utils/nandutil.c
+++ b/source/utils/nandutil.c
--- a/source/utils/nandutil.h
+++ b/source/utils/nandutil.h
--- a/source/filesys/fsscript.c
+++ b/source/filesys/fsscript.c
@ -1,4 +1,4 @@
-#include "fsscript.h"
+#include "scripting.h"
 #include "fsutil.h"
 #include "fsinit.h"
 #include "fsperm.h"
--- a/source/filesys/fsscript.h
+++ b/source/filesys/fsscript.h
--- a/source/system/sysinfo.c
+++ b/source/system/sysinfo.c
--- a/source/system/sysinfo.h
+++ b/source/system/sysinfo.h