Misc. CMake bug and typo fixes, updated changelog

4 files changed, 41 insertions, 4 deletions

diff --git a/.gitignore b/.gitignore
index bf1de1f..71a3cea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,13 +1,21 @@
 .svn
+.vscode
+.DS_Store
 build
 bin
 old
 scrap
 *.a
 *.o
+*.obj
 *.elf
+*.so
 *.exe
+*.map
+*.dll
 *.lzp
 *.qlp
 *.iso
-*.rom
\ No newline at end of file
+*.rom
+*.code-workspace
+CMakeUserPresets.json
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4cca098..71f9acf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,7 +39,7 @@ set(
 )
 set(
 	SKIP_EXAMPLES OFF
-	CACHE BOOL    "Skip building SDK examples (which are never installed)"
+	CACHE BOOL    "Skip building SDK examples (not required for installation)"
 )
 
 # Forward some important variables to mkpsxiso and to the subprojects (they are
@@ -54,6 +54,7 @@ set(
 	-DPSN00BSDK_TARGET:STRING=${PSN00BSDK_TARGET}
 	-DCMAKE_TOOLCHAIN_FILE:FILEPATH=${CMAKE_TOOLCHAIN_FILE}
 	-DCMAKE_INSTALL_PREFIX:PATH=${PROJECT_BINARY_DIR}/install_tree
+	-DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
 )
 set(
 	EXAMPLES_ARGS
@@ -61,6 +62,7 @@ set(
 	-DPSN00BSDK_TARGET:STRING=${PSN00BSDK_TARGET}
 	-DCMAKE_TOOLCHAIN_FILE:FILEPATH=${PROJECT_BINARY_DIR}/install_tree/${CMAKE_INSTALL_LIBDIR}/libpsn00b/cmake/sdk.cmake
 	-DCMAKE_INSTALL_PREFIX:PATH=${PROJECT_BINARY_DIR}/examples
+	-DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
 )
 
 ## External dependencies
@@ -130,9 +132,11 @@ install(
 
 ## CPack configuration
 
-# TODO: add a macOS installer and related options
 if(WIN32)
 	set(CPACK_GENERATOR ZIP NSIS)
+elseif(APPLE)
+	# TODO: add a macOS installer and related options
+	set(CPACK_GENERATOR ZIP)
 elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
 	set(CPACK_GENERATOR ZIP DEB RPM)
 else()
diff --git a/changelog.txt b/changelog.txt
index 15bbb85..03d2d10 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -2,6 +2,31 @@ PSn00bSDK changelog
 
 Items that are lower in the log are more recently implemented.
 
+09-13-2021 by spicyjpeg:
+
+* Migrated libpsn00b, tools, examples and template to CMake, added a top-level
+  CMakeLists.txt and the libpsn00b/cmake directory for CMake setup scripts, got
+  rid of the old makefiles and installation method.
+
+* Updated docs to match the new build system, moved installation instructions
+  to INSTALL.md and added doc/cmake_reference.md describing the SDK's CMake
+  API and variables.
+
+* mkpsxiso: Added rules to automatically download, build and install mkpsxiso
+  (as well as its dependencies) as part of the SDK.
+
+* cpack: Added initial CPack support and created the cpack directory containing
+  branding assets for installers built through CPack. A shell script is
+  provided to regenerate the assets from their source SVGs.
+
+* liblzp: Copied library headers to libpsn00b/include/lzp.
+
+* psxetc: Fixed a random typo in a javadoc comment (those should be eventually
+  rewritten into proper documentation anyway).
+
+* Added CMake, VS Code and DLL related entries to .gitignore.
+
+
 08-16-2021 by spicyjpeg:
 
 * psxetc: Added dynamic linking APIs (dl*, DL_*), implemented in dl.c and
diff --git a/libpsn00b/include/dlfcn.h b/libpsn00b/include/dlfcn.h
index 5fdd343..0c51821 100644
--- a/libpsn00b/include/dlfcn.h
+++ b/libpsn00b/include/dlfcn.h
@@ -119,7 +119,7 @@ void    DL_SetResolveCallback(void *(*callback)(DLL *, const char *));
  *
  * The third argument specifies when symbols in the DLL should be resolved.
  * Setting it to RTLD_LAZY defers resolution of undefined functions to when
- * they are first called, while RTLD_DEFAULT forces all symbols to be resolved
+ * they are first called, while RTLD_NOW forces all symbols to be resolved
  * immediately. If a custom resolver has been set via DL_SetResolveCallback(),
  * it will be called for each symbol to resolve.
  *