Merge pull request #70 from Lameguy64/v0.23-wip

Header cleanups, PCDRV, more safety checks, libc and mkpsxiso fixes (v0.23)

5 files changed, 4 insertions, 79 deletions

diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index c48bc10..9246e19 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -38,11 +38,7 @@ file(
 )
 
 add_library(lzp STATIC ${_sources})
-target_include_directories(
-	lzp PUBLIC
-	lzpack/lzp
-	${LIBPSN00B_PATH}/include/lzp
-)
+target_include_directories(lzp PUBLIC ${LIBPSN00B_PATH}/lzp)
 
 ## Executables
 
diff --git a/tools/lzpack/lzp/lzconfig.h b/tools/lzpack/lzp/lzconfig.h
deleted file mode 100644
index 65e623c..0000000
--- a/tools/lzpack/lzp/lzconfig.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*!	\file lzconfig.h
- *	\brief Library configuration header
- *	\details Define settings will only take effect when you recompile the library.
- */
-
-#ifndef _LZP_CONFIG_H
-#define _LZP_CONFIG_H
-
-
-#ifndef TRUE
-#define TRUE	1
-#endif
-#ifndef FALSE
-#define FALSE	0
-#endif
-
-
-/* Set to TRUE to compile without data compression routines useful if you
- * plan to use this library on a program that does not require said routines
- * especially on a platform with limited memory (such as the PlayStation).
- *
- * This define will rule out lzCompress(), lzSetHashSizes() and
- * lzResetHashSizes() functions and their associated functions.
- */
-#define LZP_NO_COMPRESS		FALSE
-
-
-/* Set to TRUE to make default compression table sizes to maximum and works best
- * when compressing large amounts of data. LZP_USE_MALLOC must be set to TRUE to
- * prevent stack overflow errors.
- *
- * Do not enable this if you plan to compile for a platform with limited memory
- * otherwise, the library will consume all memory and crash the system.
- *
- * This define only affects lzCompress().
- */
-#define LZP_MAX_COMPRESS	TRUE
-
-
-/* Uncomment to make the library use malloc() instead of array initializers to
- * allocate hash tables. Enabling this is a must if you plan to use large hash
- * and window table sizes.
- */
-#define LZP_USE_MALLOC		TRUE
-
-
-/* Hash table sizes (in power-of-two multiple units)
- *
- * These define only affect lzCompress().
- */
-#if LZP_MAX_COMPRESS == TRUE
-
-// Minimal defaults
-#define LZP_WINDOW_SIZE	17
-#define LZP_HASH1_SIZE	8
-#define LZP_HASH2_SIZE	10
-
-#else
-
-// Maximum defaults
-#define LZP_WINDOW_SIZE	17
-#define LZP_HASH1_SIZE	22
-#define LZP_HASH2_SIZE	24
-
-#endif
-
-
-#endif // _LZP_CONFIG_H
diff --git a/tools/mkpsxiso b/tools/mkpsxiso
-Subproject 7bcb4ad2086a8004da32d0ee2289093ed8d4872
+Subproject 9f6275f08829ea9de8122c8232a019e8724acbb
diff --git a/tools/tinyxml2 b/tools/tinyxml2
-Subproject e45d9d16d430a3f5d3eee9fe40d5e194e1e5e63
+Subproject e05956094c27117f989d22f25b75633123d72a8
diff --git a/tools/util/elf2x.c b/tools/util/elf2x.c
index 38ed60d..fc0ea9f 100644
--- a/tools/util/elf2x.c
+++ b/tools/util/elf2x.c
@@ -237,13 +237,10 @@ int main(int argc, char** argv) {
 	exe.params.t_size = exe_tsize;
 	exe.params.pc0 = head.prg_entry_addr;
 
-	// Some later PAL BIOS versions seem to actually verify the license string
-	// in the executable (despite what the nocash docs claim) and display the
-	// dreaded "insert PlayStation CD-ROM" screen if it's not valid.
 	strncpy( exe.header, "PS-X EXE", 8 );
-	strcpy( exe.license,
-		"Sony Computer Entertainment Inc. for Europe area" );
-	strcpy( exe.pad2, "Built using GCC and PSn00bSDK libraries" );
+	//strcpy( exe.license,
+		//"Sony Computer Entertainment Inc. for Europe area" );
+	//strcpy( exe.pad2, "Built using GCC and PSn00bSDK libraries" );
 
 
 	// Write file