Add missing CD image dependencies to CMake scripts

14 files changed, 32 insertions, 43 deletions

diff --git a/examples/cdrom/cdbrowse/CMakeLists.txt b/examples/cdrom/cdbrowse/CMakeLists.txt
index 0cc091f..70a4585 100644
--- a/examples/cdrom/cdbrowse/CMakeLists.txt
+++ b/examples/cdrom/cdbrowse/CMakeLists.txt
@@ -13,7 +13,10 @@ project(
 
 file(GLOB _sources *.c)
 psn00bsdk_add_executable(cdbrowse GPREL ${_sources})
-psn00bsdk_add_cd_image(cdbrowse_iso cdbrowse iso.xml DEPENDS cdbrowse)
+psn00bsdk_add_cd_image(
+	cdbrowse_iso cdbrowse iso.xml
+	DEPENDS cdbrowse system.cnf
+)
 
 psn00bsdk_target_incbin(cdbrowse PRIVATE ball16c ball16c.tim)
 
diff --git a/examples/cdrom/cdbrowse/iso.xml b/examples/cdrom/cdbrowse/iso.xml
index 771b0e9..f1c00f7 100644
--- a/examples/cdrom/cdbrowse/iso.xml
+++ b/examples/cdrom/cdbrowse/iso.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<iso_project
-	image_name="${CD_IMAGE_NAME}.bin"
-	cue_sheet="${CD_IMAGE_NAME}.cue"
->
+<iso_project>
 	<track type="data">
 		<identifiers
 			system			="PLAYSTATION"
diff --git a/examples/cdrom/cdxa/CMakeLists.txt b/examples/cdrom/cdxa/CMakeLists.txt
index fd2f653..07e6ae4 100644
--- a/examples/cdrom/cdxa/CMakeLists.txt
+++ b/examples/cdrom/cdxa/CMakeLists.txt
@@ -11,10 +11,12 @@ project(
 	HOMEPAGE_URL "http://lameguy64.net/?page=psn00bsdk"
 )
 
-# TODO: add rules to actually generate a valid .XA file
 file(GLOB _sources *.c)
 psn00bsdk_add_executable(cdxa GPREL ${_sources})
-#psn00bsdk_add_cd_image(cdxa_iso cdxa iso.xml DEPENDS cdxa)
+#psn00bsdk_add_cd_image(
+	#cdxa_iso cdxa iso.xml
+	#DEPENDS cdxa system.cnf xasample.xa
+#)
 
 psn00bsdk_target_incbin(cdxa PRIVATE ball16c ball16c.tim)
 
diff --git a/examples/cdrom/cdxa/iso.xml b/examples/cdrom/cdxa/iso.xml
index 6715f94..f935d26 100644
--- a/examples/cdrom/cdxa/iso.xml
+++ b/examples/cdrom/cdxa/iso.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<iso_project
-	image_name="${CD_IMAGE_NAME}.bin"
-	cue_sheet="${CD_IMAGE_NAME}.cue"
->
+<iso_project>
 	<track type="data">
 		<identifiers
 			system			="PLAYSTATION"
diff --git a/examples/io/system573/iso.xml b/examples/io/system573/iso.xml
index c960b8a..d22665c 100644
--- a/examples/io/system573/iso.xml
+++ b/examples/io/system573/iso.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<iso_project
-	image_name="${CD_IMAGE_NAME}.bin"
-	cue_sheet="${CD_IMAGE_NAME}.cue"
->
+<iso_project>
 	<track type="data">
 		<identifiers
 			system			="PLAYSTATION"
diff --git a/examples/mdec/strvideo/CMakeLists.txt b/examples/mdec/strvideo/CMakeLists.txt
index d41556b..f6695c0 100644
--- a/examples/mdec/strvideo/CMakeLists.txt
+++ b/examples/mdec/strvideo/CMakeLists.txt
@@ -13,7 +13,10 @@ project(
 
 file(GLOB _sources *.c)
 psn00bsdk_add_executable(strvideo GPREL ${_sources})
-#psn00bsdk_add_cd_image(strvideo_iso strvideo iso.xml DEPENDS strvideo)
+#psn00bsdk_add_cd_image(
+	#strvideo_iso strvideo iso.xml
+	#DEPENDS strvideo system.cnf video.str
+#)
 
 install(
 	FILES
diff --git a/examples/mdec/strvideo/iso.xml b/examples/mdec/strvideo/iso.xml
index 65e0ff5..8ba67dd 100644
--- a/examples/mdec/strvideo/iso.xml
+++ b/examples/mdec/strvideo/iso.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<iso_project
-	image_name="${CD_IMAGE_NAME}.bin"
-	cue_sheet="${CD_IMAGE_NAME}.cue"
->
+<iso_project>
 	<track type="data">
 		<identifiers
 			system			="PLAYSTATION"
diff --git a/examples/sound/cdstream/CMakeLists.txt b/examples/sound/cdstream/CMakeLists.txt
index e569449..d04761c 100644
--- a/examples/sound/cdstream/CMakeLists.txt
+++ b/examples/sound/cdstream/CMakeLists.txt
@@ -13,7 +13,10 @@ project(
 
 file(GLOB _sources *.c)
 psn00bsdk_add_executable(cdstream GPREL ${_sources})
-psn00bsdk_add_cd_image(cdstream_iso cdstream iso.xml DEPENDS cdstream)
+psn00bsdk_add_cd_image(
+	cdstream_iso cdstream iso.xml
+	DEPENDS cdstream system.cnf stream.vag
+)
 
 install(
 	FILES
diff --git a/examples/sound/cdstream/iso.xml b/examples/sound/cdstream/iso.xml
index 66f1f74..10128eb 100644
--- a/examples/sound/cdstream/iso.xml
+++ b/examples/sound/cdstream/iso.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<iso_project
-	image_name="${CD_IMAGE_NAME}.bin"
-	cue_sheet="${CD_IMAGE_NAME}.cue"
->
+<iso_project>
 	<track type="data">
 		<identifiers
 			system			="PLAYSTATION"
diff --git a/examples/system/dynlink/CMakeLists.txt b/examples/system/dynlink/CMakeLists.txt
index e750fd1..a1fd24e 100644
--- a/examples/system/dynlink/CMakeLists.txt
+++ b/examples/system/dynlink/CMakeLists.txt
@@ -17,7 +17,7 @@ psn00bsdk_add_library   (dynlink_cube  SHARED library/cube.c)
 psn00bsdk_add_library   (dynlink_balls SHARED library/balls.c)
 psn00bsdk_add_cd_image(
 	dynlink_iso dynlink iso.xml
-	DEPENDS dynlink_main dynlink_cube dynlink_balls
+	DEPENDS dynlink_main dynlink_cube dynlink_balls system.cnf
 )
 
 psn00bsdk_target_incbin(dynlink_balls PRIVATE ball16c library/ball16c.tim)
diff --git a/examples/system/dynlink/iso.xml b/examples/system/dynlink/iso.xml
index 8f40510..93cb948 100644
--- a/examples/system/dynlink/iso.xml
+++ b/examples/system/dynlink/iso.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<iso_project
-	image_name="${CD_IMAGE_NAME}.bin"
-	cue_sheet="${CD_IMAGE_NAME}.cue"
->
+<iso_project>
 	<track type="data">
 		<identifiers
 			system			="PLAYSTATION"
diff --git a/libpsn00b/cmake/internal_setup.cmake b/libpsn00b/cmake/internal_setup.cmake
index 9e7a4d3..e34ff63 100644
--- a/libpsn00b/cmake/internal_setup.cmake
+++ b/libpsn00b/cmake/internal_setup.cmake
@@ -280,23 +280,22 @@ function(psn00bsdk_add_cd_image name image_name config_file)
 
 	cmake_path(HASH config_file _hash)
 
-	set(CD_IMAGE_NAME  ${image_name})
-	set(CD_CONFIG_FILE ${CMAKE_CURRENT_BINARY_DIR}/cd_image_${_hash}.xml)
-	configure_file("${config_file}" ${CD_CONFIG_FILE})
+	set(_xml_file ${CMAKE_CURRENT_BINARY_DIR}/cd_image_${_hash}.xml)
+	configure_file("${config_file}" ${_xml_file})
 
 	add_custom_command(
-		OUTPUT ${CD_IMAGE_NAME}.bin ${CD_IMAGE_NAME}.cue
+		OUTPUT ${image_name}.bin ${image_name}.cue
 		COMMAND
 			${MKPSXISO} -y
-			-o ${CD_IMAGE_NAME}.bin -c ${CD_IMAGE_NAME}.cue ${CD_CONFIG_FILE}
-		COMMENT "Building CD image ${CD_IMAGE_NAME}"
+			-o ${image_name}.bin -c ${image_name}.cue ${_xml_file}
+		COMMENT "Building CD image ${image_name}"
 		VERBATIM
 		${ARGN}
 	)
 	add_custom_target(
 		${name} ALL
 		DEPENDS
-			${CMAKE_CURRENT_BINARY_DIR}/${CD_IMAGE_NAME}.bin
-			${CMAKE_CURRENT_BINARY_DIR}/${CD_IMAGE_NAME}.cue
+			${CMAKE_CURRENT_BINARY_DIR}/${image_name}.bin
+			${CMAKE_CURRENT_BINARY_DIR}/${image_name}.cue
 	)
 endfunction()
diff --git a/template/CMakeLists.txt b/template/CMakeLists.txt
index a3399db..e665c7e 100644
--- a/template/CMakeLists.txt
+++ b/template/CMakeLists.txt
@@ -17,5 +17,5 @@ psn00bsdk_add_cd_image(
 	iso      # Target name
 	template # Output file name (= template.bin + template.cue)
 	iso.xml  # Path to config file
-	DEPENDS template
+	DEPENDS template system.cnf
 )
diff --git a/template/iso.xml b/template/iso.xml
index 29fbd2d..96ea23a 100644
--- a/template/iso.xml
+++ b/template/iso.xml
@@ -6,10 +6,7 @@
 	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"
->
+<iso_project>
 	<track type="data">
 		<!--
 			The "volume", "volume_set", "publisher", "data_preparer" and