Commit: 02386bd1e3b09dfa5716355af04c0f846291e641
Author: Antony Riakiotakis
Date: Mon Jan 13 15:46:46 2014 +0200
https://developer.blender.org/rB02386bd1e3b09dfa5716355af04c0f846291e641
fix compilation for mingw-w64
===================================================================
M source/blender/datatoc/CMakeLists.txt
M source/blender/datatoc/datatoc_icon.c
===================================================================
diff --git a/source/blender/datatoc/CMakeLists.txt
b/source/blender/datatoc/CMakeLists.txt
index 78ae00d..a1776c3 100644
--- a/source/blender/datatoc/CMakeLists.txt
+++ b/source/blender/datatoc/CMakeLists.txt
@@ -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()
diff --git a/source/blender/datatoc/datatoc_icon.c
b/source/blender/datatoc/datatoc_icon.c
index 82eeb3a..1569e55 100644
--- a/source/blender/datatoc/datatoc_icon.c
+++ b/source/blender/datatoc/datatoc_icon.c
@@ -32,7 +32,7 @@
#include "../blenlib/BLI_sys_types.h"
/* for DIR */
-#ifndef WIN32
+#if !defined(WIN32) || defined(__MINGW64__)
# include <dirent.h>
#endif
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
