[CORE] Move MapCacheBuilder tool files to Core (#749)

Author: xezon

Core/Tools/CMakeLists.txt

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

Core/Tools/MapCacheBuilder/CMakeLists.txt

@@ -0,0 +1,26 @@
+set(MAPCACHEBUILDER_SRC
+    "Include/WinMain.h"
+    "Resource/Resource.h"
+    "Source/WinMain.cpp"
+)
+
+add_library(corei_mapcachebuilder INTERFACE)
+
+target_sources(corei_mapcachebuilder INTERFACE ${MAPCACHEBUILDER_SRC})
+
+target_include_directories(corei_mapcachebuilder INTERFACE
+    Include
+    Resource
+)
+#
+target_link_libraries(corei_mapcachebuilder INTERFACE
+    comctl32
+    dbghelplib
+    imm32
+    vfw32
+    winmm
+)
+
+if(WIN32 OR "${CMAKE_SYSTEM}" MATCHES "Windows")
+    target_sources(corei_mapcachebuilder INTERFACE Resource/MapCacheBuilder.rc)
+endif()

GeneralsMD/Code/Tools/MapCacheBuilder/Include/WinMain.h renamed to Core/Tools/MapCacheBuilder/Include/WinMain.h

@@ -1,30 +1,9 @@
-set(MAPCACHEBUILDER_SRC
-    "Include/WinMain.h"
-    "Resource/Resource.h"
-    "Source/WinMain.cpp"
-)
-
 add_executable(g_mapcachebuilder WIN32)
 set_target_properties(g_mapcachebuilder PROPERTIES OUTPUT_NAME mapcachebuilder)
 
-target_sources(g_mapcachebuilder PRIVATE ${MAPCACHEBUILDER_SRC})
-
-target_include_directories(g_mapcachebuilder PRIVATE
-    Include
-    Resource
-)
-#
 target_link_libraries(g_mapcachebuilder PRIVATE
-    comctl32
-    dbghelplib
+    corei_mapcachebuilder
     g_gameengine
     g_gameenginedevice
     gi_always
-    imm32
-    vfw32
-    winmm
 )
-
-if(WIN32 OR "${CMAKE_SYSTEM}" MATCHES "Windows")
-    target_sources(g_mapcachebuilder PRIVATE Resource/MapCacheBuilder.rc)
-endif()