[Bf-blender-cvs] [53d2788] temp-path_util-refactor: MSVC now builds
Campbell Barton
noreply at git.blender.org
Sun Nov 23 15:19:38 CET 2014
Commit: 53d2788625ed3568bdbddd486df2e5bf95a75612
Author: Campbell Barton
Date: Sun Nov 23 15:19:23 2014 +0100
Branches: temp-path_util-refactor
https://developer.blender.org/rB53d2788625ed3568bdbddd486df2e5bf95a75612
MSVC now builds
===================================================================
M source/blender/blenkernel/CMakeLists.txt
M source/blender/blenkernel/intern/appdir.c
M source/blender/blenkernel/intern/smoke.c
===================================================================
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index 01228fe..fb717b1 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -279,6 +279,12 @@ set(SRC
add_definitions(${GL_DEFINITIONS})
+if(WIN32)
+ list(APPEND INC
+ ../../../intern/utfconv
+ )
+endif()
+
if(WITH_AUDASPACE)
list(APPEND INC
../../../intern/audaspace/intern
diff --git a/source/blender/blenkernel/intern/appdir.c b/source/blender/blenkernel/intern/appdir.c
index 317f236..66dc4c1 100644
--- a/source/blender/blenkernel/intern/appdir.c
+++ b/source/blender/blenkernel/intern/appdir.c
@@ -39,6 +39,16 @@
#include "MEM_guardedalloc.h"
#ifdef WIN32
+# include "utf_winfunc.h"
+# include "utfconv.h"
+# include <io.h>
+# ifdef _WIN32_IE
+# undef _WIN32_IE
+# endif
+# define _WIN32_IE 0x0501
+# include <windows.h>
+# include <shlobj.h>
+# include "BLI_winstuff.h"
#else /* non windows */
# ifdef WITH_BINRELOC
# include "binreloc.h"
diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c
index 1a13fcf..37d0bd1 100644
--- a/source/blender/blenkernel/intern/smoke.c
+++ b/source/blender/blenkernel/intern/smoke.c
@@ -60,6 +60,7 @@
#include "DNA_scene_types.h"
#include "DNA_smoke_types.h"
+#include "BKE_appdir.h"
#include "BKE_animsys.h"
#include "BKE_armature.h"
#include "BKE_bvhutils.h"
More information about the Bf-blender-cvs
mailing list