diff options
| author | Egor Yusov <egor.yusov@gmail.com> | 2019-05-04 23:17:38 +0000 |
|---|---|---|
| committer | Egor Yusov <egor.yusov@gmail.com> | 2019-05-04 23:17:38 +0000 |
| commit | 22ece45af4c4f348ef1956145f4277dd4fdab468 (patch) | |
| tree | 3feaa8354df703ebe33635e10a5f20ceb7cc5d07 /Utilities/File2Include | |
| parent | Added WindowsFileSystem::OpenFileDialog() function (diff) | |
| download | DiligentCore-22ece45af4c4f348ef1956145f4277dd4fdab468.tar.gz DiligentCore-22ece45af4c4f348ef1956145f4277dd4fdab468.zip | |
Updated File2String utility to handle \r\n windows line endings
Diffstat (limited to 'Utilities/File2Include')
| -rw-r--r-- | Utilities/File2Include/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Utilities/File2Include/File2String.cpp | 2 | ||||
| -rwxr-xr-x | Utilities/File2Include/bin/MacOS/File2String | bin | 13068 -> 13068 bytes |
3 files changed, 2 insertions, 2 deletions
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 Binary files differindex cef6d8de..93e4e168 100755 --- a/Utilities/File2Include/bin/MacOS/File2String +++ b/Utilities/File2Include/bin/MacOS/File2String |