fix compilation for mingw-w64
authorAntony Riakiotakis <kalast@gmail.com>
Mon, 13 Jan 2014 13:46:46 +0000 (15:46 +0200)
committerAntony Riakiotakis <kalast@gmail.com>
Mon, 13 Jan 2014 13:46:46 +0000 (15:46 +0200)
source/blender/datatoc/CMakeLists.txt
source/blender/datatoc/datatoc_icon.c

index 78ae00d8a8325ea2c3c6069f9b8cf6033c2e9327..a1776c312f4e962a9f5204f7fb6c6e76c548806c 100644 (file)
@@ -39,9 +39,9 @@ if(NOT WITH_HEADLESS)
        )
 
        include_directories(${PNG_INCLUDE_DIR})
+       link_directories(${PNG_LIBPATH} ${ZLIB_LIBPATH})
 
        add_executable(datatoc_icon ${SRC})
 
-       link_directories(${PNG_LIBPATH} ${ZLIB_LIBPATH})
-       target_link_libraries(datatoc_icon ${PNG_LIBRARIES})
+       target_link_libraries(datatoc_icon ${PNG_LIBRARIES} ${ZLIB_LIBRARIES})
 endif()
index 82eeb3af9b2fbba062cee04504e3239767764653..1569e554f9f294d7b8795d1dbd4704f615e4fe26 100644 (file)
@@ -32,7 +32,7 @@
 #include "../blenlib/BLI_sys_types.h"
 
 /* for DIR */
-#ifndef WIN32
+#if !defined(WIN32) || defined(__MINGW64__)
 #  include <dirent.h>
 #endif