diff options
| author | Denton Woods <denton.woods@gmail.com> | 2016-12-31 11:16:20 -0600 |
|---|---|---|
| committer | Denton Woods <denton.woods@gmail.com> | 2016-12-31 11:16:20 -0600 |
| commit | 8523d349ccbfcfdcbc7b4c23c6474eb316d563b4 (patch) | |
| tree | 2303b9a0385257236d6e9084ad4e232320dadfd3 | |
| parent | ed8d3de8ea7bc95a12e868a8c2e58c1c60b02874 (diff) | |
| download | devil-8523d349ccbfcfdcbc7b4c23c6474eb316d563b4.tar.gz | |
Unicode fix for Windows TIFF
| -rw-r--r-- | DevIL/src-IL/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | DevIL/src-IL/src/il_tiff.cpp | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/DevIL/src-IL/CMakeLists.txt b/DevIL/src-IL/CMakeLists.txt index 4db0a89b..24b57a74 100644 --- a/DevIL/src-IL/CMakeLists.txt +++ b/DevIL/src-IL/CMakeLists.txt @@ -40,7 +40,7 @@ if(WIN32) else(UNICODE) set(DevIL_RSRC ${DevIL_RSRC} "msvc/resources/IL Logo.ico" "msvc/IL.rc") endif(UNICODE) - set(DevIL_TXT ${DevIL_TXT} ../AUTHORS ../ChangeLog ../CREDITS ../libraries.txt ../README ../README.cmake ../TODO) + set(DevIL_TXT ${DevIL_TXT} ../AUTHORS ../ChangeLog ../CREDITS ../libraries.txt ../README.md ../README.cmake ../TODO) # SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /NODEFAULTLIB:msvcrt.lib ") set(CMAKE_C_FLAGS_RELEASE "/MT /O2") else(BUILD_SHARED_LIBS) @@ -78,10 +78,6 @@ find_package(LCMS) # TODO: check for libmng, others? - -# TODO: utx doesn't currently compile (as C, anyway) -#set(IL_NO_UTX 1) - # TODO: WDP requires Microsoft HD Photo Device Porting Kit 1.0 set(IL_NO_WDP 1) diff --git a/DevIL/src-IL/src/il_tiff.cpp b/DevIL/src-IL/src/il_tiff.cpp index e49786a5..6b0e1b24 100644 --- a/DevIL/src-IL/src/il_tiff.cpp +++ b/DevIL/src-IL/src/il_tiff.cpp @@ -982,7 +982,11 @@ ILboolean iSaveTiffInternal(/*ILconst_string Filename*/) return IL_FALSE; } +#ifdef _UNICODE sprintf(Description, "Tiff generated by %Ls", ilGetString(IL_VERSION_NUM)); +#else// _UNICODE + sprintf(Description, "Tiff generated by %s", ilGetString(IL_VERSION_NUM)); +#endif// _UNICODE TIFFSetField(File, TIFFTAG_IMAGEWIDTH, TempImage->Width); TIFFSetField(File, TIFFTAG_IMAGELENGTH, TempImage->Height); |