Merge pull request #59 from spicyjpeg/psxmdec

IRQ handler fix, .STR playback example, multiple library builds (v0.21)

10 files changed, 16 insertions, 54 deletions

diff --git a/examples/graphics/balls/CMakeLists.txt b/examples/graphics/balls/CMakeLists.txt
index deee473..03c2720 100644
--- a/examples/graphics/balls/CMakeLists.txt
+++ b/examples/graphics/balls/CMakeLists.txt
@@ -1,7 +1,7 @@
 # PSn00bSDK example CMake script
 # (C) 2021 spicyjpeg - MPL licensed
 
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.21)
 
 project(
 	balls
@@ -12,7 +12,7 @@ project(
 )
 
 file(GLOB _sources *.c)
-psn00bsdk_add_executable(balls STATIC ${_sources})
+psn00bsdk_add_executable(balls GPREL ${_sources})
 #psn00bsdk_add_cd_image(balls_iso balls iso.xml DEPENDS balls)
 
 psn00bsdk_target_incbin(balls PRIVATE ball16c ball16c.tim)
diff --git a/examples/graphics/billboard/CMakeLists.txt b/examples/graphics/billboard/CMakeLists.txt
index 4fc668d..5288896 100644
--- a/examples/graphics/billboard/CMakeLists.txt
+++ b/examples/graphics/billboard/CMakeLists.txt
@@ -1,7 +1,7 @@
 # PSn00bSDK example CMake script
 # (C) 2021 spicyjpeg - MPL licensed
 
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.21)
 
 project(
 	billboard
@@ -12,7 +12,7 @@ project(
 )
 
 file(GLOB _sources *.c)
-psn00bsdk_add_executable(billboard STATIC ${_sources})
+psn00bsdk_add_executable(billboard GPREL ${_sources})
 #psn00bsdk_add_cd_image(billboard_iso billboard iso.xml DEPENDS billboard)
 
 psn00bsdk_target_incbin(billboard PRIVATE tim_image texture64.tim)
diff --git a/examples/graphics/fpscam/CMakeLists.txt b/examples/graphics/fpscam/CMakeLists.txt
index cb0c086..2c21296 100644
--- a/examples/graphics/fpscam/CMakeLists.txt
+++ b/examples/graphics/fpscam/CMakeLists.txt
@@ -1,7 +1,7 @@
 # PSn00bSDK example CMake script
 # (C) 2021 spicyjpeg - MPL licensed
 
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.21)
 
 project(
 	fpscam
@@ -12,7 +12,7 @@ project(
 )
 
 file(GLOB _sources *.c)
-psn00bsdk_add_executable(fpscam STATIC ${_sources})
+psn00bsdk_add_executable(fpscam GPREL ${_sources})
 #psn00bsdk_add_cd_image(fpscam_iso fpscam iso.xml DEPENDS fpscam)
 
 install(FILES ${PROJECT_BINARY_DIR}/fpscam.exe TYPE BIN)
diff --git a/examples/graphics/gte/CMakeLists.txt b/examples/graphics/gte/CMakeLists.txt
index 90d897b..e9ab4f3 100644
--- a/examples/graphics/gte/CMakeLists.txt
+++ b/examples/graphics/gte/CMakeLists.txt
@@ -1,7 +1,7 @@
 # PSn00bSDK example CMake script
 # (C) 2021 spicyjpeg - MPL licensed
 
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.21)
 
 project(
 	gte
@@ -12,7 +12,7 @@ project(
 )
 
 file(GLOB _sources *.c)
-psn00bsdk_add_executable(gte STATIC ${_sources})
+psn00bsdk_add_executable(gte GPREL ${_sources})
 #psn00bsdk_add_cd_image(gte_iso gte iso.xml DEPENDS gte)
 
 psn00bsdk_target_incbin(gte PRIVATE tim_texture texture.tim)
diff --git a/examples/graphics/hdtv/CMakeLists.txt b/examples/graphics/hdtv/CMakeLists.txt
index 804b096..78411f5 100644
--- a/examples/graphics/hdtv/CMakeLists.txt
+++ b/examples/graphics/hdtv/CMakeLists.txt
@@ -1,7 +1,7 @@
 # PSn00bSDK example CMake script
 # (C) 2021 spicyjpeg - MPL licensed
 
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.21)
 
 project(
 	hdtv
@@ -12,7 +12,7 @@ project(
 )
 
 file(GLOB _sources *.c)
-psn00bsdk_add_executable(hdtv STATIC ${_sources})
+psn00bsdk_add_executable(hdtv GPREL ${_sources})
 #psn00bsdk_add_cd_image(hdtv_iso hdtv iso.xml DEPENDS hdtv)
 
 install(FILES ${PROJECT_BINARY_DIR}/hdtv.exe TYPE BIN)
diff --git a/examples/graphics/render2tex/CMakeLists.txt b/examples/graphics/render2tex/CMakeLists.txt
index a97cf02..1ef36e0 100644
--- a/examples/graphics/render2tex/CMakeLists.txt
+++ b/examples/graphics/render2tex/CMakeLists.txt
@@ -1,7 +1,7 @@
 # PSn00bSDK example CMake script
 # (C) 2021 spicyjpeg - MPL licensed
 
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.21)
 
 project(
 	render2tex
@@ -12,7 +12,7 @@ project(
 )
 
 file(GLOB _sources *.c)
-psn00bsdk_add_executable(render2tex STATIC ${_sources})
+psn00bsdk_add_executable(render2tex GPREL ${_sources})
 #psn00bsdk_add_cd_image(render2tex_iso render2tex iso.xml DEPENDS render2tex)
 
 psn00bsdk_target_incbin(render2tex PRIVATE tim_blendpattern blendpattern-16c.tim)
diff --git a/examples/graphics/rgb24/CMakeLists.txt b/examples/graphics/rgb24/CMakeLists.txt
index 9565b8b..de81db0 100644
--- a/examples/graphics/rgb24/CMakeLists.txt
+++ b/examples/graphics/rgb24/CMakeLists.txt
@@ -1,7 +1,7 @@
 # PSn00bSDK example CMake script
 # (C) 2021 spicyjpeg - MPL licensed
 
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.21)
 
 project(
 	rgb24
@@ -12,7 +12,7 @@ project(
 )
 
 file(GLOB _sources *.c)
-psn00bsdk_add_executable(rgb24 STATIC ${_sources})
+psn00bsdk_add_executable(rgb24 GPREL ${_sources})
 #psn00bsdk_add_cd_image(rgb24_iso rgb24 iso.xml DEPENDS rgb24)
 
 psn00bsdk_target_incbin(rgb24 PRIVATE tim_image bunpattern.tim)
diff --git a/examples/graphics/tilesasm/CMakeLists.txt b/examples/graphics/tilesasm/CMakeLists.txt
index 5b8de96..21ceafc 100644
--- a/examples/graphics/tilesasm/CMakeLists.txt
+++ b/examples/graphics/tilesasm/CMakeLists.txt
@@ -1,7 +1,7 @@
 # PSn00bSDK example CMake script
 # (C) 2021 spicyjpeg - MPL licensed
 
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.21)
 
 project(
 	tilesasm
@@ -12,7 +12,7 @@ project(
 )
 
 file(GLOB _sources *.s *.c)
-psn00bsdk_add_executable(tilesasm STATIC ${_sources})
+psn00bsdk_add_executable(tilesasm GPREL ${_sources})
 #psn00bsdk_add_cd_image(tilesasm_iso tilesasm iso.xml DEPENDS tilesasm)
 
 psn00bsdk_target_incbin(tilesasm PRIVATE tim_tileset tiles_256.tim)
diff --git a/examples/graphics/tilesasm/iso.xml b/examples/graphics/tilesasm/iso.xml
deleted file mode 100644
index 477c636..0000000
--- a/examples/graphics/tilesasm/iso.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-	This file is processed by CMake and used by mkpsxiso to build the CD image.
-
-	NOTE: all paths are relative to the build directory; if you want to include
-	a file from the source tree, you'll have to prepend its path with
-	${PROJECT_SOURCE_DIR}.
--->
-<iso_project
-	image_name="${CD_IMAGE_NAME}.bin"
-	cue_sheet="${CD_IMAGE_NAME}.cue"
->
-	<track type="data">
-		<identifiers
-			system			="PLAYSTATION"
-			volume			="PSN00BSDK_TEMPLATE"
-			volume_set		="PSN00BSDK_TEMPLATE"
-			publisher		="MEIDOTEK"
-			data_preparer	="PSN00BSDK ${PSN00BSDK_VERSION}"
-			application		="PLAYSTATION"
-			copyright		="README.TXT;1"
-		/>
-
-		<directory_tree>
-			<file name="SYSTEM.CNF"		type="data" source="${PROJECT_SOURCE_DIR}/system.cnf" />
-			<file name="TEMPLATE.EXE"	type="data" source="template.exe" />
-			<file name="TEMPLATE.MAP"	type="data" source="template.map" />
-
-			<dummy sectors="1024"/>
-		</directory_tree>
-	</track>
-
-	<!--<track type="audio" source="track2.wav" />-->
-</iso_project>
diff --git a/examples/graphics/tilesasm/system.cnf b/examples/graphics/tilesasm/system.cnf
deleted file mode 100644
index e221726..0000000
--- a/examples/graphics/tilesasm/system.cnf
+++ /dev/null
@@ -1,4 +0,0 @@
-BOOT=cdrom:\template.exe;1
-TCB=4
-EVENT=10
-STACK=801FFFF0