aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author浅倉麗子2020-05-20 11:33:15 -0400
committer浅倉麗子2020-05-20 11:33:15 -0400
commit86a1a03e363105f00c04134cd173f11f52ad2af7 (patch)
treed1813120465b35740bd879463751117ec0a3c9b5
parentPrint memory budget info on config app startup (diff)
downloadsharpscale-86a1a03e363105f00c04134cd173f11f52ad2af7.tar.gz
Cleanup CMake scripts and includes
-rw-r--r--CMakeLists.txt2
-rw-r--r--config-app/CMakeLists.txt13
-rw-r--r--config-app/main.c1
-rw-r--r--main.c1
-rw-r--r--scaling-test/CMakeLists.txt7
5 files changed, 13 insertions, 11 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 83fe318..0ba4e40 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -53,7 +53,6 @@ target_link_libraries("${ELF}"
gcc
m
SceDebugForDriver_stub
- SceDisplayForDriver_stub
SceIofilemgrForDriver_stub
SceSblACMgrForDriver_stub
SceSysclibForDriver_stub
@@ -65,7 +64,6 @@ target_link_libraries("${ELF}"
dolce_create_self("${SELF}"
"${ELF}"
CONFIG exports.yml
- UNSAFE
)
dolce_create_stubs("${PROJECT_NAME}-stubs"
diff --git a/config-app/CMakeLists.txt b/config-app/CMakeLists.txt
index 873693c..df2e0f3 100644
--- a/config-app/CMakeLists.txt
+++ b/config-app/CMakeLists.txt
@@ -21,6 +21,11 @@ add_custom_command(OUTPUT boot_param.bin
set(ELF "${PROJECT_NAME}.elf")
set(SELF "${PROJECT_NAME}.self")
+set(VPK "${PROJECT_NAME}.vpk")
+
+set(TITLE_NAME "Sharpscale Config Menu")
+set(TITLE_ID "AKRK00005")
+set(TITLE_VER "01.04")
add_executable("${ELF}"
main.c
@@ -49,10 +54,8 @@ dolce_create_self("${SELF}"
BOOT_PARAM ${CMAKE_CURRENT_BINARY_DIR}/boot_param.bin
)
-dolce_create_vpk(${PROJECT_NAME}.vpk
- AKRK00005
- "${SELF}"
- NAME "Sharpscale Config Menu"
- VERSION 01.04
+dolce_create_vpk("${VPK}" "${TITLE_ID}" "${SELF}"
+ NAME "${TITLE_NAME}"
+ VERSION "${TITLE_VER}"
FILE icon0.png sce_sys/icon0.png
)
diff --git a/config-app/main.c b/config-app/main.c
index 24bc61e..f8bf745 100644
--- a/config-app/main.c
+++ b/config-app/main.c
@@ -15,6 +15,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
+#include <stdbool.h>
#include <psp2/appmgr.h>
#include <psp2/ctrl.h>
#include <psp2/kernel/clib.h>
diff --git a/main.c b/main.c
index 54a9cff..2d0350a 100644
--- a/main.c
+++ b/main.c
@@ -19,7 +19,6 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
#include <stdarg.h>
#include <stdio.h>
#include <string.h>
-#include <psp2kern/display.h>
#include <psp2kern/io/fcntl.h>
#include <psp2kern/io/stat.h>
#include <psp2kern/kernel/modulemgr.h>
diff --git a/scaling-test/CMakeLists.txt b/scaling-test/CMakeLists.txt
index 30dd94c..05b92d4 100644
--- a/scaling-test/CMakeLists.txt
+++ b/scaling-test/CMakeLists.txt
@@ -23,13 +23,14 @@ if(NOT DEFINED CMAKE_TOOLCHAIN_FILE)
endif()
endif()
-project(sharpscale_scaling_test LANGUAGES C)
include("$ENV{DOLCESDK}/share/dolce.cmake" REQUIRED)
+project(sharpscale_scaling_test LANGUAGES C)
+
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -O3 -std=c99")
-set(ELF eboot.elf)
-set(SELF eboot.bin)
+set(ELF "${PROJECT_NAME}.elf")
+set(SELF "${PROJECT_NAME}.self")
set(VPK "${PROJECT_NAME}.vpk")
set(TITLE_NAME "Sharpscale Scaling Test")