From 903c94c8e3726d3185652914f16b69b435e29163 Mon Sep 17 00:00:00 2001
From: Dario <dariosamo@gmail.com>
Date: Mon, 2 Dec 2024 23:20:16 -0300
Subject: [PATCH] Fixes to conversion.

---
 CMakeLists.txt                 |  1 -
 UnleashedRecomp/CMakeLists.txt | 33 +++++++++++++++++++++++++++++++++
 UnleashedRecomp/res/.gitignore |  1 +
 UnleashedRecomp/ui/window.h    |  8 ++++----
 tools/file_to_c/CMakeLists.txt | 19 -------------------
 5 files changed, 38 insertions(+), 24 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 06200e46..853ef904 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,6 +20,5 @@ add_subdirectory(${SWA_TOOLS_ROOT})
 project("UnleashedRecomp-ALL")
 
 # Include sub-projects.
-add_subdirectory("UnleashedRecompResources")
 add_subdirectory("UnleashedRecompLib")
 add_subdirectory("UnleashedRecomp")
diff --git a/UnleashedRecomp/CMakeLists.txt b/UnleashedRecomp/CMakeLists.txt
index 35bddb40..39545832 100644
--- a/UnleashedRecomp/CMakeLists.txt
+++ b/UnleashedRecomp/CMakeLists.txt
@@ -3,6 +3,32 @@ set(TARGET_NAME "SWA")
 
 option(SWA_XAUDIO2 "Use XAudio2 for audio playback" OFF)
 
+function(BIN2C)
+    cmake_parse_arguments(BIN2C_ARGS "" "TARGET_OBJ;SOURCE_FILE;DEST_FILE;ARRAY_TYPE;ARRAY_NAME" "" ${ARGN})
+
+    if(NOT BIN2C_ARGS_TARGET_OBJ)
+        message(FATAL_ERROR "TARGET_OBJ not specified.")
+    endif()
+
+    if(NOT BIN2C_ARGS_SOURCE_FILE)
+        message(FATAL_ERROR "SOURCE_FILE not specified.")
+    endif()
+
+    if(NOT BIN2C_ARGS_DEST_FILE)
+        set(BIN2C_ARGS_DEST_FILE "${BIN2C_ARGS_SOURCE_FILE}")
+    endif()
+
+    add_custom_command(OUTPUT "${BIN2C_ARGS_DEST_FILE}.c"
+        COMMAND file_to_c "${BIN2C_ARGS_SOURCE_FILE}" "${BIN2C_ARGS_ARRAY_NAME}" "${BIN2C_ARGS_ARRAY_TYPE}" "${BIN2C_ARGS_DEST_FILE}.c" "${BIN2C_ARGS_DEST_FILE}.h"
+        DEPENDS "${BIN2C_ARGS_SOURCE_FILE}" file_to_c
+        BYPRODUCTS "${BIN2C_ARGS_DEST_FILE}.h"
+        COMMENT "Generating binary header for ${BIN2C_ARGS_SOURCE_FILE}..."
+    )
+
+    set_source_files_properties(${BIN2C_ARGS_DEST_FILE}.c PROPERTIES SKIP_PRECOMPILE_HEADERS ON)
+    target_sources(${BIN2C_ARGS_TARGET_OBJ} PRIVATE ${BIN2C_ARGS_DEST_FILE}.c)
+endfunction()
+
 add_compile_options(
     /fp:strict
     -march=sandybridge
@@ -282,3 +308,10 @@ generate_aggregate_header(
     "${CMAKE_CURRENT_SOURCE_DIR}/api"
     "${CMAKE_CURRENT_SOURCE_DIR}/api/SWA.h"
 )
+
+set(RESOURCES_SOURCE_PATH "${PROJECT_SOURCE_DIR}/../UnleashedRecompResources")
+set(RESOURCES_OUTPUT_PATH "${PROJECT_SOURCE_DIR}/res")
+BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/achievements_menu/trophy.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/achievements_menu/trophy.dds" ARRAY_TYPE "unsigned char" ARRAY_NAME "g_trophy")
+BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/game_icon.bmp" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/game_icon.bmp" ARRAY_TYPE "unsigned char" ARRAY_NAME "g_game_icon")
+BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/game_icon_night.bmp" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/game_icon_night.bmp" ARRAY_TYPE "unsigned char" ARRAY_NAME "g_game_icon_night")
+BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/pause.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/pause.dds" ARRAY_TYPE "unsigned char" ARRAY_NAME "g_pause")
diff --git a/UnleashedRecomp/res/.gitignore b/UnleashedRecomp/res/.gitignore
index e3285599..435cdeaa 100644
--- a/UnleashedRecomp/res/.gitignore
+++ b/UnleashedRecomp/res/.gitignore
@@ -1,2 +1,3 @@
 ![Ww][Ii][Nn]32/
+*.c
 *.h
\ No newline at end of file
diff --git a/UnleashedRecomp/ui/window.h b/UnleashedRecomp/ui/window.h
index d6647fc2..61a0eb3b 100644
--- a/UnleashedRecomp/ui/window.h
+++ b/UnleashedRecomp/ui/window.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "../UnleashedRecompResources/images/game_icon.h"
-#include "../UnleashedRecompResources/images/game_icon_night.h"
+#include <res/images/game_icon.bmp.h>
+#include <res/images/game_icon_night.bmp.h>
 #include <ui/window_events.h>
 #include <user/config.h>
 
@@ -46,11 +46,11 @@ public:
     {
         if (isNight)
         {
-            SetIcon((void*)g_res_game_icon_night, g_res_game_icon_night_size);
+            SetIcon(g_game_icon_night, sizeof(g_game_icon_night));
         }
         else
         {
-            SetIcon((void*)g_res_game_icon, g_res_game_icon_size);
+            SetIcon(g_game_icon, sizeof(g_game_icon));
         }
     }
 
diff --git a/tools/file_to_c/CMakeLists.txt b/tools/file_to_c/CMakeLists.txt
index ddf3fa9d..08975574 100644
--- a/tools/file_to_c/CMakeLists.txt
+++ b/tools/file_to_c/CMakeLists.txt
@@ -6,22 +6,3 @@ project("file_to_c")
 set(CMAKE_CXX_STANDARD 17)
 
 add_executable(file_to_c "file_to_c.cpp")
-
-function(BIN2C)
-    cmake_parse_arguments(BIN2C_ARGS "" "SOURCE_FILE;DEST_FILE;ARRAY_TYPE;ARRAY_NAME" "" ${ARGN})
-
-    if(NOT BIN2C_ARGS_SOURCE_FILE)
-        message(FATAL_ERROR "SOURCE_FILE not specified.")
-    endif()
-
-    if(NOT BIN2C_ARGS_DEST_FILE)
-        set(BIN2C_ARGS_DEST_FILE "${BIN2C_ARGS_SOURCE_FILE}")
-    endif()
-
-    add_custom_command(OUTPUT "${BIN2C_ARGS_DEST_FILE}.c"
-        COMMAND file_to_c "${BIN2C_ARGS_SOURCE_FILE}" "${BIN2C_ARGS_ARRAY_NAME}" "${BIN2C_ARGS_ARRAY_TYPE}" "${BIN2C_ARGS_DEST_FILE}.c" "${BIN2C_ARGS_DEST_FILE}.h"
-        DEPENDS "${BIN2C_ARGS_SOURCE_FILE}" file_to_c
-        BYPRODUCTS "${BIN2C_ARGS_DEST_FILE}.h"
-        COMMENT "Generating binary header for ${BIN2C_ARGS_SOURCE_FILE}..."
-    )
-endfunction()