From 635b0ebcd15083495eaad045776c3f410ae506c5 Mon Sep 17 00:00:00 2001 From: Hyper <34012267+hyperbx@users.noreply.github.com> Date: Mon, 2 Dec 2024 20:41:58 +0000 Subject: [PATCH] Move icon header generation to resources submodule --- CMakeLists.txt | 1 + UnleashedRecomp/CMakeLists.txt | 4 ---- UnleashedRecompResources | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0c605965..7bee2f63 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,5 +19,6 @@ project("UnleashedRecomp-ALL") include("thirdparty/PowerRecomp/cmake/bin2h.cmake") # Include sub-projects. +add_subdirectory("UnleashedRecompResources") add_subdirectory("UnleashedRecompLib") add_subdirectory("UnleashedRecomp") diff --git a/UnleashedRecomp/CMakeLists.txt b/UnleashedRecomp/CMakeLists.txt index 5d8972f1..35bddb40 100644 --- a/UnleashedRecomp/CMakeLists.txt +++ b/UnleashedRecomp/CMakeLists.txt @@ -23,10 +23,6 @@ add_compile_definitions( _DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR # Microsoft wtf? _CRT_SECURE_NO_WARNINGS) -# Generate icon bitmap header for SDL surface. -BIN2H(SOURCE_FILE "../UnleashedRecompResources/images/game_icon.bmp" HEADER_FILE "res/icon.h" ARRAY_TYPE "unsigned char" VARIABLE_NAME "g_icon") -BIN2H(SOURCE_FILE "../UnleashedRecompResources/images/game_icon_night.bmp" HEADER_FILE "res/icon_night.h" ARRAY_TYPE "unsigned char" VARIABLE_NAME "g_iconNight") - set(SWA_PRECOMPILED_HEADERS "stdafx.h" ) diff --git a/UnleashedRecompResources b/UnleashedRecompResources index cc4733bc..48e641b5 160000 --- a/UnleashedRecompResources +++ b/UnleashedRecompResources @@ -1 +1 @@ -Subproject commit cc4733bcf42fb040efbf086b15f64e762753c6c0 +Subproject commit 48e641b58a09c9ecfcf72c60d97bb1079deb5ea4