From 0f1501dd85d249151920300da50cab07fc8515a3 Mon Sep 17 00:00:00 2001 From: oltolm Date: Sat, 22 Apr 2023 12:21:08 +0200 Subject: [PATCH] cmake: improve def files and remove workarounds for old def files --- sample/CMakeLists.txt | 3 +- src/addr2line/CMakeLists.txt | 6 +- src/catchsegv/CMakeLists.txt | 6 +- src/drmingw/CMakeLists.txt | 6 +- src/exchndl/CMakeLists.txt | 20 +------ src/exchndl/exchndl32.def | 6 ++ src/exchndl/exchndl32exp.def | 6 -- src/exchndl/exchndl32imp.def | 6 -- src/mgwhelp/CMakeLists.txt | 17 +----- src/mgwhelp/mgwhelp32.def | 108 ++++++++++++++++++++++++++++++++++ src/mgwhelp/mgwhelp32exp.def | 108 ---------------------------------- src/mgwhelp/mgwhelp32imp.def | 109 ----------------------------------- tests/CMakeLists.txt | 11 +--- 13 files changed, 128 insertions(+), 284 deletions(-) create mode 100644 src/exchndl/exchndl32.def delete mode 100644 src/exchndl/exchndl32exp.def delete mode 100644 src/exchndl/exchndl32imp.def create mode 100644 src/mgwhelp/mgwhelp32.def delete mode 100644 src/mgwhelp/mgwhelp32exp.def delete mode 100644 src/mgwhelp/mgwhelp32imp.def diff --git a/sample/CMakeLists.txt b/sample/CMakeLists.txt index 471579cb..54d6c008 100644 --- a/sample/CMakeLists.txt +++ b/sample/CMakeLists.txt @@ -3,8 +3,7 @@ force_debug () add_executable (sample sample.cpp ) -add_dependencies (sample exchndl_implib) -target_link_libraries (sample PRIVATE exchndl_implib) +target_link_libraries (sample PRIVATE exchndl) install (FILES sample.cpp DESTINATION sample) install (FILES sample.mak DESTINATION sample RENAME Makefile) diff --git a/src/addr2line/CMakeLists.txt b/src/addr2line/CMakeLists.txt index 05935211..36dc3c52 100644 --- a/src/addr2line/CMakeLists.txt +++ b/src/addr2line/CMakeLists.txt @@ -2,11 +2,9 @@ add_executable (addr2line addr2line.cpp ) -add_dependencies (addr2line mgwhelp_implib) - -target_link_libraries (addr2line +target_link_libraries (addr2line PRIVATE common - mgwhelp_implib + mgwhelp ) install (TARGETS addr2line RUNTIME DESTINATION bin) diff --git a/src/catchsegv/CMakeLists.txt b/src/catchsegv/CMakeLists.txt index 1f04c3d2..bac0be89 100644 --- a/src/catchsegv/CMakeLists.txt +++ b/src/catchsegv/CMakeLists.txt @@ -8,12 +8,10 @@ include_directories ( set_property (TARGET catchsegv APPEND_STRING PROPERTY LINK_FLAGS " -municode") -add_dependencies (catchsegv mgwhelp_implib) - -target_link_libraries (catchsegv +target_link_libraries (catchsegv PRIVATE common getoptW - mgwhelp_implib + mgwhelp winmm ) diff --git a/src/drmingw/CMakeLists.txt b/src/drmingw/CMakeLists.txt index 9c6f6f52..06fca183 100644 --- a/src/drmingw/CMakeLists.txt +++ b/src/drmingw/CMakeLists.txt @@ -10,11 +10,9 @@ target_compile_definitions (drmingw PRIVATE VERSION="${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}" ) -add_dependencies (drmingw mgwhelp_implib) - -target_link_libraries (drmingw +target_link_libraries (drmingw PRIVATE common - mgwhelp_implib + mgwhelp ) install (TARGETS drmingw RUNTIME DESTINATION bin) diff --git a/src/exchndl/CMakeLists.txt b/src/exchndl/CMakeLists.txt index a310e367..43fd5e00 100644 --- a/src/exchndl/CMakeLists.txt +++ b/src/exchndl/CMakeLists.txt @@ -1,21 +1,7 @@ if (CMAKE_SIZEOF_VOID_P EQUAL 4 AND CMAKE_C_COMPILER_ID STREQUAL GNU) - # Build import library separately, to deal with MinGW issues - - add_library (exchndl MODULE exchndl32exp.def) - - set (EXCHNDL_IMPLIB ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}/libexchndl.dll.a) - add_custom_command ( - OUTPUT ${EXCHNDL_IMPLIB} - COMMAND ${CMAKE_DLLTOOL} --output-lib ${EXCHNDL_IMPLIB} --dllname exchndl.dll --kill-at --input-def ${CMAKE_CURRENT_SOURCE_DIR}/exchndl32imp.def - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/exchndl32imp.def - ) - add_custom_target (libexchndl_implib DEPENDS exchndl ${EXCHNDL_IMPLIB}) - add_library (exchndl_implib INTERFACE IMPORTED GLOBAL) - target_link_libraries (exchndl_implib INTERFACE ${EXCHNDL_IMPLIB}) - install (FILES ${EXCHNDL_IMPLIB} DESTINATION lib) + add_library (exchndl SHARED exchndl32.def) else () add_library (exchndl SHARED exchndl64.def) - add_library (exchndl_implib ALIAS exchndl) endif () target_sources (exchndl PRIVATE @@ -23,11 +9,9 @@ target_sources (exchndl PRIVATE version.rc ) -add_dependencies (exchndl mgwhelp_implib) - target_link_libraries (exchndl PRIVATE common - mgwhelp_implib + mgwhelp ) set_target_properties (exchndl PROPERTIES diff --git a/src/exchndl/exchndl32.def b/src/exchndl/exchndl32.def new file mode 100644 index 00000000..94420613 --- /dev/null +++ b/src/exchndl/exchndl32.def @@ -0,0 +1,6 @@ +LIBRARY exchndl.dll + +EXPORTS + ExcHndlInit@0 == ExcHndlInit + ExcHndlSetLogFileNameA@4 == ExcHndlSetLogFileNameA + ExcHndlSetLogFileNameW@4 == ExcHndlSetLogFileNameW diff --git a/src/exchndl/exchndl32exp.def b/src/exchndl/exchndl32exp.def deleted file mode 100644 index a3e28938..00000000 --- a/src/exchndl/exchndl32exp.def +++ /dev/null @@ -1,6 +0,0 @@ -LIBRARY exchndl.dll - -EXPORTS - ExcHndlInit = ExcHndlInit@0 - ExcHndlSetLogFileNameA = ExcHndlSetLogFileNameA@4 - ExcHndlSetLogFileNameW = ExcHndlSetLogFileNameW@4 diff --git a/src/exchndl/exchndl32imp.def b/src/exchndl/exchndl32imp.def deleted file mode 100644 index 146f9f71..00000000 --- a/src/exchndl/exchndl32imp.def +++ /dev/null @@ -1,6 +0,0 @@ -LIBRARY exchndl.dll - -EXPORTS - ExcHndlInit@0 - ExcHndlSetLogFileNameA@4 - ExcHndlSetLogFileNameW@4 diff --git a/src/mgwhelp/CMakeLists.txt b/src/mgwhelp/CMakeLists.txt index c7541aa3..f38339e5 100644 --- a/src/mgwhelp/CMakeLists.txt +++ b/src/mgwhelp/CMakeLists.txt @@ -1,21 +1,7 @@ if (CMAKE_SIZEOF_VOID_P EQUAL 4 AND CMAKE_C_COMPILER_ID STREQUAL GNU) - # Build import library separately, to deal with MinGW issues - - add_library (mgwhelp MODULE mgwhelp32exp.def) - - set (MGWHELP_IMPLIB ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}/libmgwhelp.dll.a) - add_custom_command ( - OUTPUT ${MGWHELP_IMPLIB} - COMMAND ${CMAKE_DLLTOOL} --output-lib ${MGWHELP_IMPLIB} --dllname mgwhelp.dll --kill-at --input-def ${CMAKE_CURRENT_SOURCE_DIR}/mgwhelp32imp.def - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/mgwhelp32imp.def - ) - add_custom_target (libmgwhelp_implib DEPENDS mgwhelp ${MGWHELP_IMPLIB}) - add_library (mgwhelp_implib INTERFACE IMPORTED GLOBAL) - target_link_libraries (mgwhelp_implib INTERFACE ${MGWHELP_IMPLIB}) - install (FILES ${MGWHELP_IMPLIB} DESTINATION lib) + add_library (mgwhelp SHARED mgwhelp32.def) else () add_library (mgwhelp SHARED mgwhelp64.def) - add_library (mgwhelp_implib ALIAS mgwhelp) endif () target_sources (mgwhelp PRIVATE @@ -29,6 +15,7 @@ target_link_libraries (mgwhelp PRIVATE common dwarf libiberty + PUBLIC dbghelp ) diff --git a/src/mgwhelp/mgwhelp32.def b/src/mgwhelp/mgwhelp32.def new file mode 100644 index 00000000..dfdf576d --- /dev/null +++ b/src/mgwhelp/mgwhelp32.def @@ -0,0 +1,108 @@ +EXPORTS + SymInitialize@12 = MgwSymInitialize@12 == SymInitialize + SymInitializeW@12 = MgwSymInitializeW@12 == SymInitializeW + SymCleanup@4 = MgwSymCleanup@4 == SymCleanup + SymSetOptions@4 = MgwSymSetOptions@4 == SymSetOptions + SymFromAddr@20 = MgwSymFromAddr@20 == SymFromAddr + SymFromAddrW@20 = MgwSymFromAddrW@20 == SymFromAddrW + SymGetLineFromAddr64@20 = MgwSymGetLineFromAddr64@20 == SymGetLineFromAddr64 + SymGetLineFromAddrW64@20 = MgwSymGetLineFromAddrW64@20 == SymGetLineFromAddrW64 + SymLoadModuleEx@36 = MgwSymLoadModuleEx@36 == SymLoadModuleEx + SymLoadModuleExW@36 = MgwSymLoadModuleExW@36 == SymLoadModuleExW + UnDecorateSymbolName@16 = MgwUnDecorateSymbolName@16 == UnDecorateSymbolName + + EnumDirTree = dbghelp.EnumDirTree + EnumDirTreeW = dbghelp.EnumDirTreeW + EnumerateLoadedModules = dbghelp.EnumerateLoadedModules + EnumerateLoadedModules64 = dbghelp.EnumerateLoadedModules64 + EnumerateLoadedModulesW64 = dbghelp.EnumerateLoadedModulesW64 + ExtensionApiVersion = dbghelp.ExtensionApiVersion + FindDebugInfoFile = dbghelp.FindDebugInfoFile + FindDebugInfoFileEx = dbghelp.FindDebugInfoFileEx + FindExecutableImage = dbghelp.FindExecutableImage + FindExecutableImageEx = dbghelp.FindExecutableImageEx + FindExecutableImageExW = dbghelp.FindExecutableImageExW + GetTimestampForLoadedLibrary = dbghelp.GetTimestampForLoadedLibrary + ImageDirectoryEntryToData = dbghelp.ImageDirectoryEntryToData + ImageDirectoryEntryToDataEx = dbghelp.ImageDirectoryEntryToDataEx + ImageNtHeader = dbghelp.ImageNtHeader + ImageRvaToSection = dbghelp.ImageRvaToSection + ImageRvaToVa = dbghelp.ImageRvaToVa + ImagehlpApiVersion = dbghelp.ImagehlpApiVersion + ImagehlpApiVersionEx = dbghelp.ImagehlpApiVersionEx + MakeSureDirectoryPathExists = dbghelp.MakeSureDirectoryPathExists + MapDebugInformation = dbghelp.MapDebugInformation + MiniDumpReadDumpStream = dbghelp.MiniDumpReadDumpStream + MiniDumpWriteDump = dbghelp.MiniDumpWriteDump + SearchTreeForFile = dbghelp.SearchTreeForFile + SearchTreeForFileW = dbghelp.SearchTreeForFileW + StackWalk = dbghelp.StackWalk + StackWalk64 = dbghelp.StackWalk64 + SymAddSymbol = dbghelp.SymAddSymbol + SymAddSymbolW = dbghelp.SymAddSymbolW + SymEnumLines = dbghelp.SymEnumLines + SymEnumSourceFiles = dbghelp.SymEnumSourceFiles + SymEnumSymbols = dbghelp.SymEnumSymbols + SymEnumSymbolsW = dbghelp.SymEnumSymbolsW + SymEnumTypes = dbghelp.SymEnumTypes + SymEnumTypesW = dbghelp.SymEnumTypesW + SymEnumerateModules = dbghelp.SymEnumerateModules + SymEnumerateModules64 = dbghelp.SymEnumerateModules64 + SymEnumerateModulesW64 = dbghelp.SymEnumerateModulesW64 + SymEnumerateSymbols = dbghelp.SymEnumerateSymbols + SymEnumerateSymbols64 = dbghelp.SymEnumerateSymbols64 + SymFindFileInPath = dbghelp.SymFindFileInPath + SymFindFileInPathW = dbghelp.SymFindFileInPathW + SymFromName = dbghelp.SymFromName + SymFunctionTableAccess = dbghelp.SymFunctionTableAccess + SymFunctionTableAccess64 = dbghelp.SymFunctionTableAccess64 + SymGetLineFromAddr = dbghelp.SymGetLineFromAddr + SymGetLineNext = dbghelp.SymGetLineNext + SymGetLineNext64 = dbghelp.SymGetLineNext64 + SymGetLinePrev = dbghelp.SymGetLinePrev + SymGetLinePrev64 = dbghelp.SymGetLinePrev64 + SymGetModuleBase = dbghelp.SymGetModuleBase + SymGetModuleBase64 = dbghelp.SymGetModuleBase64 + SymGetModuleInfo = dbghelp.SymGetModuleInfo + SymGetModuleInfo64 = dbghelp.SymGetModuleInfo64 + SymGetModuleInfoW = dbghelp.SymGetModuleInfoW + SymGetModuleInfoW64 = dbghelp.SymGetModuleInfoW64 + SymGetOptions = dbghelp.SymGetOptions + SymGetSearchPath = dbghelp.SymGetSearchPath + SymGetSearchPathW = dbghelp.SymGetSearchPathW + SymGetSourceFileToken = dbghelp.SymGetSourceFileToken + SymGetSourceFileTokenW = dbghelp.SymGetSourceFileTokenW + SymGetSymFromAddr = dbghelp.SymGetSymFromAddr + SymGetSymFromAddr64 = dbghelp.SymGetSymFromAddr64 + SymGetSymFromName = dbghelp.SymGetSymFromName + SymGetSymFromName64 = dbghelp.SymGetSymFromName64 + SymGetSymNext = dbghelp.SymGetSymNext + SymGetSymNext64 = dbghelp.SymGetSymNext64 + SymGetSymPrev = dbghelp.SymGetSymPrev + SymGetSymPrev64 = dbghelp.SymGetSymPrev64 + SymGetTypeFromName = dbghelp.SymGetTypeFromName + SymGetTypeInfo = dbghelp.SymGetTypeInfo + SymLoadModule = dbghelp.SymLoadModule + SymLoadModule64 = dbghelp.SymLoadModule64 + SymMatchFileName = dbghelp.SymMatchFileName + SymMatchFileNameW = dbghelp.SymMatchFileNameW + SymMatchString = dbghelp.SymMatchString + SymRefreshModuleList = dbghelp.SymRefreshModuleList + SymRegisterCallback = dbghelp.SymRegisterCallback + SymRegisterCallback64 = dbghelp.SymRegisterCallback64 + SymRegisterCallbackW64 = dbghelp.SymRegisterCallbackW64 + SymRegisterFunctionEntryCallback = dbghelp.SymRegisterFunctionEntryCallback + SymRegisterFunctionEntryCallback64 = dbghelp.SymRegisterFunctionEntryCallback64 + SymSearch = dbghelp.SymSearch + SymSearchW = dbghelp.SymSearchW + SymSetContext = dbghelp.SymSetContext + SymSetParentWindow = dbghelp.SymSetParentWindow + SymSetScopeFromAddr = dbghelp.SymSetScopeFromAddr + SymSetSearchPath = dbghelp.SymSetSearchPath + SymSetSearchPathW = dbghelp.SymSetSearchPathW + SymUnDName = dbghelp.SymUnDName + SymUnDName64 = dbghelp.SymUnDName64 + SymUnloadModule = dbghelp.SymUnloadModule + SymUnloadModule64 = dbghelp.SymUnloadModule64 + UnmapDebugInformation = dbghelp.UnmapDebugInformation + WinDbgExtensionDllInit = dbghelp.WinDbgExtensionDllInit diff --git a/src/mgwhelp/mgwhelp32exp.def b/src/mgwhelp/mgwhelp32exp.def deleted file mode 100644 index 91cee47e..00000000 --- a/src/mgwhelp/mgwhelp32exp.def +++ /dev/null @@ -1,108 +0,0 @@ -EXPORTS - SymInitialize = MgwSymInitialize@12 - SymInitializeW = MgwSymInitializeW@12 - SymCleanup = MgwSymCleanup@4 - SymSetOptions = MgwSymSetOptions@4 - SymFromAddr = MgwSymFromAddr@20 - SymFromAddrW = MgwSymFromAddrW@20 - SymGetLineFromAddr64 = MgwSymGetLineFromAddr64@20 - SymGetLineFromAddrW64 = MgwSymGetLineFromAddrW64@20 - SymLoadModuleEx = MgwSymLoadModuleEx@36 - SymLoadModuleExW = MgwSymLoadModuleExW@36 - UnDecorateSymbolName = MgwUnDecorateSymbolName@16 - - EnumDirTree = EnumDirTree@24 - EnumDirTreeW = EnumDirTreeW@24 - EnumerateLoadedModules = EnumerateLoadedModules@12 - EnumerateLoadedModules64 = EnumerateLoadedModules64@12 - EnumerateLoadedModulesW64 = EnumerateLoadedModulesW64@12 - ExtensionApiVersion = ExtensionApiVersion@0 - FindDebugInfoFile = FindDebugInfoFile@12 - FindDebugInfoFileEx = FindDebugInfoFileEx@20 - FindExecutableImage = FindExecutableImage@12 - FindExecutableImageEx = FindExecutableImageEx@20 - FindExecutableImageExW = FindExecutableImageExW@20 - GetTimestampForLoadedLibrary = GetTimestampForLoadedLibrary@4 - ImageDirectoryEntryToData = ImageDirectoryEntryToData@16 - ImageDirectoryEntryToDataEx = ImageDirectoryEntryToDataEx@20 - ImageNtHeader = ImageNtHeader@4 - ImageRvaToSection = ImageRvaToSection@12 - ImageRvaToVa = ImageRvaToVa@16 - ImagehlpApiVersion = ImagehlpApiVersion@0 - ImagehlpApiVersionEx = ImagehlpApiVersionEx@4 - MakeSureDirectoryPathExists = MakeSureDirectoryPathExists@4 - MapDebugInformation = MapDebugInformation@16 - MiniDumpReadDumpStream = MiniDumpReadDumpStream@20 - MiniDumpWriteDump = MiniDumpWriteDump@28 - SearchTreeForFile = SearchTreeForFile@12 - SearchTreeForFileW = SearchTreeForFileW@12 - StackWalk = StackWalk@36 - StackWalk64 = StackWalk64@36 - SymAddSymbol = SymAddSymbol@32 - SymAddSymbolW = SymAddSymbolW@32 - SymEnumLines = SymEnumLines@28 - SymEnumSourceFiles = SymEnumSourceFiles@24 - SymEnumSymbols = SymEnumSymbols@24 - SymEnumSymbolsW = SymEnumSymbolsW@24 - SymEnumTypes = SymEnumTypes@20 - SymEnumTypesW = SymEnumTypesW@20 - SymEnumerateModules = SymEnumerateModules@12 - SymEnumerateModules64 = SymEnumerateModules64@12 - SymEnumerateModulesW64 = SymEnumerateModulesW64@12 - SymEnumerateSymbols = SymEnumerateSymbols@16 - SymEnumerateSymbols64 = SymEnumerateSymbols64@20 - SymFindFileInPath = SymFindFileInPath@40 - SymFindFileInPathW = SymFindFileInPathW@40 - SymFromName = SymFromName@12 - SymFunctionTableAccess = SymFunctionTableAccess@8 - SymFunctionTableAccess64 = SymFunctionTableAccess64@12 - SymGetLineFromAddr = SymGetLineFromAddr@16 - SymGetLineNext = SymGetLineNext@8 - SymGetLineNext64 = SymGetLineNext64@8 - SymGetLinePrev = SymGetLinePrev@8 - SymGetLinePrev64 = SymGetLinePrev64@8 - SymGetModuleBase = SymGetModuleBase@8 - SymGetModuleBase64 = SymGetModuleBase64@12 - SymGetModuleInfo = SymGetModuleInfo@12 - SymGetModuleInfo64 = SymGetModuleInfo64@16 - SymGetModuleInfoW = SymGetModuleInfoW@12 - SymGetModuleInfoW64 = SymGetModuleInfoW64@16 - SymGetOptions = SymGetOptions@0 - SymGetSearchPath = SymGetSearchPath@12 - SymGetSearchPathW = SymGetSearchPathW@12 - SymGetSourceFileToken = SymGetSourceFileToken@24 - SymGetSourceFileTokenW = SymGetSourceFileTokenW@24 - SymGetSymFromAddr = SymGetSymFromAddr@16 - SymGetSymFromAddr64 = SymGetSymFromAddr64@20 - SymGetSymFromName = SymGetSymFromName@12 - SymGetSymFromName64 = SymGetSymFromName64@12 - SymGetSymNext = SymGetSymNext@8 - SymGetSymNext64 = SymGetSymNext64@8 - SymGetSymPrev = SymGetSymPrev@8 - SymGetSymPrev64 = SymGetSymPrev64@8 - SymGetTypeFromName = SymGetTypeFromName@20 - SymGetTypeInfo = SymGetTypeInfo@24 - SymLoadModule = SymLoadModule@24 - SymLoadModule64 = SymLoadModule64@28 - SymMatchFileName = SymMatchFileName@16 - SymMatchFileNameW = SymMatchFileNameW@16 - SymMatchString = SymMatchString@12 - SymRefreshModuleList = SymRefreshModuleList@4 - SymRegisterCallback = SymRegisterCallback@12 - SymRegisterCallback64 = SymRegisterCallback64@16 - SymRegisterCallbackW64 = SymRegisterCallbackW64@16 - SymRegisterFunctionEntryCallback = SymRegisterFunctionEntryCallback@12 - SymRegisterFunctionEntryCallback64 = SymRegisterFunctionEntryCallback64@16 - SymSearch = SymSearch@44 - SymSearchW = SymSearchW@44 - SymSetContext = SymSetContext@12 - SymSetParentWindow = SymSetParentWindow@4 - SymSetScopeFromAddr = SymSetScopeFromAddr@12 - SymSetSearchPath = SymSetSearchPath@8 - SymSetSearchPathW = SymSetSearchPathW@8 - SymUnDName = SymUnDName@12 - SymUnDName64 = SymUnDName64@12 - SymUnloadModule = SymUnloadModule@8 - SymUnloadModule64 = SymUnloadModule64@12 - UnmapDebugInformation = UnmapDebugInformation@4 - WinDbgExtensionDllInit = WinDbgExtensionDllInit@12 diff --git a/src/mgwhelp/mgwhelp32imp.def b/src/mgwhelp/mgwhelp32imp.def deleted file mode 100644 index 4e3da3d3..00000000 --- a/src/mgwhelp/mgwhelp32imp.def +++ /dev/null @@ -1,109 +0,0 @@ -LIBRARY mgwhelp.dll - -EXPORTS - EnumDirTree@24 - EnumDirTreeW@24 - EnumerateLoadedModules@12 - EnumerateLoadedModules64@12 - EnumerateLoadedModulesW64@12 - ExtensionApiVersion@0 - FindDebugInfoFile@12 - FindDebugInfoFileEx@20 - FindExecutableImage@12 - FindExecutableImageEx@20 - FindExecutableImageExW@20 - GetTimestampForLoadedLibrary@4 - ImageDirectoryEntryToData@16 - ImageDirectoryEntryToDataEx@20 - ImageNtHeader@4 - ImageRvaToSection@12 - ImageRvaToVa@16 - ImagehlpApiVersion@0 - ImagehlpApiVersionEx@4 - MakeSureDirectoryPathExists@4 - MapDebugInformation@16 - MiniDumpReadDumpStream@20 - MiniDumpWriteDump@28 - SearchTreeForFile@12 - SearchTreeForFileW@12 - StackWalk@36 - StackWalk64@36 - SymAddSymbol@32 - SymAddSymbolW@32 - SymCleanup@4 - SymEnumLines@28 - SymEnumSourceFiles@24 - SymEnumSymbols@24 - SymEnumSymbolsW@24 - SymEnumTypes@20 - SymEnumTypesW@20 - SymEnumerateModules@12 - SymEnumerateModules64@12 - SymEnumerateModulesW64@12 - SymEnumerateSymbols@16 - SymEnumerateSymbols64@20 - SymFindFileInPath@40 - SymFindFileInPathW@40 - SymFromAddr@20 - SymFromAddrW@20 - SymFromName@12 - SymFunctionTableAccess@8 - SymFunctionTableAccess64@12 - SymGetLineFromAddr@16 - SymGetLineFromAddr64@20 - SymGetLineFromAddrW64@20 - SymGetLineNext@8 - SymGetLineNext64@8 - SymGetLinePrev@8 - SymGetLinePrev64@8 - SymGetModuleBase@8 - SymGetModuleBase64@12 - SymGetModuleInfo@12 - SymGetModuleInfo64@16 - SymGetModuleInfoW@12 - SymGetModuleInfoW64@16 - SymGetOptions@0 - SymGetSearchPath@12 - SymGetSearchPathW@12 - SymGetSourceFileToken@24 - SymGetSourceFileTokenW@24 - SymGetSymFromAddr@16 - SymGetSymFromAddr64@20 - SymGetSymFromName@12 - SymGetSymFromName64@12 - SymGetSymNext@8 - SymGetSymNext64@8 - SymGetSymPrev@8 - SymGetSymPrev64@8 - SymGetTypeFromName@20 - SymGetTypeInfo@24 - SymInitialize@12 - SymInitializeW@12 - SymLoadModule@24 - SymLoadModule64@28 - SymLoadModuleEx@36 - SymLoadModuleExW@36 - SymMatchFileName@16 - SymMatchFileNameW@16 - SymMatchString@12 - SymRefreshModuleList@4 - SymRegisterCallback@12 - SymRegisterCallback64@16 - SymRegisterCallbackW64@16 - SymRegisterFunctionEntryCallback@12 - SymRegisterFunctionEntryCallback64@16 - SymSearch@44 - SymSearchW@44 - SymSetContext@12 - SymSetOptions@4 - SymSetParentWindow@4 - SymSetScopeFromAddr@12 - SymSetSearchPath@8 - SymSetSearchPathW@8 - SymUnDName@12 - SymUnDName64@12 - SymUnloadModule@8 - SymUnloadModule64@12 - UnDecorateSymbolName@16 - UnmapDebugInformation@4 - WinDbgExtensionDllInit@12 diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index cf6a54a6..b87ae943 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -8,9 +8,8 @@ force_debug () add_executable (test_mgwhelp test_mgwhelp.cpp ) -add_dependencies (test_mgwhelp mgwhelp_implib) target_link_libraries (test_mgwhelp - mgwhelp_implib + mgwhelp shlwapi ) add_dependencies (check test_mgwhelp) @@ -203,8 +202,7 @@ include_directories ( add_executable (test_exchndl_static_unicode test_exchndl_static_unicode.cpp ) -add_dependencies (test_exchndl_static_unicode exchndl_implib) -target_link_libraries (test_exchndl_static_unicode exchndl_implib shlwapi) +target_link_libraries (test_exchndl_static_unicode exchndl shlwapi) add_dependencies (check test_exchndl_static_unicode) add_test ( NAME test_exchndl_static_unicode @@ -223,8 +221,7 @@ include_directories ( add_executable (test_exchndl_static_ansi test_exchndl_static_ansi.cpp ) -add_dependencies (test_exchndl_static_ansi exchndl_implib) -target_link_libraries (test_exchndl_static_ansi exchndl_implib shlwapi) +target_link_libraries (test_exchndl_static_ansi exchndl shlwapi) add_dependencies (check test_exchndl_static_ansi) add_test ( NAME test_exchndl_static_ansi @@ -244,7 +241,6 @@ add_executable (test_exchndl_dynamic_unicode test_exchndl_dynamic_unicode.cpp ) target_link_libraries (test_exchndl_dynamic_unicode shlwapi) -add_dependencies (test_exchndl_dynamic_unicode exchndl) add_dependencies (check test_exchndl_dynamic_unicode) add_test ( NAME test_exchndl_dynamic_unicode @@ -264,7 +260,6 @@ add_executable (test_exchndl_dynamic_ansi test_exchndl_dynamic_ansi.cpp ) target_link_libraries (test_exchndl_dynamic_ansi shlwapi) -add_dependencies (test_exchndl_dynamic_ansi exchndl) add_dependencies (check test_exchndl_dynamic_ansi) add_test ( NAME test_exchndl_dynamic_ansi