diff --git a/.gitmodules b/.gitmodules index df7c0a6..2d13581 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,3 +10,6 @@ [submodule "thirdparty/libmspack"] path = thirdparty/libmspack url = https://github.com/kyz/libmspack +[submodule "UnleashedRecompResources"] + path = UnleashedRecompResources + url = https://github.com/hedge-dev/UnleashedRecompResources.git diff --git a/UnleashedRecomp/CMakeLists.txt b/UnleashedRecomp/CMakeLists.txt index 6f0af6e..7cb86ec 100644 --- a/UnleashedRecomp/CMakeLists.txt +++ b/UnleashedRecomp/CMakeLists.txt @@ -24,8 +24,8 @@ add_compile_definitions( _CRT_SECURE_NO_WARNINGS) # Generate icon bitmap header for SDL surface. -BIN2H(SOURCE_FILE "res/icon.bmp" HEADER_FILE "res/icon.h" ARRAY_TYPE "unsigned char" VARIABLE_NAME "g_icon") -BIN2H(SOURCE_FILE "res/icon_night.bmp" HEADER_FILE "res/icon_night.h" ARRAY_TYPE "unsigned char" VARIABLE_NAME "g_iconNight") +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" @@ -133,7 +133,7 @@ set(SWA_CXX_SOURCES if (WIN32) # Set up Win32 resources for application icon. - set(ICON_PATH "${PROJECT_SOURCE_DIR}/res/win32/icon.ico") + set(ICON_PATH "${PROJECT_SOURCE_DIR}/../UnleashedRecompResources/images/game_icon.ico") configure_file("res/win32/res.rc" "${CMAKE_BINARY_DIR}/res.rc" @ONLY) add_executable(UnleashedRecomp ${SWA_CXX_SOURCES} "${CMAKE_BINARY_DIR}/res.rc") else() diff --git a/UnleashedRecomp/res/icon.bmp b/UnleashedRecomp/res/icon.bmp deleted file mode 100644 index e141cc3..0000000 Binary files a/UnleashedRecomp/res/icon.bmp and /dev/null differ diff --git a/UnleashedRecomp/res/icon.png b/UnleashedRecomp/res/icon.png deleted file mode 100644 index 1f12802..0000000 Binary files a/UnleashedRecomp/res/icon.png and /dev/null differ diff --git a/UnleashedRecomp/res/icon_night.bmp b/UnleashedRecomp/res/icon_night.bmp deleted file mode 100644 index 05ba0e5..0000000 Binary files a/UnleashedRecomp/res/icon_night.bmp and /dev/null differ diff --git a/UnleashedRecomp/res/win32/icon.ico b/UnleashedRecomp/res/win32/icon.ico deleted file mode 100644 index d55a995..0000000 Binary files a/UnleashedRecomp/res/win32/icon.ico and /dev/null differ diff --git a/UnleashedRecompResources b/UnleashedRecompResources new file mode 160000 index 0000000..7183c6e --- /dev/null +++ b/UnleashedRecompResources @@ -0,0 +1 @@ +Subproject commit 7183c6e0e90480fe0f2c270c87cea5cd5df7d5c3