TheSuperHackers
diff --git a/‎Core/Libraries/CMakeLists.txt
+2-2 b/‎Core/Libraries/CMakeLists.txt
+2-2
diff --git a/‎GeneralsMD/Code/Libraries/Include/rts/debug.h renamed to ‎Core/Libraries/Include/rts/debug.h b/‎GeneralsMD/Code/Libraries/Include/rts/debug.h renamed to ‎Core/Libraries/Include/rts/debug.h
diff --git a/‎GeneralsMD/Code/Libraries/Include/rts/profile.h renamed to ‎Core/Libraries/Include/rts/profile.h b/‎GeneralsMD/Code/Libraries/Include/rts/profile.h renamed to ‎Core/Libraries/Include/rts/profile.h
diff --git a/‎GeneralsMD/Code/Libraries/Source/debug/CMakeLists.txt renamed to ‎Core/Libraries/Source/debug/CMakeLists.txt
+5-5 b/‎GeneralsMD/Code/Libraries/Source/debug/CMakeLists.txt renamed to ‎Core/Libraries/Source/debug/CMakeLists.txt
+5-5
diff --git a/‎GeneralsMD/Code/Libraries/Source/debug/_pch.cpp renamed to ‎Core/Libraries/Source/debug/_pch.cpp b/‎GeneralsMD/Code/Libraries/Source/debug/_pch.cpp renamed to ‎Core/Libraries/Source/debug/_pch.cpp
diff --git a/‎GeneralsMD/Code/Libraries/Source/debug/_pch.h renamed to ‎Core/Libraries/Source/debug/_pch.h b/‎GeneralsMD/Code/Libraries/Source/debug/_pch.h renamed to ‎Core/Libraries/Source/debug/_pch.h
diff --git a/‎GeneralsMD/Code/Libraries/Source/debug/compile_doxygen.bat renamed to ‎Core/Libraries/Source/debug/compile_doxygen.bat b/‎GeneralsMD/Code/Libraries/Source/debug/compile_doxygen.bat renamed to ‎Core/Libraries/Source/debug/compile_doxygen.bat
diff --git a/‎GeneralsMD/Code/Libraries/Source/debug/debug.cpp renamed to ‎Core/Libraries/Source/debug/debug.cpp b/‎GeneralsMD/Code/Libraries/Source/debug/debug.cpp renamed to ‎Core/Libraries/Source/debug/debug.cpp
diff --git a/‎GeneralsMD/Code/Libraries/Source/debug/debug.dox renamed to ‎Core/Libraries/Source/debug/debug.dox b/‎GeneralsMD/Code/Libraries/Source/debug/debug.dox renamed to ‎Core/Libraries/Source/debug/debug.dox
diff --git a/‎GeneralsMD/Code/Libraries/Source/debug/debug.h renamed to ‎Core/Libraries/Source/debug/debug.h b/‎GeneralsMD/Code/Libraries/Source/debug/debug.h renamed to ‎Core/Libraries/Source/debug/debug.h
diff --git a/‎GeneralsMD/Code/Libraries/Source/debug/debug_cmd.cpp renamed to ‎Core/Libraries/Source/debug/debug_cmd.cpp b/‎GeneralsMD/Code/Libraries/Source/debug/debug_cmd.cpp renamed to ‎Core/Libraries/Source/debug/debug_cmd.cpp
diff --git a/‎GeneralsMD/Code/Libraries/Source/debug/debug_cmd.h renamed to ‎Core/Libraries/Source/debug/debug_cmd.h b/‎GeneralsMD/Code/Libraries/Source/debug/debug_cmd.h renamed to ‎Core/Libraries/Source/debug/debug_cmd.h
diff --git a/‎GeneralsMD/Code/Libraries/Source/debug/debug_debug.cpp renamed to ‎Core/Libraries/Source/debug/debug_debug.cpp b/‎GeneralsMD/Code/Libraries/Source/debug/debug_debug.cpp renamed to ‎Core/Libraries/Source/debug/debug_debug.cpp
diff --git a/‎GeneralsMD/Code/Libraries/Source/debug/debug_debug.h renamed to ‎Core/Libraries/Source/debug/debug_debug.h b/‎GeneralsMD/Code/Libraries/Source/debug/debug_debug.h renamed to ‎Core/Libraries/Source/debug/debug_debug.h
diff --git a/‎GeneralsMD/Code/Libraries/Source/debug/debug_dlg/debug_dlg.cpp renamed to ‎Core/Libraries/Source/debug/debug_dlg/debug_dlg.cpp b/‎GeneralsMD/Code/Libraries/Source/debug/debug_dlg/debug_dlg.cpp renamed to ‎Core/Libraries/Source/debug/debug_dlg/debug_dlg.cpp
diff --git a/‎GeneralsMD/Code/Libraries/Source/debug/debug_dlg/debug_dlg.rc renamed to ‎Core/Libraries/Source/debug/debug_dlg/debug_dlg.rc b/‎GeneralsMD/Code/Libraries/Source/debug/debug_dlg/debug_dlg.rc renamed to ‎Core/Libraries/Source/debug/debug_dlg/debug_dlg.rc
diff --git a/‎GeneralsMD/Code/Libraries/Source/debug/debug_dlg/resource.h renamed to ‎Core/Libraries/Source/debug/debug_dlg/resource.h b/‎GeneralsMD/Code/Libraries/Source/debug/debug_dlg/resource.h renamed to ‎Core/Libraries/Source/debug/debug_dlg/resource.h
diff --git a/‎GeneralsMD/Code/Libraries/Source/debug/debug_doc.h renamed to ‎Core/Libraries/Source/debug/debug_doc.h b/‎GeneralsMD/Code/Libraries/Source/debug/debug_doc.h renamed to ‎Core/Libraries/Source/debug/debug_doc.h
diff --git a/‎GeneralsMD/Code/Libraries/Source/debug/debug_except.cpp renamed to ‎Core/Libraries/Source/debug/debug_except.cpp b/‎GeneralsMD/Code/Libraries/Source/debug/debug_except.cpp renamed to ‎Core/Libraries/Source/debug/debug_except.cpp
diff --git a/‎GeneralsMD/Code/Libraries/Source/debug/debug_getdefaultcommands.cpp renamed to ‎Core/Libraries/Source/debug/debug_getdefaultcommands.cpp b/‎GeneralsMD/Code/Libraries/Source/debug/debug_getdefaultcommands.cpp renamed to ‎Core/Libraries/Source/debug/debug_getdefaultcommands.cpp
diff --git a/‎GeneralsMD/Code/Libraries/Source/debug/debug_internal.cpp renamed to ‎Core/Libraries/Source/debug/debug_internal.cpp b/‎GeneralsMD/Code/Libraries/Source/debug/debug_internal.cpp renamed to ‎Core/Libraries/Source/debug/debug_internal.cpp
diff --git a/‎GeneralsMD/Code/Libraries/Source/debug/debug_io.h renamed to ‎Core/Libraries/Source/debug/debug_io.h b/‎GeneralsMD/Code/Libraries/Source/debug/debug_io.h renamed to ‎Core/Libraries/Source/debug/debug_io.h
diff --git a/‎GeneralsMD/Code/Libraries/Source/debug/debug_io_con.cpp renamed to ‎Core/Libraries/Source/debug/debug_io_con.cpp b/‎GeneralsMD/Code/Libraries/Source/debug/debug_io_con.cpp renamed to ‎Core/Libraries/Source/debug/debug_io_con.cpp
diff --git a/‎GeneralsMD/Code/Libraries/Source/debug/debug_io_flat.cpp renamed to ‎Core/Libraries/Source/debug/debug_io_flat.cpp b/‎GeneralsMD/Code/Libraries/Source/debug/debug_io_flat.cpp renamed to ‎Core/Libraries/Source/debug/debug_io_flat.cpp
diff --git a/‎GeneralsMD/Code/Libraries/Source/debug/debug_io_net.cpp renamed to ‎Core/Libraries/Source/debug/debug_io_net.cpp b/‎GeneralsMD/Code/Libraries/Source/debug/debug_io_net.cpp renamed to ‎Core/Libraries/Source/debug/debug_io_net.cpp
diff --git a/‎GeneralsMD/Code/Libraries/Source/debug/debug_io_ods.cpp renamed to ‎Core/Libraries/Source/debug/debug_io_ods.cpp b/‎GeneralsMD/Code/Libraries/Source/debug/debug_io_ods.cpp renamed to ‎Core/Libraries/Source/debug/debug_io_ods.cpp
diff --git a/‎GeneralsMD/Code/Libraries/Source/debug/debug_macro.h renamed to ‎Core/Libraries/Source/debug/debug_macro.h b/‎GeneralsMD/Code/Libraries/Source/debug/debug_macro.h renamed to ‎Core/Libraries/Source/debug/debug_macro.h
diff --git a/‎GeneralsMD/Code/Libraries/Source/debug/debug_purecall.cpp renamed to ‎Core/Libraries/Source/debug/debug_purecall.cpp b/‎GeneralsMD/Code/Libraries/Source/debug/debug_purecall.cpp renamed to ‎Core/Libraries/Source/debug/debug_purecall.cpp
diff --git a/‎GeneralsMD/Code/Libraries/Source/debug/debug_stack.cpp renamed to ‎Core/Libraries/Source/debug/debug_stack.cpp b/‎GeneralsMD/Code/Libraries/Source/debug/debug_stack.cpp renamed to ‎Core/Libraries/Source/debug/debug_stack.cpp
diff --git a/‎GeneralsMD/Code/Libraries/Source/debug/debug_stack.h renamed to ‎Core/Libraries/Source/debug/debug_stack.h b/‎GeneralsMD/Code/Libraries/Source/debug/debug_stack.h renamed to ‎Core/Libraries/Source/debug/debug_stack.h
diff --git a/‎GeneralsMD/Code/Libraries/Source/debug/debug_stack.inl renamed to ‎Core/Libraries/Source/debug/debug_stack.inl b/‎GeneralsMD/Code/Libraries/Source/debug/debug_stack.inl renamed to ‎Core/Libraries/Source/debug/debug_stack.inl
diff --git a/‎GeneralsMD/Code/Libraries/Source/debug/internal.h renamed to ‎Core/Libraries/Source/debug/internal.h b/‎GeneralsMD/Code/Libraries/Source/debug/internal.h renamed to ‎Core/Libraries/Source/debug/internal.h
diff --git a/‎GeneralsMD/Code/Libraries/Source/debug/internal_except.h renamed to ‎Core/Libraries/Source/debug/internal_except.h b/‎GeneralsMD/Code/Libraries/Source/debug/internal_except.h renamed to ‎Core/Libraries/Source/debug/internal_except.h
diff --git a/‎GeneralsMD/Code/Libraries/Source/debug/internal_io.h renamed to ‎Core/Libraries/Source/debug/internal_io.h b/‎GeneralsMD/Code/Libraries/Source/debug/internal_io.h renamed to ‎Core/Libraries/Source/debug/internal_io.h
diff --git a/‎GeneralsMD/Code/Libraries/Source/debug/netserv/netserv.cpp renamed to ‎Core/Libraries/Source/debug/netserv/netserv.cpp b/‎GeneralsMD/Code/Libraries/Source/debug/netserv/netserv.cpp renamed to ‎Core/Libraries/Source/debug/netserv/netserv.cpp
diff --git a/‎GeneralsMD/Code/Libraries/Source/debug/rc_exception.inl renamed to ‎Core/Libraries/Source/debug/rc_exception.inl b/‎GeneralsMD/Code/Libraries/Source/debug/rc_exception.inl renamed to ‎Core/Libraries/Source/debug/rc_exception.inl
diff --git a/‎GeneralsMD/Code/Libraries/Source/debug/test1/test1.cpp renamed to ‎Core/Libraries/Source/debug/test1/test1.cpp b/‎GeneralsMD/Code/Libraries/Source/debug/test1/test1.cpp renamed to ‎Core/Libraries/Source/debug/test1/test1.cpp
diff --git a/‎GeneralsMD/Code/Libraries/Source/debug/test2/StdAfx.cpp renamed to ‎Core/Libraries/Source/debug/test2/StdAfx.cpp b/‎GeneralsMD/Code/Libraries/Source/debug/test2/StdAfx.cpp renamed to ‎Core/Libraries/Source/debug/test2/StdAfx.cpp
diff --git a/‎GeneralsMD/Code/Libraries/Source/debug/test2/StdAfx.h renamed to ‎Core/Libraries/Source/debug/test2/StdAfx.h b/‎GeneralsMD/Code/Libraries/Source/debug/test2/StdAfx.h renamed to ‎Core/Libraries/Source/debug/test2/StdAfx.h
diff --git a/‎GeneralsMD/Code/Libraries/Source/debug/test2/default.dbgcmd renamed to ‎Core/Libraries/Source/debug/test2/default.dbgcmd b/‎GeneralsMD/Code/Libraries/Source/debug/test2/default.dbgcmd renamed to ‎Core/Libraries/Source/debug/test2/default.dbgcmd
diff --git a/‎GeneralsMD/Code/Libraries/Source/debug/test2/resource.h renamed to ‎Core/Libraries/Source/debug/test2/resource.h b/‎GeneralsMD/Code/Libraries/Source/debug/test2/resource.h renamed to ‎Core/Libraries/Source/debug/test2/resource.h
diff --git a/‎GeneralsMD/Code/Libraries/Source/debug/test2/test2.cpp renamed to ‎Core/Libraries/Source/debug/test2/test2.cpp b/‎GeneralsMD/Code/Libraries/Source/debug/test2/test2.cpp renamed to ‎Core/Libraries/Source/debug/test2/test2.cpp
diff --git a/‎GeneralsMD/Code/Libraries/Source/debug/test2/test2.rc renamed to ‎Core/Libraries/Source/debug/test2/test2.rc b/‎GeneralsMD/Code/Libraries/Source/debug/test2/test2.rc renamed to ‎Core/Libraries/Source/debug/test2/test2.rc
diff --git a/‎GeneralsMD/Code/Libraries/Source/debug/test3/test3.cpp renamed to ‎Core/Libraries/Source/debug/test3/test3.cpp b/‎GeneralsMD/Code/Libraries/Source/debug/test3/test3.cpp renamed to ‎Core/Libraries/Source/debug/test3/test3.cpp
diff --git a/‎GeneralsMD/Code/Libraries/Source/debug/test4/test4.cpp renamed to ‎Core/Libraries/Source/debug/test4/test4.cpp b/‎GeneralsMD/Code/Libraries/Source/debug/test4/test4.cpp renamed to ‎Core/Libraries/Source/debug/test4/test4.cpp
diff --git a/‎GeneralsMD/Code/Libraries/Source/debug/test5/test5.cpp renamed to ‎Core/Libraries/Source/debug/test5/test5.cpp b/‎GeneralsMD/Code/Libraries/Source/debug/test5/test5.cpp renamed to ‎Core/Libraries/Source/debug/test5/test5.cpp
diff --git a/‎GeneralsMD/Code/Libraries/Source/debug/test6/test6.cpp renamed to ‎Core/Libraries/Source/debug/test6/test6.cpp b/‎GeneralsMD/Code/Libraries/Source/debug/test6/test6.cpp renamed to ‎Core/Libraries/Source/debug/test6/test6.cpp
diff --git a/‎GeneralsMD/Code/Libraries/Source/profile/CMakeLists.txt renamed to ‎Core/Libraries/Source/profile/CMakeLists.txt
+5-5 b/‎GeneralsMD/Code/Libraries/Source/profile/CMakeLists.txt renamed to ‎Core/Libraries/Source/profile/CMakeLists.txt
+5-5
diff --git a/‎GeneralsMD/Code/Libraries/Source/profile/_pch.cpp renamed to ‎Core/Libraries/Source/profile/_pch.cpp b/‎GeneralsMD/Code/Libraries/Source/profile/_pch.cpp renamed to ‎Core/Libraries/Source/profile/_pch.cpp
diff --git a/‎GeneralsMD/Code/Libraries/Source/profile/_pch.h renamed to ‎Core/Libraries/Source/profile/_pch.h b/‎GeneralsMD/Code/Libraries/Source/profile/_pch.h renamed to ‎Core/Libraries/Source/profile/_pch.h
diff --git a/‎GeneralsMD/Code/Libraries/Source/profile/compile_doxygen.bat renamed to ‎Core/Libraries/Source/profile/compile_doxygen.bat b/‎GeneralsMD/Code/Libraries/Source/profile/compile_doxygen.bat renamed to ‎Core/Libraries/Source/profile/compile_doxygen.bat
diff --git a/‎GeneralsMD/Code/Libraries/Source/profile/internal.h renamed to ‎Core/Libraries/Source/profile/internal.h b/‎GeneralsMD/Code/Libraries/Source/profile/internal.h renamed to ‎Core/Libraries/Source/profile/internal.h
diff --git a/‎GeneralsMD/Code/Libraries/Source/profile/internal_cmd.h renamed to ‎Core/Libraries/Source/profile/internal_cmd.h b/‎GeneralsMD/Code/Libraries/Source/profile/internal_cmd.h renamed to ‎Core/Libraries/Source/profile/internal_cmd.h
diff --git a/‎GeneralsMD/Code/Libraries/Source/profile/internal_funclevel.h renamed to ‎Core/Libraries/Source/profile/internal_funclevel.h b/‎GeneralsMD/Code/Libraries/Source/profile/internal_funclevel.h renamed to ‎Core/Libraries/Source/profile/internal_funclevel.h
diff --git a/‎GeneralsMD/Code/Libraries/Source/profile/internal_highlevel.h renamed to ‎Core/Libraries/Source/profile/internal_highlevel.h b/‎GeneralsMD/Code/Libraries/Source/profile/internal_highlevel.h renamed to ‎Core/Libraries/Source/profile/internal_highlevel.h
diff --git a/‎GeneralsMD/Code/Libraries/Source/profile/internal_result.h renamed to ‎Core/Libraries/Source/profile/internal_result.h b/‎GeneralsMD/Code/Libraries/Source/profile/internal_result.h renamed to ‎Core/Libraries/Source/profile/internal_result.h
diff --git a/‎GeneralsMD/Code/Libraries/Source/profile/profile.cpp renamed to ‎Core/Libraries/Source/profile/profile.cpp b/‎GeneralsMD/Code/Libraries/Source/profile/profile.cpp renamed to ‎Core/Libraries/Source/profile/profile.cpp
diff --git a/‎GeneralsMD/Code/Libraries/Source/profile/profile.dox renamed to ‎Core/Libraries/Source/profile/profile.dox b/‎GeneralsMD/Code/Libraries/Source/profile/profile.dox renamed to ‎Core/Libraries/Source/profile/profile.dox
diff --git a/‎GeneralsMD/Code/Libraries/Source/profile/profile.h renamed to ‎Core/Libraries/Source/profile/profile.h b/‎GeneralsMD/Code/Libraries/Source/profile/profile.h renamed to ‎Core/Libraries/Source/profile/profile.h
diff --git a/‎GeneralsMD/Code/Libraries/Source/profile/profile_cmd.cpp renamed to ‎Core/Libraries/Source/profile/profile_cmd.cpp b/‎GeneralsMD/Code/Libraries/Source/profile/profile_cmd.cpp renamed to ‎Core/Libraries/Source/profile/profile_cmd.cpp
diff --git a/‎GeneralsMD/Code/Libraries/Source/profile/profile_doc.h renamed to ‎Core/Libraries/Source/profile/profile_doc.h b/‎GeneralsMD/Code/Libraries/Source/profile/profile_doc.h renamed to ‎Core/Libraries/Source/profile/profile_doc.h
diff --git a/‎GeneralsMD/Code/Libraries/Source/profile/profile_funclevel.cpp renamed to ‎Core/Libraries/Source/profile/profile_funclevel.cpp b/‎GeneralsMD/Code/Libraries/Source/profile/profile_funclevel.cpp renamed to ‎Core/Libraries/Source/profile/profile_funclevel.cpp
diff --git a/‎GeneralsMD/Code/Libraries/Source/profile/profile_funclevel.h renamed to ‎Core/Libraries/Source/profile/profile_funclevel.h b/‎GeneralsMD/Code/Libraries/Source/profile/profile_funclevel.h renamed to ‎Core/Libraries/Source/profile/profile_funclevel.h
diff --git a/‎GeneralsMD/Code/Libraries/Source/profile/profile_highlevel.cpp renamed to ‎Core/Libraries/Source/profile/profile_highlevel.cpp b/‎GeneralsMD/Code/Libraries/Source/profile/profile_highlevel.cpp renamed to ‎Core/Libraries/Source/profile/profile_highlevel.cpp
diff --git a/‎GeneralsMD/Code/Libraries/Source/profile/profile_highlevel.h renamed to ‎Core/Libraries/Source/profile/profile_highlevel.h b/‎GeneralsMD/Code/Libraries/Source/profile/profile_highlevel.h renamed to ‎Core/Libraries/Source/profile/profile_highlevel.h
diff --git a/‎GeneralsMD/Code/Libraries/Source/profile/profile_priv.dox renamed to ‎Core/Libraries/Source/profile/profile_priv.dox b/‎GeneralsMD/Code/Libraries/Source/profile/profile_priv.dox renamed to ‎Core/Libraries/Source/profile/profile_priv.dox
diff --git a/‎GeneralsMD/Code/Libraries/Source/profile/profile_result.cpp renamed to ‎Core/Libraries/Source/profile/profile_result.cpp b/‎GeneralsMD/Code/Libraries/Source/profile/profile_result.cpp renamed to ‎Core/Libraries/Source/profile/profile_result.cpp
diff --git a/‎GeneralsMD/Code/Libraries/Source/profile/profile_result.h renamed to ‎Core/Libraries/Source/profile/profile_result.h b/‎GeneralsMD/Code/Libraries/Source/profile/profile_result.h renamed to ‎Core/Libraries/Source/profile/profile_result.h
diff --git a/‎GeneralsMD/Code/Libraries/Source/profile/test1/test1.cpp renamed to ‎Core/Libraries/Source/profile/test1/test1.cpp b/‎GeneralsMD/Code/Libraries/Source/profile/test1/test1.cpp renamed to ‎Core/Libraries/Source/profile/test1/test1.cpp
diff --git a/‎Core/Tools/ImagePacker/CMakeLists.txt
+2 b/‎Core/Tools/ImagePacker/CMakeLists.txt
+2
diff --git a/‎Core/Tools/MapCacheBuilder/CMakeLists.txt
+2 b/‎Core/Tools/MapCacheBuilder/CMakeLists.txt
+2
diff --git a/‎Core/Tools/PATCHGET/CMakeLists.txt
+2 b/‎Core/Tools/PATCHGET/CMakeLists.txt
+2
diff --git a/‎GeneralsMD/Code/Libraries/CMakeLists.txt
-6 b/‎GeneralsMD/Code/Libraries/CMakeLists.txt
-6
diff --git a/‎GeneralsMD/Code/Main/CMakeLists.txt
+2-2 b/‎GeneralsMD/Code/Main/CMakeLists.txt
+2-2
diff --git a/‎GeneralsMD/Code/Tools/GUIEdit/CMakeLists.txt
+2-2 b/‎GeneralsMD/Code/Tools/GUIEdit/CMakeLists.txt
+2-2
diff --git a/‎GeneralsMD/Code/Tools/ImagePacker/CMakeLists.txt
-2 b/‎GeneralsMD/Code/Tools/ImagePacker/CMakeLists.txt
-2
diff --git a/‎GeneralsMD/Code/Tools/MapCacheBuilder/CMakeLists.txt
-2 b/‎GeneralsMD/Code/Tools/MapCacheBuilder/CMakeLists.txt
-2
diff --git a/‎GeneralsMD/Code/Tools/PATCHGET/CMakeLists.txt
-2 b/‎GeneralsMD/Code/Tools/PATCHGET/CMakeLists.txt
-2
diff --git a/‎GeneralsMD/Code/Tools/ParticleEditor/CMakeLists.txt
+2-2 b/‎GeneralsMD/Code/Tools/ParticleEditor/CMakeLists.txt
+2-2
diff --git a/‎GeneralsMD/Code/Tools/WorldBuilder/CMakeLists.txt
+2-2 b/‎GeneralsMD/Code/Tools/WorldBuilder/CMakeLists.txt
+2-2
@@ -2,10 +2,10 @@
 add_subdirectory(Source/WWVegas)
 
 # profiling library
-#add_subdirectory(Source/profile)
+add_subdirectory(Source/profile)
 
 # debugging library
-#add_subdirectory(Source/debug)
+add_subdirectory(Source/debug)
 
 add_subdirectory(Source/EABrowserDispatch)
 add_subdirectory(Source/EABrowserEngine)
 
@@ -24,15 +24,15 @@ set(DEBUG_SRC
     "internal.h"
 )
 
-add_library(z_debug STATIC)
+add_library(core_debug STATIC)
 
-target_sources(z_debug PRIVATE ${DEBUG_SRC})
+target_sources(core_debug PRIVATE ${DEBUG_SRC})
 
-target_include_directories(z_debug INTERFACE
+target_include_directories(core_debug INTERFACE
     ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
-target_link_libraries(z_debug PRIVATE
+target_link_libraries(core_debug PRIVATE
     core_config
-    zi_always
+    corei_always
 )
@@ -18,15 +18,15 @@ set(PROFILE_SRC
     "profile.h"
 )
 
-add_library(z_profile STATIC)
+add_library(core_profile STATIC)
 
-target_sources(z_profile PRIVATE ${PROFILE_SRC})
+target_sources(core_profile PRIVATE ${PROFILE_SRC})
 
-target_include_directories(z_profile INTERFACE
+target_include_directories(core_profile INTERFACE
     ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
-target_link_libraries(z_profile PRIVATE
+target_link_libraries(core_profile PRIVATE
     core_config
-    zi_always
+    corei_always
 )
@@ -28,6 +28,8 @@ target_include_directories(corei_imagepacker INTERFACE
 target_link_libraries(corei_imagepacker INTERFACE
     benchmark
     comctl32
+    core_debug
+    core_profile
     dbghelplib
     imm32
     vfw32
 
@@ -15,6 +15,8 @@ target_include_directories(corei_mapcachebuilder INTERFACE
 #
 target_link_libraries(corei_mapcachebuilder INTERFACE
     comctl32
+    core_debug
+    core_profile
     dbghelplib
     imm32
     vfw32
 
@@ -23,6 +23,8 @@ target_sources(corei_patchgrabber INTERFACE ${PATCHGET_SRC})
 
 target_link_libraries(corei_patchgrabber INTERFACE
     comctl32
+    core_debug
+    core_profile
     dbghelplib
     gamespy::gamespy
     imm32
 
@@ -1,8 +1,2 @@
 # WW common libraries decended from earliest C&C games
 add_subdirectory(Source/WWVegas)
-
-# profiling library
-add_subdirectory(Source/profile)
-
-# debugging library
-add_subdirectory(Source/debug)
@@ -10,6 +10,8 @@ endif()
 target_link_libraries(z_generals PRIVATE
     binkstub
     comctl32
+    core_debug
+    core_profile
     d3d8
     d3dx8
     dbghelplib
@@ -20,10 +22,8 @@ target_link_libraries(z_generals PRIVATE
     safedisc
     vfw32
     winmm
-    z_debug
     z_gameengine
     z_gameenginedevice
-    z_profile
     zi_always
 )
 
 
@@ -48,16 +48,16 @@ target_include_directories(z_guiedit PRIVATE
 target_link_libraries(z_guiedit PRIVATE
     benchmark
     comctl32
+    core_debug
+    core_profile
     d3d8lib
     dbghelplib
     imm32
     stlport
     vfw32
     winmm
-    z_debug
     z_gameengine
     z_gameenginedevice
-    z_profile
     z_wwvegas
     zi_always
 )
 
@@ -3,9 +3,7 @@ set_target_properties(z_imagepacker PROPERTIES OUTPUT_NAME imagepacker)
 
 target_link_libraries(z_imagepacker PRIVATE
     corei_imagepacker
-    z_debug
     z_gameengine
     z_gameenginedevice
-    z_profile
     zi_always
 )
@@ -3,9 +3,7 @@ set_target_properties(z_mapcachebuilder PROPERTIES OUTPUT_NAME mapcachebuilder)
 
 target_link_libraries(z_mapcachebuilder PRIVATE
     corei_mapcachebuilder
-    z_debug
     z_gameengine
     z_gameenginedevice
-    z_profile
     zi_always
 )
@@ -3,10 +3,8 @@ macro(setup_patchgrabber appname)
 
     target_link_libraries(${appname} PRIVATE
         corei_patchgrabber
-        z_debug
         z_gameengine
         z_gameenginedevice
-        z_profile
         z_wwvegas
         zi_always
     )
 
@@ -37,6 +37,8 @@ target_include_directories(z_particleeditor PRIVATE
 )
 
 target_link_libraries(z_particleeditor PRIVATE
+    core_debug
+    core_profile
     corei_libraries_source_wwvegas
     corei_libraries_source_wwvegas_wwlib
     d3d8lib
@@ -46,8 +48,6 @@ target_link_libraries(z_particleeditor PRIVATE
     stlport
     vfw32
     winmm
-    z_debug
-    z_profile
     zi_gameengine_include
     zi_always
     zi_libraries_source_wwvegas
 
@@ -210,16 +210,16 @@ target_include_directories(z_worldbuilder PRIVATE
 )
 
 target_link_libraries(z_worldbuilder PRIVATE
+    core_debug
+    core_profile
     d3d8lib
     dbghelplib
     imm32
     vfw32
     winmm
     core_browserdispatch
-    z_debug
     z_gameengine
     z_gameenginedevice
-    z_profile
     zi_gameengine_include
     zi_gameenginedevice_include
     zi_always
Original file line number	Diff line number	Diff line change
`@@ -24,15 +24,15 @@ set(DEBUG_SRC`
`24`	`24`	`"internal.h"`
`25`	`25`	`)`
`26`	`26`
`27`		`-add_library(z_debug STATIC)`
	`27`	`+add_library(core_debug STATIC)`
`28`	`28`
`29`		`-target_sources(z_debug PRIVATE ${DEBUG_SRC})`
	`29`	`+target_sources(core_debug PRIVATE ${DEBUG_SRC})`
`30`	`30`
`31`		`-target_include_directories(z_debug INTERFACE`
	`31`	`+target_include_directories(core_debug INTERFACE`
`32`	`32`	`${CMAKE_CURRENT_SOURCE_DIR}`
`33`	`33`	`)`
`34`	`34`
`35`		`-target_link_libraries(z_debug PRIVATE`
	`35`	`+target_link_libraries(core_debug PRIVATE`
`36`	`36`	`core_config`
`37`		`- zi_always`
	`37`	`+ corei_always`
`38`	`38`	`)`
Original file line number	Diff line number	Diff line change
`@@ -18,15 +18,15 @@ set(PROFILE_SRC`
`18`	`18`	`"profile.h"`
`19`	`19`	`)`
`20`	`20`
`21`		`-add_library(z_profile STATIC)`
	`21`	`+add_library(core_profile STATIC)`
`22`	`22`
`23`		`-target_sources(z_profile PRIVATE ${PROFILE_SRC})`
	`23`	`+target_sources(core_profile PRIVATE ${PROFILE_SRC})`
`24`	`24`
`25`		`-target_include_directories(z_profile INTERFACE`
	`25`	`+target_include_directories(core_profile INTERFACE`
`26`	`26`	`${CMAKE_CURRENT_SOURCE_DIR}`
`27`	`27`	`)`
`28`	`28`
`29`		`-target_link_libraries(z_profile PRIVATE`
	`29`	`+target_link_libraries(core_profile PRIVATE`
`30`	`30`	`core_config`
`31`		`- zi_always`
	`31`	`+ corei_always`
`32`	`32`	`)`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,8 @@ target_include_directories(corei_mapcachebuilder INTERFACE`
`15`	`15`	`#`
`16`	`16`	`target_link_libraries(corei_mapcachebuilder INTERFACE`
`17`	`17`	`comctl32`
	`18`	`+ core_debug`
	`19`	`+ core_profile`
`18`	`20`	`dbghelplib`
`19`	`21`	`imm32`
`20`	`22`	`vfw32`
Original file line number	Diff line number	Diff line change
`@@ -3,9 +3,7 @@ set_target_properties(z_imagepacker PROPERTIES OUTPUT_NAME imagepacker)`
`3`	`3`
`4`	`4`	`target_link_libraries(z_imagepacker PRIVATE`
`5`	`5`	`corei_imagepacker`
`6`		`- z_debug`
`7`	`6`	`z_gameengine`
`8`	`7`	`z_gameenginedevice`
`9`		`- z_profile`
`10`	`8`	`zi_always`
`11`	`9`	`)`
Original file line number	Diff line number	Diff line change
`@@ -3,9 +3,7 @@ set_target_properties(z_mapcachebuilder PROPERTIES OUTPUT_NAME mapcachebuilder)`
`3`	`3`
`4`	`4`	`target_link_libraries(z_mapcachebuilder PRIVATE`
`5`	`5`	`corei_mapcachebuilder`
`6`		`- z_debug`
`7`	`6`	`z_gameengine`
`8`	`7`	`z_gameenginedevice`
`9`		`- z_profile`
`10`	`8`	`zi_always`
`11`	`9`	`)`