From 48fe08654d7ee94baad7ae3768a095749cc81b29 Mon Sep 17 00:00:00 2001 From: Mark Jansen Date: Sat, 7 Oct 2017 23:43:57 +0200 Subject: [PATCH] [URLMON] Convert urlmon.inf to utf8 since git insists on fucking up utf16 files. --- dll/win32/urlmon/CMakeLists.txt | 10 ++++++++++ dll/win32/urlmon/urlmon.inf | Bin 55000 -> 27317 bytes dll/win32/urlmon/urlmon.rc | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dll/win32/urlmon/CMakeLists.txt b/dll/win32/urlmon/CMakeLists.txt index ab1765033a4..6194ab74315 100644 --- a/dll/win32/urlmon/CMakeLists.txt +++ b/dll/win32/urlmon/CMakeLists.txt @@ -11,6 +11,16 @@ include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) spec2def(urlmon.dll urlmon.spec ADD_IMPORTLIB) add_rpcproxy_files(urlmon_urlmon.idl) +set(_source_file ${CMAKE_CURRENT_SOURCE_DIR}/urlmon.inf) +set(_converted_file ${CMAKE_CURRENT_BINARY_DIR}/urlmon_utf16.inf) +add_custom_command( + OUTPUT "${_converted_file}" + COMMAND native-utf16le "${_source_file}" "${_converted_file}" + DEPENDS native-utf16le "${_source_file}") + +set_source_files_properties(${_converted_file} PROPERTIES GENERATED TRUE) +set_source_files_properties(urlmon.rc PROPERTIES OBJECT_DEPENDS "${_converted_file}") + list(APPEND SOURCE axinstall.c bindctx.c diff --git a/dll/win32/urlmon/urlmon.inf b/dll/win32/urlmon/urlmon.inf index 91d3af2e3c05a8b50920c1abbfd73e277cb8f086..d92f7ed1078a73ef0eec796aeeb68fb983f5e56e 100644 GIT binary patch literal 27317 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 literal 55000 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 bb0