[CORE] Move ImagePacker tool files to Core

Author: xezon

Core/Tools/CMakeLists.txt

@@ -23,6 +23,7 @@ endif()
 
 # Add library interfaces here
 if(RTS_BUILD_GENERALS_TOOLS OR RTS_BUILD_ZEROHOUR_TOOLS)
+    add_subdirectory(ImagePacker)
 endif()
 
 # Add library interfaces here

Core/Tools/ImagePacker/CMakeLists.txt

@@ -0,0 +1,39 @@
+set(IMAGEPACKER_SRC
+    "Include/ImageDirectory.h"
+    "Include/ImageInfo.h"
+    "Include/ImagePacker.h"
+    "Include/TexturePage.h"
+    "Include/WindowProc.h"
+    "Include/WinMain.h"
+    "Source/ImageInfo.cpp"
+    "Source/ImagePacker.cpp"
+    "Source/TexturePage.cpp"
+    "Source/WinMain.cpp"
+    "Source/WindowProcedures/DirectorySelect.cpp"
+    "Source/WindowProcedures/ImageErrorProc.cpp"
+    "Source/WindowProcedures/ImagePackerProc.cpp"
+    "Source/WindowProcedures/PageErrorProc.cpp"
+    "Source/WindowProcedures/PreviewProc.cpp"
+)
+
+add_library(corei_imagepacker INTERFACE)
+
+target_sources(corei_imagepacker INTERFACE ${IMAGEPACKER_SRC})
+
+target_include_directories(corei_imagepacker INTERFACE
+    Include
+    Resource
+)
+
+target_link_libraries(corei_imagepacker INTERFACE
+    benchmark
+    comctl32
+    dbghelplib
+    imm32
+    vfw32
+    winmm
+)
+
+if(WIN32 OR "${CMAKE_SYSTEM}" MATCHES "Windows")
+    target_sources(corei_imagepacker INTERFACE Resource/ImagePacker.rc)
+endif()

GeneralsMD/Code/Tools/ImagePacker/Include/ImageDirectory.h renamed to Core/Tools/ImagePacker/Include/ImageDirectory.h

@@ -1,43 +1,9 @@
-set(IMAGEPACKER_SRC
-    "Include/ImageDirectory.h"
-    "Include/ImageInfo.h"
-    "Include/ImagePacker.h"
-    "Include/TexturePage.h"
-    "Include/WindowProc.h"
-    "Include/WinMain.h"
-    "Source/ImageInfo.cpp"
-    "Source/ImagePacker.cpp"
-    "Source/TexturePage.cpp"
-    "Source/WinMain.cpp"
-    "Source/Window Procedures/DirectorySelect.cpp"
-    "Source/Window Procedures/ImageErrorProc.cpp"
-    "Source/Window Procedures/ImagePackerProc.cpp"
-    "Source/Window Procedures/PageErrorProc.cpp"
-    "Source/Window Procedures/PreviewProc.cpp"
-)
-
 add_executable(g_imagepacker WIN32)
 set_target_properties(g_imagepacker PROPERTIES OUTPUT_NAME imagepacker)
 
-target_sources(g_imagepacker PRIVATE ${IMAGEPACKER_SRC})
-
-target_include_directories(g_imagepacker PRIVATE
-    Include
-    Resource
-)
-
 target_link_libraries(g_imagepacker PRIVATE
-    benchmark
-    comctl32
-    dbghelplib
+    corei_imagepacker
     g_gameengine
     g_gameenginedevice
     gi_always
-    imm32
-    vfw32
-    winmm
 )
-
-if(WIN32 OR "${CMAKE_SYSTEM}" MATCHES "Windows")
-    target_sources(g_imagepacker PRIVATE Resource/ImagePacker.rc)
-endif()