diff options
| author | John "Lameguy" Wilbert Villamor <lameguy64@gmail.com> | 2022-01-18 08:31:14 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-18 08:31:14 +0800 |
| commit | 05d44488bd5587786f4bd0286fc0f555c79aa46a (patch) | |
| tree | 5740f396d10a9580c3a39ca536544436898ff1b6 /cpack | |
| parent | 08de895e8582dbc70b639ae5f511ab9ebfb4d68a (diff) | |
| parent | e9475e283a82665fe6c19bebc3318b5084f15a2e (diff) | |
| download | psn00bsdk-05d44488bd5587786f4bd0286fc0f555c79aa46a.tar.gz | |
Merge pull request #44 from spicyjpeg/actions
GitHub Actions CI, psxcd and libc fixes, new examples
Diffstat (limited to 'cpack')
| -rw-r--r-- | cpack/setup.cmake | 17 | ||||
| -rw-r--r-- | cpack/welcome.txt | 3 |
2 files changed, 11 insertions, 9 deletions
diff --git a/cpack/setup.cmake b/cpack/setup.cmake index 33f127e..a5d71ff 100644 --- a/cpack/setup.cmake +++ b/cpack/setup.cmake @@ -14,14 +14,14 @@ set( BUNDLE_TOOLCHAIN OFF CACHE BOOL "Include the GCC toolchain in installer packages" ) -set( - BUNDLE_CMAKE OFF - CACHE BOOL "Include CMake in installer packages (Windows only)" -) +#set( + #BUNDLE_CMAKE OFF + #CACHE BOOL "Include CMake in installer packages (Windows only)" +#) ## Bundled components -# "Install" the toolchain and CMake (by pulling files from its their install +# "Install" the toolchain and CMake (by pulling files from their install # locations). This is only useful when building installers, as CPack will pick # up these installation rules and bundle the toolchain in the installers. # NOTE: unfortunately there is no easy way to reuse the toolchain finding logic @@ -105,7 +105,6 @@ set(CPACK_RESOURCE_FILE_README ${PROJECT_SOURCE_DIR}/README.md) set(CPACK_RESOURCE_FILE_LICENSE ${PROJECT_SOURCE_DIR}/LICENSE.md) set(CPACK_PACKAGE_ICON ${CMAKE_CURRENT_LIST_DIR}/icon.ico) set(CPACK_PACKAGE_DESCRIPTION_FILE ${CMAKE_CURRENT_LIST_DIR}/description.txt) -set(CPACK_RESOURCE_FILE_WELCOME ${CMAKE_CURRENT_LIST_DIR}/welcome.txt) set(CPACK_PRE_BUILD_SCRIPTS ${CMAKE_CURRENT_LIST_DIR}/fakeroot_fix.cmake) set(CPACK_PACKAGE_INSTALL_DIRECTORY PSn00bSDK) @@ -134,6 +133,7 @@ set( CPACK_NSIS_MENU_LINKS "${PROJECT_HOMEPAGE_URL}" "About PSn00bSDK" "https://github.com/Lameguy64/PSn00bSDK" "GitHub repo" + "Uninstall.exe" "Uninstall PSn00bSDK" ) # Paths in CPACK_NSIS_* variables are not converted to native paths by CMake @@ -166,6 +166,11 @@ cpack_add_component( DISPLAY_NAME "SDK documentation" DESCRIPTION "Select to install additional documentation files and a project template (recommended)." ) +cpack_add_component( + examples + DISPLAY_NAME "SDK examples" + DESCRIPTION "Select to copy the examples' source code to the documentation folder (recommended)." +) if(BUNDLE_TOOLCHAIN) cpack_add_component( diff --git a/cpack/welcome.txt b/cpack/welcome.txt deleted file mode 100644 index e024336..0000000 --- a/cpack/welcome.txt +++ /dev/null @@ -1,3 +0,0 @@ -This installer will set up PSn00bSDK, including prebuilt libraries, CMake scripts as well as several command-line utilities for PlayStation 1 homebrew development. - -NOTE: CMake and the GCC toolchain must be installed separately. |