Merge pull request #809 from msutovsky-r7/feat/mingw/adds_debug_compilation

dledda-r7 · web-flow · commit 298e84a20f76 · 2026-08-11T10:14:33.000+02:00
Adds debug compilation for Mingw
diff --git a/c/meterpreter/Makefile b/c/meterpreter/Makefile
diff --git a/c/meterpreter/workspace/CMakeListsFuncs.txt b/c/meterpreter/workspace/CMakeListsFuncs.txt
@@ -10,8 +10,22 @@ endfunction()
 function(copyoutput)
     add_custom_command(TARGET ${ARGV0} POST_BUILD
         COMMAND ${CMAKE_COMMAND} -E make_directory ${ARGV1})
-    add_custom_command(TARGET ${ARGV0} POST_BUILD
-        COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:${ARGV0}> ${ARGV1})
+    if(DBGTRACE OR DBGTRACE_VERBOSE)
+        add_custom_command(TARGET ${ARGV0} POST_BUILD
+            COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:${ARGV0}> ${ARGV1}$<TARGET_FILE_BASE_NAME:${ARGV0}>.debug$<TARGET_FILE_SUFFIX:${ARGV0}>)
+    else()
+        add_custom_command(TARGET ${ARGV0} POST_BUILD
+            COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:${ARGV0}> ${ARGV1})
+    endif()
+endfunction()
+
+function(append_debug_sources out_var)
+    if(DBGTRACE OR DBGTRACE_VERBOSE)
+        set(${out_var}
+            ${${out_var}}
+            ${CMAKE_SOURCE_DIR}/../source/logging/logging.c
+            PARENT_SCOPE)
+    endif()
 endfunction()
 
 function(add_rdi)
diff --git a/c/meterpreter/workspace/dump_sam/CMakeLists.txt b/c/meterpreter/workspace/dump_sam/CMakeLists.txt
@@ -17,6 +17,7 @@ file(GLOB SRC_FILES
     ${SRC_DIR}/*.c
     ${SRC_DIR}/dump_sam.def
 )
+append_debug_sources(SRC_FILES)
 add_library(${PROJECT_NAME} SHARED ${SRC_FILES})
 set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME ${PROJECT_NAME}.${TARGET_ARCH})
 if(MSVC)
diff --git a/c/meterpreter/workspace/elevator/CMakeLists.txt b/c/meterpreter/workspace/elevator/CMakeLists.txt
@@ -19,6 +19,7 @@ file(GLOB SRC_FILES
     ${SRC_DIR}/*.c
     ${MOD_DEF_DIR}/plugin.def
 )
+append_debug_sources(SRC_FILES)
 add_library(${PROJECT_NAME} SHARED ${SRC_FILES})
 set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME ${PROJECT_NAME}.${TARGET_ARCH})
 set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS "/DEF:\"${MOD_DEF_DIR}/plugin.def\"")
diff --git a/c/meterpreter/workspace/ext_server_bofloader/CMakeLists.txt b/c/meterpreter/workspace/ext_server_bofloader/CMakeLists.txt
@@ -31,6 +31,7 @@ foreach(srcfile SRC_FILES)
 endforeach(SRC_FILES)
 
 
+append_debug_sources(SRC_FILES)
 add_library(${PROJECT_NAME} SHARED ${SRC_FILES})
 set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME ${PROJECT_NAME}.${TARGET_ARCH})
 
diff --git a/c/meterpreter/workspace/ext_server_espia/CMakeLists.txt b/c/meterpreter/workspace/ext_server_espia/CMakeLists.txt
@@ -21,6 +21,7 @@ file(GLOB SRC_FILES
     ${SRC_DIR}/*.c
     ${EXTENSION_DEF_FILE}
 )
+append_debug_sources(SRC_FILES)
 add_library(${PROJECT_NAME} SHARED ${SRC_FILES})
 set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME ${PROJECT_NAME}.${TARGET_ARCH})
 if(MSVC)
diff --git a/c/meterpreter/workspace/ext_server_extapi/CMakeLists.txt b/c/meterpreter/workspace/ext_server_extapi/CMakeLists.txt
@@ -23,6 +23,7 @@ file(GLOB SRC_FILES
     ${EXTENSION_DEF_FILE}
 )
 
+append_debug_sources(SRC_FILES)
 add_library(${PROJECT_NAME} SHARED ${SRC_FILES})
 set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME ${PROJECT_NAME}.${TARGET_ARCH})
 if(MSVC)
diff --git a/c/meterpreter/workspace/ext_server_incognito/CMakeLists.txt b/c/meterpreter/workspace/ext_server_incognito/CMakeLists.txt
@@ -22,6 +22,7 @@ file(GLOB SRC_FILES
     ${SRC_DIR}/*.c
     ${EXTENSION_DEF_FILE}
 )
+append_debug_sources(SRC_FILES)
 add_library(${PROJECT_NAME} SHARED ${SRC_FILES})
 set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME ${PROJECT_NAME}.${TARGET_ARCH})
 if(MSVC)
diff --git a/c/meterpreter/workspace/ext_server_kiwi/CMakeLists.txt b/c/meterpreter/workspace/ext_server_kiwi/CMakeLists.txt
@@ -82,6 +82,7 @@ file(GLOB SRC_FILES
 # Ditch some old stuff that shouldn't even be here in the mimikatz repo!
 list(REMOVE_ITEM SRC_FILES ${CMAKE_CURRENT_SOURCE_DIR}/${SRC_DIR}/mimikatz/mimikatz/modules/kuhl_m_dpapi.c)
 
+append_debug_sources(SRC_FILES)
 add_library(${PROJECT_NAME} SHARED ${SRC_FILES})
 set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME ${PROJECT_NAME}.${TARGET_ARCH})
 if(MSVC)
diff --git a/c/meterpreter/workspace/ext_server_lanattacks/CMakeLists.txt b/c/meterpreter/workspace/ext_server_lanattacks/CMakeLists.txt
@@ -24,6 +24,7 @@ file(GLOB SRC_FILES
     ${SRC_DIR}/*.cpp
     ${EXTENSION_DEF_FILE}
 )
+append_debug_sources(SRC_FILES)
 add_library(${PROJECT_NAME} SHARED ${SRC_FILES})
 set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME ${PROJECT_NAME}.${TARGET_ARCH})
 if(MSVC)
diff --git a/c/meterpreter/workspace/ext_server_peinjector/CMakeLists.txt b/c/meterpreter/workspace/ext_server_peinjector/CMakeLists.txt
@@ -22,6 +22,7 @@ file(GLOB SRC_FILES
     ${SRC_DIR}/*.c
     ${EXTENSION_DEF_FILE}
 )
+append_debug_sources(SRC_FILES)
 add_library(${PROJECT_NAME} SHARED ${SRC_FILES})
 set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME ${PROJECT_NAME}.${TARGET_ARCH})
 if(MSVC)
diff --git a/c/meterpreter/workspace/ext_server_powershell/CMakeLists.txt b/c/meterpreter/workspace/ext_server_powershell/CMakeLists.txt
@@ -19,6 +19,7 @@ file(GLOB SRC_FILES
     ${SRC_DIR}/*.cpp
     ${EXTENSION_DEF_FILE}
 )
+append_debug_sources(SRC_FILES)
 add_library(${PROJECT_NAME} SHARED ${SRC_FILES})
 set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME ${PROJECT_NAME}.${TARGET_ARCH})
 set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS "/DEF:\"${EXTENSION_DEF_FILE}\"")
diff --git a/c/meterpreter/workspace/ext_server_priv/CMakeLists.txt b/c/meterpreter/workspace/ext_server_priv/CMakeLists.txt
@@ -64,6 +64,7 @@ file(GLOB SRC_FILES
     ../../source/extensions/kiwi/mimikatz/modules/rpc/kull_m_rpc_ms-rprn.c
     ../../source/extensions/kiwi/mimikatz/modules/rpc/kull_m_rpc_ms-efsr_c.c
 )
+append_debug_sources(SRC_FILES)
 add_library(${PROJECT_NAME} SHARED ${SRC_FILES})
 set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME ${PROJECT_NAME}.${TARGET_ARCH})
 if(MSVC)
diff --git a/c/meterpreter/workspace/ext_server_python/CMakeLists.txt b/c/meterpreter/workspace/ext_server_python/CMakeLists.txt
@@ -38,6 +38,7 @@ if(IS_X64)
     list(REMOVE_ITEM SRC_FILES ${CMAKE_CURRENT_SOURCE_DIR}/${SRC_DIR}/Modules/_ctypes/libffi_msvc/win32.c)
 endif()
 
+append_debug_sources(SRC_FILES)
 add_library(${PROJECT_NAME} SHARED ${SRC_FILES})
 set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME ${PROJECT_NAME}.${TARGET_ARCH})
 set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS "/DEF:\"${EXTENSION_DEF_FILE}\"")
diff --git a/c/meterpreter/workspace/ext_server_sniffer/CMakeLists.txt b/c/meterpreter/workspace/ext_server_sniffer/CMakeLists.txt
@@ -27,6 +27,7 @@ file(GLOB SRC_FILES
     ${SRC_DIR}/*.c
     ${EXTENSION_DEF_FILE}
 )
+append_debug_sources(SRC_FILES)
 add_library(${PROJECT_NAME} SHARED ${SRC_FILES})
 set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME ${PROJECT_NAME}.${TARGET_ARCH})
 set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS "/DEF:\"${EXTENSION_DEF_FILE}\"")
diff --git a/c/meterpreter/workspace/ext_server_stdapi/CMakeLists.txt b/c/meterpreter/workspace/ext_server_stdapi/CMakeLists.txt
@@ -35,6 +35,7 @@ file(GLOB_RECURSE SRC_FILES
 
 list(REMOVE_ITEM SRC_FILES ${CMAKE_CURRENT_SOURCE_DIR}/${SRC_DIR}/server/resource/hook.c)
 
+append_debug_sources(SRC_FILES)
 add_library(${PROJECT_NAME} SHARED ${SRC_FILES})
 set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME ${PROJECT_NAME}.${TARGET_ARCH})
 set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_DEFINITIONS "STDAPI_NAMESPACE_AUDIO;STDAPI_NAMESPACE_FS;STDAPI_NAMESPACE_NET;STDAPI_NAMESPACE_RAILGUN;STDAPI_NAMESPACE_SYS;STDAPI_NAMESPACE_UI;STDAPI_NAMESPACE_WEBCAM")
diff --git a/c/meterpreter/workspace/ext_server_stdapi_audio/CMakeLists.txt b/c/meterpreter/workspace/ext_server_stdapi_audio/CMakeLists.txt
@@ -39,6 +39,7 @@ file(GLOB_RECURSE SRC_FILES
 
 list(REMOVE_ITEM SRC_FILES ${CMAKE_CURRENT_SOURCE_DIR}/${SRC_DIR}/server/resource/hook.c)
 
+append_debug_sources(SRC_FILES)
 add_library(${PROJECT_NAME} SHARED ${SRC_FILES})
 set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME ${PROJECT_NAME}.${TARGET_ARCH})
 set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_DEFINITIONS "STDAPI_NAMESPACE_AUDIO;")
diff --git a/c/meterpreter/workspace/ext_server_stdapi_fs/CMakeLists.txt b/c/meterpreter/workspace/ext_server_stdapi_fs/CMakeLists.txt
@@ -39,6 +39,7 @@ file(GLOB_RECURSE SRC_FILES
 
 list(REMOVE_ITEM SRC_FILES ${CMAKE_CURRENT_SOURCE_DIR}/${SRC_DIR}/server/resource/hook.c)
 
+append_debug_sources(SRC_FILES)
 add_library(${PROJECT_NAME} SHARED ${SRC_FILES})
 set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME ${PROJECT_NAME}.${TARGET_ARCH})
 set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_DEFINITIONS "STDAPI_NAMESPACE_FS;")
diff --git a/c/meterpreter/workspace/ext_server_stdapi_net/CMakeLists.txt b/c/meterpreter/workspace/ext_server_stdapi_net/CMakeLists.txt
@@ -39,6 +39,7 @@ file(GLOB_RECURSE SRC_FILES
 
 list(REMOVE_ITEM SRC_FILES ${CMAKE_CURRENT_SOURCE_DIR}/${SRC_DIR}/server/resource/hook.c)
 
+append_debug_sources(SRC_FILES)
 add_library(${PROJECT_NAME} SHARED ${SRC_FILES})
 set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME ${PROJECT_NAME}.${TARGET_ARCH})
 set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_DEFINITIONS "STDAPI_NAMESPACE_NET;")
diff --git a/c/meterpreter/workspace/ext_server_stdapi_railgun/CMakeLists.txt b/c/meterpreter/workspace/ext_server_stdapi_railgun/CMakeLists.txt
@@ -39,6 +39,7 @@ file(GLOB_RECURSE SRC_FILES
 
 list(REMOVE_ITEM SRC_FILES ${CMAKE_CURRENT_SOURCE_DIR}/${SRC_DIR}/server/resource/hook.c)
 
+append_debug_sources(SRC_FILES)
 add_library(${PROJECT_NAME} SHARED ${SRC_FILES})
 set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME ${PROJECT_NAME}.${TARGET_ARCH})
 set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_DEFINITIONS "STDAPI_NAMESPACE_RAILGUN;")
diff --git a/c/meterpreter/workspace/ext_server_stdapi_sys/CMakeLists.txt b/c/meterpreter/workspace/ext_server_stdapi_sys/CMakeLists.txt
@@ -39,6 +39,7 @@ file(GLOB_RECURSE SRC_FILES
 
 list(REMOVE_ITEM SRC_FILES ${CMAKE_CURRENT_SOURCE_DIR}/${SRC_DIR}/server/resource/hook.c)
 
+append_debug_sources(SRC_FILES)
 add_library(${PROJECT_NAME} SHARED ${SRC_FILES})
 set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME ${PROJECT_NAME}.${TARGET_ARCH})
 set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_DEFINITIONS "STDAPI_NAMESPACE_SYS;")
diff --git a/c/meterpreter/workspace/ext_server_stdapi_ui/CMakeLists.txt b/c/meterpreter/workspace/ext_server_stdapi_ui/CMakeLists.txt
@@ -43,6 +43,7 @@ file(GLOB_RECURSE SRC_FILES
 
 list(REMOVE_ITEM SRC_FILES ${CMAKE_CURRENT_SOURCE_DIR}/${SRC_DIR}/server/resource/hook.c)
 
+append_debug_sources(SRC_FILES)
 add_library(${PROJECT_NAME} SHARED ${SRC_FILES})
 set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME ${PROJECT_NAME}.${TARGET_ARCH})
 set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_DEFINITIONS "STDAPI_NAMESPACE_AUDIO;STDAPI_NAMESPACE_WEBCAM;STDAPI_NAMESPACE_SYS;STDAPI_NAMESPACE_UI;")
diff --git a/c/meterpreter/workspace/ext_server_stdapi_webcam/CMakeLists.txt b/c/meterpreter/workspace/ext_server_stdapi_webcam/CMakeLists.txt
@@ -42,6 +42,7 @@ file(GLOB_RECURSE SRC_FILES
 
 list(REMOVE_ITEM SRC_FILES ${CMAKE_CURRENT_SOURCE_DIR}/${SRC_DIR}/server/resource/hook.c)
 
+append_debug_sources(SRC_FILES)
 add_library(${PROJECT_NAME} SHARED ${SRC_FILES})
 set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME ${PROJECT_NAME}.${TARGET_ARCH})
 set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_DEFINITIONS "STDAPI_NAMESPACE_AUDIO;STDAPI_NAMESPACE_WEBCAM;STDAPI_NAMESPACE_SYS;")
diff --git a/c/meterpreter/workspace/ext_server_unhook/CMakeLists.txt b/c/meterpreter/workspace/ext_server_unhook/CMakeLists.txt
@@ -20,6 +20,7 @@ file(GLOB SRC_FILES
     ${SRC_DIR}/*.c
     ${EXTENSION_DEF_FILE}
 )
+append_debug_sources(SRC_FILES)
 add_library(${PROJECT_NAME} SHARED ${SRC_FILES})
 set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME ${PROJECT_NAME}.${TARGET_ARCH})
 if(MSVC)
diff --git a/c/meterpreter/workspace/ext_server_winpmem/CMakeLists.txt b/c/meterpreter/workspace/ext_server_winpmem/CMakeLists.txt
@@ -30,6 +30,7 @@ else()
     set(SRC_FILES ${SRC_FILES} ${SRC_DIR}/winpmem-mingw.rc)
 endif()
 
+append_debug_sources(SRC_FILES)
 add_library(${PROJECT_NAME} SHARED ${SRC_FILES})
 set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME ${PROJECT_NAME}.${TARGET_ARCH})
 if(MSVC)
diff --git a/c/meterpreter/workspace/metsrv/CMakeLists.txt b/c/meterpreter/workspace/metsrv/CMakeLists.txt
@@ -29,6 +29,7 @@ else()
         ${MOD_DEF_DIR}/metsrv.def
     )
 endif()
+append_debug_sources(SRC_FILES)
 add_library(${PROJECT_NAME} SHARED ${SRC_FILES})
 set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME ${PROJECT_NAME}.${TARGET_ARCH})
 if(MSVC)
diff --git a/c/meterpreter/workspace/screenshot/CMakeLists.txt b/c/meterpreter/workspace/screenshot/CMakeLists.txt
@@ -19,6 +19,7 @@ file(GLOB SRC_FILES
     ${SRC_DIR}/*.c
     ${MOD_DEF_DIR}/plugin.def
 )
+append_debug_sources(SRC_FILES)
 add_library(${PROJECT_NAME} SHARED ${SRC_FILES})
 set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME ${PROJECT_NAME}.${TARGET_ARCH})
 set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS "/DEF:\"${MOD_DEF_DIR}/plugin.def\"")

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@ file(GLOB SRC_FILES`
`17`	`17`	`${SRC_DIR}/*.c`
`18`	`18`	`${SRC_DIR}/dump_sam.def`
`19`	`19`	`)`
	`20`	`+append_debug_sources(SRC_FILES)`
`20`	`21`	`add_library(${PROJECT_NAME} SHARED ${SRC_FILES})`
`21`	`22`	`set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME ${PROJECT_NAME}.${TARGET_ARCH})`
`22`	`23`	`if(MSVC)`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ file(GLOB SRC_FILES`
`19`	`19`	`${SRC_DIR}/*.c`
`20`	`20`	`${MOD_DEF_DIR}/plugin.def`
`21`	`21`	`)`
	`22`	`+append_debug_sources(SRC_FILES)`
`22`	`23`	`add_library(${PROJECT_NAME} SHARED ${SRC_FILES})`
`23`	`24`	`set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME ${PROJECT_NAME}.${TARGET_ARCH})`
`24`	`25`	`set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS "/DEF:\"${MOD_DEF_DIR}/plugin.def\"")`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@ file(GLOB SRC_FILES`
`21`	`21`	`${SRC_DIR}/*.c`
`22`	`22`	`${EXTENSION_DEF_FILE}`
`23`	`23`	`)`
	`24`	`+append_debug_sources(SRC_FILES)`
`24`	`25`	`add_library(${PROJECT_NAME} SHARED ${SRC_FILES})`
`25`	`26`	`set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME ${PROJECT_NAME}.${TARGET_ARCH})`
`26`	`27`	`if(MSVC)`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@ file(GLOB SRC_FILES`
`23`	`23`	`${EXTENSION_DEF_FILE}`
`24`	`24`	`)`
`25`	`25`
	`26`	`+append_debug_sources(SRC_FILES)`
`26`	`27`	`add_library(${PROJECT_NAME} SHARED ${SRC_FILES})`
`27`	`28`	`set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME ${PROJECT_NAME}.${TARGET_ARCH})`
`28`	`29`	`if(MSVC)`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ file(GLOB SRC_FILES`
`22`	`22`	`${SRC_DIR}/*.c`
`23`	`23`	`${EXTENSION_DEF_FILE}`
`24`	`24`	`)`
	`25`	`+append_debug_sources(SRC_FILES)`
`25`	`26`	`add_library(${PROJECT_NAME} SHARED ${SRC_FILES})`
`26`	`27`	`set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME ${PROJECT_NAME}.${TARGET_ARCH})`
`27`	`28`	`if(MSVC)`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@ file(GLOB SRC_FILES`
`24`	`24`	`${SRC_DIR}/*.cpp`
`25`	`25`	`${EXTENSION_DEF_FILE}`
`26`	`26`	`)`
	`27`	`+append_debug_sources(SRC_FILES)`
`27`	`28`	`add_library(${PROJECT_NAME} SHARED ${SRC_FILES})`
`28`	`29`	`set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME ${PROJECT_NAME}.${TARGET_ARCH})`
`29`	`30`	`if(MSVC)`