Fix compilation problem in Windows and update MSVC project files

diff --git a/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj b/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj
index c95aed5fe49538679ab8ce09bcf05da00269ec5f..2151f581d19ea855b5d499eed311580c3eafa834 100644 (file)
--- a/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj
+++ b/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj
@@ -500,6 +500,9 @@
                        <File
                                RelativePath="..\..\..\source\blender\blenkernel\intern\shrinkwrap.c">
                        </File>
+                       <File
+                               RelativePath="..\..\..\source\blender\blenkernel\intern\simple_deform.c">
+                       </File>
                        <File
                                RelativePath="..\..\..\source\blender\blenkernel\intern\softbody.c">
                        </File>
@@ -723,6 +726,9 @@
                        <File
                                RelativePath="..\..\..\source\blender\blenkernel\BKE_shrinkwrap.h">
                        </File>
+                       <File
+                               RelativePath="..\..\..\source\blender\blenkernel\BKE_simple_deform.h">
+                       </File>
                        <File
                                RelativePath="..\..\..\source\blender\blenkernel\BKE_softbody.h">
                        </File>

diff --git a/source/blender/src/header_text.c b/source/blender/src/header_text.c
index b9d694600e28276cd2be0d5167e3213ede9940e8..f3778c9845007f1659e436ced3c23add3b949ce2 100644 (file)
--- a/source/blender/src/header_text.c
+++ b/source/blender/src/header_text.c
@@ -83,6 +83,10 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
+// INT is defined in BIF_interface.h as constant but is also a typedef in Windows
+// This annoying problem should be fixed by using a less conflicting name in Blender.
+#undef INT
+
 #ifndef _WIN32
 #include <unistd.h>
 #else
@@ -1049,9 +1053,10 @@ void text_buttons(void)
        
        /* Warning button if text is out of date*/
        if (text && txt_file_modified(text)) {
+               uiBut *bt;
                xco+= XIC;
                uiBlockSetCol(block, TH_REDALERT);
-               uiBut *bt= uiDefIconBut(block, BUT, B_NOP, ICON_HELP,   xco+=XIC,0,XIC,YIC, 0, 0, 0, 0, 0, "External text is out of sync, click for options to resolve the conflict");
+               bt= uiDefIconBut(block, BUT, B_NOP, ICON_HELP,  xco+=XIC,0,XIC,YIC, 0, 0, 0, 0, 0, "External text is out of sync, click for options to resolve the conflict");
                uiButSetFunc(bt, do_modification_func, (void *)st, NULL);
                uiBlockSetCol(block, TH_AUTO);
        }