From 22ece45af4c4f348ef1956145f4277dd4fdab468 Mon Sep 17 00:00:00 2001 From: Egor Yusov Date: Sat, 4 May 2019 16:17:38 -0700 Subject: Updated File2String utility to handle \r\n windows line endings --- Utilities/File2Include/CMakeLists.txt | 2 +- Utilities/File2Include/File2String.cpp | 2 +- Utilities/File2Include/bin/MacOS/File2String | Bin 13068 -> 13068 bytes 3 files changed, 2 insertions(+), 2 deletions(-) (limited to 'Utilities/File2Include') diff --git a/Utilities/File2Include/CMakeLists.txt b/Utilities/File2Include/CMakeLists.txt index 37fc2ad7..fac36122 100644 --- a/Utilities/File2Include/CMakeLists.txt +++ b/Utilities/File2Include/CMakeLists.txt @@ -32,7 +32,7 @@ if(PLATFORM_WIN32 OR PLATFORM_LINUX OR PLATFORM_MACOS) source_group("source" FILES ${SOURCE}) set_target_properties(File2String PROPERTIES - FOLDER Utilities + FOLDER Core/Utilities ) # When setting RUNTIME_OUTPUT_DIRECTORY_RELEASE to DST_DIR, diff --git a/Utilities/File2Include/File2String.cpp b/Utilities/File2Include/File2String.cpp index ade32715..04463a1b 100644 --- a/Utilities/File2Include/File2String.cpp +++ b/Utilities/File2Include/File2String.cpp @@ -44,7 +44,7 @@ int main(int argc, char* argv[]) break; fputc( '\"', pDstFile ); auto* CurrChar = Line; - while( *CurrChar != 0 && *CurrChar != '\n' ) + while( *CurrChar != 0 && *CurrChar != '\n' && *CurrChar != '\r' ) { if( strchr( SpecialChars, *CurrChar) ) fputc( '\\', pDstFile ); diff --git a/Utilities/File2Include/bin/MacOS/File2String b/Utilities/File2Include/bin/MacOS/File2String index cef6d8de..93e4e168 100755 Binary files a/Utilities/File2Include/bin/MacOS/File2String and b/Utilities/File2Include/bin/MacOS/File2String differ -- cgit v1.2.3