From b4fa8bebe901d661257a9db7efed30b25e4f6b9d Mon Sep 17 00:00:00 2001 From: WerWolv Date: Thu, 29 Dec 2022 23:32:40 +0100 Subject: [PATCH] build: Move main romfs to main application --- main/CMakeLists.txt | 2 +- {resources => main}/romfs/cacert.pem | 0 {resources => main}/romfs/logo.png | Bin {resources => main}/romfs/splash.png | Bin 4 files changed, 1 insertion(+), 1 deletion(-) rename {resources => main}/romfs/cacert.pem (100%) rename {resources => main}/romfs/logo.png (100%) rename {resources => main}/romfs/splash.png (100%) diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt index fcf86886f..364324d31 100644 --- a/main/CMakeLists.txt +++ b/main/CMakeLists.txt @@ -17,7 +17,7 @@ add_executable(main ${APPLICATION_TYPE} target_include_directories(main PUBLIC include) setupCompilerWarnings(main) -set(LIBROMFS_RESOURCE_LOCATION ${IMHEX_BASE_FOLDER}/resources/romfs) +set(LIBROMFS_RESOURCE_LOCATION ${CMAKE_CURRENT_SOURCE_DIR}/romfs) set(LIBROMFS_PROJECT_NAME imhex) add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../lib/external/libromfs ${CMAKE_CURRENT_BINARY_DIR}/main/libromfs EXCLUDE_FROM_ALL) set_target_properties(${LIBROMFS_LIBRARY} PROPERTIES POSITION_INDEPENDENT_CODE ON) diff --git a/resources/romfs/cacert.pem b/main/romfs/cacert.pem similarity index 100% rename from resources/romfs/cacert.pem rename to main/romfs/cacert.pem diff --git a/resources/romfs/logo.png b/main/romfs/logo.png similarity index 100% rename from resources/romfs/logo.png rename to main/romfs/logo.png diff --git a/resources/romfs/splash.png b/main/romfs/splash.png similarity index 100% rename from resources/romfs/splash.png rename to main/romfs/splash.png