diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-01-15 01:38:00 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-01-15 01:40:56 +0400 |
| commit | a9f761708c79991731445b3f315deac8fa79e4db (patch) | |
| tree | 37a2ee60fbeb0686f3105916cc656de2ca2b0ebd /source/blender/datatoc | |
| parent | 5d88f7c7db7f52d6e403d515deb602920c29d261 (diff) | |
Fix for icon generation with MSVC
Big thanks to Gaia for getting this working!
Diffstat (limited to 'source/blender/datatoc')
| -rw-r--r-- | source/blender/datatoc/CMakeLists.txt | 15 | ||||
| -rw-r--r-- | source/blender/datatoc/datatoc_icon.c | 6 |
2 files changed, 21 insertions, 0 deletions
diff --git a/source/blender/datatoc/CMakeLists.txt b/source/blender/datatoc/CMakeLists.txt index a1776c312f4..53fe8c32e9c 100644 --- a/source/blender/datatoc/CMakeLists.txt +++ b/source/blender/datatoc/CMakeLists.txt @@ -38,6 +38,21 @@ if(NOT WITH_HEADLESS) datatoc_icon.c ) + if(WIN32) + include_directories( + ../blenlib + ../../../intern/utfconv + ) + + # for winstuff_dir.c + add_definitions(-DUSE_STANDALONE) + + list(APPEND SRC + ../blenlib/intern/winstuff_dir.c + ../../../intern/utfconv/utfconv.c + ) + endif() + include_directories(${PNG_INCLUDE_DIR}) link_directories(${PNG_LIBPATH} ${ZLIB_LIBPATH}) diff --git a/source/blender/datatoc/datatoc_icon.c b/source/blender/datatoc/datatoc_icon.c index 1569e554f9f..e4b00388dba 100644 --- a/source/blender/datatoc/datatoc_icon.c +++ b/source/blender/datatoc/datatoc_icon.c @@ -38,6 +38,12 @@ #include "png.h" + +/* for Win32 DIR functions */ +#ifdef WIN32 +# include "../blenlib/BLI_winstuff.h" +#endif + #ifdef WIN32 # define SEP '\\' #else |