Use the new shared def file for arm64 as well. Signed-off-by: Martin Storsjö <[email protected]> --- mingw-w64-crt/{lib64 => lib-common}/shlwapi.def | 15 +- mingw-w64-crt/libarm32/shlwapi.def | 935 ------------------------ mingw-w64-crt/libarm64/Makefile.am | 1 + 3 files changed, 13 insertions(+), 938 deletions(-) rename mingw-w64-crt/{lib64 => lib-common}/shlwapi.def (96%) delete mode 100644 mingw-w64-crt/libarm32/shlwapi.def
diff --git a/mingw-w64-crt/lib64/shlwapi.def b/mingw-w64-crt/lib-common/shlwapi.def similarity index 96% rename from mingw-w64-crt/lib64/shlwapi.def rename to mingw-w64-crt/lib-common/shlwapi.def index 7f5e88e..f8ef132 100644 --- a/mingw-w64-crt/lib64/shlwapi.def +++ b/mingw-w64-crt/lib-common/shlwapi.def @@ -1,7 +1,7 @@ ; ; Definition file of SHLWAPI.dll ; Automatic generated by gendef -; written by Kai Tietz 2008 +; written by Kai Tietz 2008-2014 ; LIBRARY "SHLWAPI.dll" EXPORTS @@ -24,6 +24,8 @@ StrCmpCA StrCmpCW StrCmpICA StrCmpICW +IUnknown_QueryStatus +IUnknown_Exec ConnectToConnectionPoint IUnknown_AtomicRelease IUnknown_GetWindow @@ -40,11 +42,16 @@ IStream_Reset IStream_Size SHAnsiToUnicode SHUnicodeToAnsi +SHUnicodeToAnsiCP QISearch SHStripMneumonicW +SHPinDllOfCLSID IUnknown_GetSite +GUIDFromStringW WhichPlatform +SHCreateWorkerWindowW SHRegGetIntW +SHPackDispParamsV SHAnsiToAnsi SHUnicodeToUnicode SHFormatDateTimeA @@ -56,6 +63,7 @@ MLFreeLibrary SHSendMessageBroadcastA SHSendMessageBroadcastW IsOS +PathFileExistsAndAttributesW UrlFixupW SHRunIndirectRegClientCommand SHLoadIndirectString @@ -83,15 +91,16 @@ ColorHLSToRGB IStream_ReadStr IStream_WriteStr ColorRGBToHLS -DllGetVersion GetMenuPosFromID HashData -IntlStrEqWorkerA SHCreateThreadWithHandle +IntlStrEqWorkerA IntlStrEqWorkerW IsCharSpaceA PathAddBackslashA PathAddBackslashW +SHRegGetValueFromHKCUHKLM +SHRegGetBoolValueFromHKCUHKLM PathAddExtensionA PathAddExtensionW PathAppendA diff --git a/mingw-w64-crt/libarm32/shlwapi.def b/mingw-w64-crt/libarm32/shlwapi.def deleted file mode 100644 index a2616f2..0000000 diff --git a/mingw-w64-crt/libarm64/Makefile.am b/mingw-w64-crt/libarm64/Makefile.am index 51d2ba1..735192c 100644 --- a/mingw-w64-crt/libarm64/Makefile.am +++ b/mingw-w64-crt/libarm64/Makefile.am @@ -228,6 +228,7 @@ libarm64_DATA += %reldir%/libserwvdrv.a #libarm64_DATA += %reldir%/libshell32.a # Handled by custom rule libarm64_DATA += %reldir%/libshfolder.a libarm64_DATA += %reldir%/libshimgvw.a +libarm64_DATA += %reldir%/libshlwapi.a libarm64_DATA += %reldir%/libshsvcs.a libarm64_DATA += %reldir%/libsisbkup.a libarm64_DATA += %reldir%/libslcext.a -- 2.7.4 ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot _______________________________________________ Mingw-w64-public mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
