[Bf-blender-cvs] [517278da219] temp-remove-mingw: MinGW: Fix Missing include
Commit: 517278da219f2e994fdc7c05b6de6021ed4b8483 Author: Aaron Carlisle Date: Sun Apr 23 22:04:57 2017 -0400 Branches: temp-remove-mingw https://developer.blender.org/rB517278da219f2e994fdc7c05b6de6021ed4b8483 MinGW: Fix Missing include === M source/blender/imbuf/intern/IMB_anim.h === diff --git a/source/blender/imbuf/intern/IMB_anim.h b/source/blender/imbuf/intern/IMB_anim.h index 8ec393bcbf0..a565cd068a3 100644 --- a/source/blender/imbuf/intern/IMB_anim.h +++ b/source/blender/imbuf/intern/IMB_anim.h @@ -40,6 +40,7 @@ # include # include # include +# include # undef AVIIF_KEYFRAME // redefined in AVI_avi.h # undef AVIIF_LIST // redefined in AVI_avi.h ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [73ab29a3bb1] temp-remove-mingw: MinGW: Add back some needed code
Commit: 73ab29a3bb1fb510254e97f6d6612c35bf217006 Author: Aaron Carlisle Date: Sun Apr 23 22:00:50 2017 -0400 Branches: temp-remove-mingw https://developer.blender.org/rB73ab29a3bb1fb510254e97f6d6612c35bf217006 MinGW: Add back some needed code === M intern/cycles/util/util_optimization.h === diff --git a/intern/cycles/util/util_optimization.h b/intern/cycles/util/util_optimization.h index 32624c3764f..d441198cb2b 100644 --- a/intern/cycles/util/util_optimization.h +++ b/intern/cycles/util/util_optimization.h @@ -98,5 +98,15 @@ * * We assume __KERNEL_SSEX__ flags to have been defined at this point */ +/* SSE intrinsics headers */ + +#ifdef _MSC_VER +# include +#elif (defined(__x86_64__) || defined(__i386__)) +# include +#endif + +#endif + #endif /* __UTIL_OPTIMIZATION_H__ */ ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [c8ea87c8be3] temp-remove-mingw: Fix compiling warning
Commit: c8ea87c8be3460f3eadb3321cf3b35746fc6987e
Author: Aaron Carlisle
Date: Sun Apr 23 21:54:08 2017 -0400
Branches: temp-remove-mingw
https://developer.blender.org/rBc8ea87c8be3460f3eadb3321cf3b35746fc6987e
Fix compiling warning
Turns out the code is used
===
M source/blender/blenlib/BLI_winstuff.h
===
diff --git a/source/blender/blenlib/BLI_winstuff.h
b/source/blender/blenlib/BLI_winstuff.h
index 5755101c9a8..0753061f1d9 100644
--- a/source/blender/blenlib/BLI_winstuff.h
+++ b/source/blender/blenlib/BLI_winstuff.h
@@ -93,8 +93,6 @@ extern "C" {
# define F_OK0
#endif
-#if 0 /*Is this used (blendify)*/
-/* mingw using _SSIZE_T_ to declare ssize_t type */
#ifndef _SSIZE_T_
# define _SSIZE_T_
/* python uses HAVE_SSIZE_T */
@@ -102,7 +100,6 @@ extern "C" {
#define HAVE_SSIZE_T 1
# endif
#endif
-#endif /*if 0*/
struct dirent {
int d_ino;
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [9a47ed49021] temp-remove-mingw: MinGW: Fix double ')'
Commit: 9a47ed49021705a3cddc09871fb0ca53adee1e1f Author: Aaron Carlisle Date: Sun Apr 23 21:04:56 2017 -0400 Branches: temp-remove-mingw https://developer.blender.org/rB9a47ed49021705a3cddc09871fb0ca53adee1e1f MinGW: Fix double ')' === M source/gameengine/Expressions/intern/InputParser.cpp === diff --git a/source/gameengine/Expressions/intern/InputParser.cpp b/source/gameengine/Expressions/intern/InputParser.cpp index 18b70a5ca1a..583d8da63cb 100644 --- a/source/gameengine/Expressions/intern/InputParser.cpp +++ b/source/gameengine/Expressions/intern/InputParser.cpp @@ -37,7 +37,7 @@ // cool things like (IF(LOD==1,CCurvedValue,IF(LOD==2,CCurvedValue2)) etc... #include "EXP_IfExpr.h" -#if defined(WIN32) || defined(WIN64)) +#if defined(WIN32) || defined(WIN64) #define strcasecmp _stricmp #ifndef strtoll ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [ab9bc649d93] temp-remove-mingw: MinGW: Fix missing ')'
Commit: ab9bc649d933f9455487ac3beedbb928b80004b3
Author: Aaron Carlisle
Date: Sun Apr 23 20:14:37 2017 -0400
Branches: temp-remove-mingw
https://developer.blender.org/rBab9bc649d933f9455487ac3beedbb928b80004b3
MinGW: Fix missing ')'
===
M source/creator/CMakeLists.txt
===
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 8fa5c21b545..d4aaf3d1dda 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -771,6 +771,7 @@ elseif(WIN32)
${LIBDIR}/ffmpeg/lib/swscale-4.dll
${LIBDIR}/ffmpeg/lib/swresample-2.dll
DESTINATION "."
+ )
endif()
if(WITH_CODEC_SNDFILE)
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [1deb93e1761] temp-remove-mingw: Fix missing include
Commit: 1deb93e17617f01db3c4e41ec454e3e061998351 Author: Aaron Carlisle Date: Sun Apr 23 20:15:45 2017 -0400 Branches: temp-remove-mingw https://developer.blender.org/rB1deb93e17617f01db3c4e41ec454e3e061998351 Fix missing include === M source/blender/blenlib/BLI_sys_types.h === diff --git a/source/blender/blenlib/BLI_sys_types.h b/source/blender/blenlib/BLI_sys_types.h index 2ffca5dd578..9477f61713c 100644 --- a/source/blender/blenlib/BLI_sys_types.h +++ b/source/blender/blenlib/BLI_sys_types.h @@ -65,6 +65,12 @@ typedef uint64_t u_int64_t; #include +/* MSVC >= 2010 */ +#elif defined(_MSC_VER) +#include + +#else + /* FreeBSD, Solaris */ #include #include ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [1f13fb4e7de] temp-remove-mingw: MinGW: Remove the use of free windows in /source
Commit: 1f13fb4e7de6c8a5306e6c5ef99adce4cb144dfb
Author: Aaron Carlisle
Date: Sun Apr 23 18:29:46 2017 -0400
Branches: temp-remove-mingw
https://developer.blender.org/rB1f13fb4e7de6c8a5306e6c5ef99adce4cb144dfb
MinGW: Remove the use of free windows in /source
===
M source/blender/blenkernel/BKE_global.h
M source/blender/blenkernel/intern/writeframeserver.c
M source/blender/blenlib/BLI_alloca.h
M source/blender/blenlib/BLI_compiler_compat.h
M source/blender/blenlib/BLI_fileops.h
M source/blender/blenlib/BLI_fileops_types.h
M source/blender/blenlib/BLI_sys_types.h
M source/blender/blenlib/BLI_winstuff.h
M source/blender/blenlib/intern/fileops.c
M source/blender/blenlib/intern/path_util.c
M source/blender/collada/MeshImporter.cpp
M source/blender/collada/SkinInfo.cpp
M source/blender/imbuf/intern/IMB_anim.h
M source/blender/imbuf/intern/anim_movie.c
M source/blender/imbuf/intern/dds/dds_api.cpp
M source/blender/imbuf/intern/oiio/openimageio_api.cpp
M source/blender/imbuf/intern/openexr/openexr_api.cpp
M source/blender/makesrna/intern/rna_object.c
M source/blender/python/intern/bpy_app_handlers.c
M source/blender/python/intern/bpy_rna.c
M source/gameengine/Expressions/intern/HashedPtr.cpp
M source/gameengine/Expressions/intern/InputParser.cpp
M source/gameengine/Ketsji/KX_IPO_SGController.cpp
M source/gameengine/Ketsji/KX_KetsjiEngine.cpp
M source/gameengine/VideoTexture/ImageBase.cpp
===
diff --git a/source/blender/blenkernel/BKE_global.h
b/source/blender/blenkernel/BKE_global.h
index 4bb2b950901..830518906ab 100644
--- a/source/blender/blenkernel/BKE_global.h
+++ b/source/blender/blenkernel/BKE_global.h
@@ -189,11 +189,6 @@ enum {
# error Either __BIG_ENDIAN__ or __LITTLE_ENDIAN__ must be defined.
#endif
-/* there is really no good place for this */
-#if defined(FREE_WINDOWS) && ((__GNUC__ < 4) || ((__GNUC__ == 4) &&
(__GNUC_MINOR__ < 6)))
-# error "Mingw requires GCC 4.6 minimum"
-#endif
-
#define L_ENDIAN1
#define B_ENDIAN0
diff --git a/source/blender/blenkernel/intern/writeframeserver.c
b/source/blender/blenkernel/intern/writeframeserver.c
index 212af76a7e8..4757186f546 100644
--- a/source/blender/blenkernel/intern/writeframeserver.c
+++ b/source/blender/blenkernel/intern/writeframeserver.c
@@ -268,11 +268,7 @@ int BKE_frameserver_loop(void *context_v, RenderData *rd,
ReportList *UNUSED(rep
struct timeval tv;
struct sockaddr_in addr;
int len, rval;
-#ifdef FREE_WINDOWS
- int socklen;
-#else
unsigned int socklen;
-#endif
char buf[4096];
FrameserverContext *context = context_v;
diff --git a/source/blender/blenlib/BLI_alloca.h
b/source/blender/blenlib/BLI_alloca.h
index b44e6c66d2a..4fa69a24966 100644
--- a/source/blender/blenlib/BLI_alloca.h
+++ b/source/blender/blenlib/BLI_alloca.h
@@ -29,10 +29,6 @@
/* BLI_array_alloca / alloca */
-#if defined(__MINGW32__)
-# include /* mingw needs for alloca() */
-#endif
-
#if defined(__GNUC__) || defined(__clang__)
#if defined(__cplusplus) && (__cplusplus > 199711L)
#define BLI_array_alloca(arr, realsize) \
diff --git a/source/blender/blenlib/BLI_compiler_compat.h
b/source/blender/blenlib/BLI_compiler_compat.h
index 8edbc25bcbc..01fc9d70207 100644
--- a/source/blender/blenlib/BLI_compiler_compat.h
+++ b/source/blender/blenlib/BLI_compiler_compat.h
@@ -32,11 +32,6 @@
# define alloca _alloca
#endif
-/* alloca is defined here for MinGW32 */
-#ifdef __MINGW32__
-# include
-#endif
-
#if defined(__cplusplus) && ((__cplusplus >= 201103L) || defined(_MSC_VER))
# define HAS_CPP11_FEATURES
#endif
diff --git a/source/blender/blenlib/BLI_fileops.h
b/source/blender/blenlib/BLI_fileops.h
index 91d139c7085..5c1fa57886a 100644
--- a/source/blender/blenlib/BLI_fileops.h
+++ b/source/blender/blenlib/BLI_fileops.h
@@ -65,10 +65,8 @@ intBLI_create_symlink(const char *path, const char *to)
ATTR_NONNULL();
/* keep in sync with the definition of struct direntry in BLI_fileops_types.h
*/
#ifdef WIN32
-# if defined(_MSC_VER) || defined(__MINGW64__)
+# if defined(_MSC_VER)
typedef struct _stat64 BLI_stat_t;
-# elif defined(__MINGW32__)
-typedef struct _stati64 BLI_stat_t;
# else
typedef struct _stat BLI_stat_t;
# endif
diff --git a/source/blender/blenlib/BLI_fileops_types.h
b/source/blender/blenlib/BLI_fileops_types.h
index 0cf8c8ddb4a..0ffa3276f1f 100644
--- a/source/blender/blenlib/BLI_fileops_types.h
+++ b/source/blender/blenlib/BLI_fileops_types.h
@@ -35,7 +35,7 @@
#include
-#if defined(WIN32) && !defined(FREE_WINDOWS)
+#if defined(WIN32)
typedef unsigned int mode_t;
#endif
@@ -50,10 +50,8 @@ struct direntry {
const char *relname;
const char *path;
#ifdef WIN32
[Bf-blender-cvs] [65f343690f1] temp-remove-mingw: MinGW: Remove more intern stuff
Commit: 65f343690f111320a810faee2e93d0d5bbd9776c
Author: Aaron Carlisle
Date: Sun Apr 23 18:11:01 2017 -0400
Branches: temp-remove-mingw
https://developer.blender.org/rB65f343690f111320a810faee2e93d0d5bbd9776c
MinGW: Remove more intern stuff
===
M intern/cycles/util/util_aligned_malloc.cpp
M intern/cycles/util/util_optimization.h
M intern/cycles/util/util_system.cpp
M intern/cycles/util/util_types.h
M intern/elbeem/intern/mvmcoords.h
M intern/ghost/intern/GHOST_DisplayManagerWin32.cpp
M intern/guardedalloc/intern/mallocn_intern.h
M intern/libmv/libmv/base/aligned_malloc.cc
===
diff --git a/intern/cycles/util/util_aligned_malloc.cpp
b/intern/cycles/util/util_aligned_malloc.cpp
index cc7252dcc58..78669a17c72 100644
--- a/intern/cycles/util/util_aligned_malloc.cpp
+++ b/intern/cycles/util/util_aligned_malloc.cpp
@@ -23,13 +23,6 @@
#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__NetBSD__)
/* Needed for memalign on Linux and _aligned_alloc on Windows. */
-# ifdef FREE_WINDOWS
-/* Make sure _aligned_malloc is included. */
-#ifdef __MSVCRT_VERSION__
-# undef __MSVCRT_VERSION__
-#endif
-#define __MSVCRT_VERSION__ 0x0700
-# endif /* FREE_WINDOWS */
# include
#else
/* Apple's malloc is 16-byte aligned, and does not have malloc.h, so include
diff --git a/intern/cycles/util/util_optimization.h
b/intern/cycles/util/util_optimization.h
index b79c45d437b..32624c3764f 100644
--- a/intern/cycles/util/util_optimization.h
+++ b/intern/cycles/util/util_optimization.h
@@ -98,16 +98,5 @@
*
* We assume __KERNEL_SSEX__ flags to have been defined at this point */
-/* SSE intrinsics headers */
-#ifndef FREE_WINDOWS64
-
-#ifdef _MSC_VER
-# include
-#elif (defined(__x86_64__) || defined(__i386__))
-# include
-#endif
-
-#endif
-
#endif /* __UTIL_OPTIMIZATION_H__ */
diff --git a/intern/cycles/util/util_system.cpp
b/intern/cycles/util/util_system.cpp
index a942d738b8a..9c993d6ba08 100644
--- a/intern/cycles/util/util_system.cpp
+++ b/intern/cycles/util/util_system.cpp
@@ -22,9 +22,6 @@
#include "util/util_string.h"
#ifdef _WIN32
-# if(!defined(FREE_WINDOWS))
-#include
-# endif
# include "util_windows.h"
#elif defined(__APPLE__)
# include
@@ -105,7 +102,7 @@ unsigned short system_cpu_process_groups(unsigned short
max_groups,
#endif
}
-#if !defined(_WIN32) || defined(FREE_WINDOWS)
+#if !defined(_WIN32)
static void __cpuid(int data[4], int selector)
{
#ifdef __x86_64__
diff --git a/intern/cycles/util/util_types.h b/intern/cycles/util/util_types.h
index 5a8f11694a7..fe7b7f6b2b5 100644
--- a/intern/cycles/util/util_types.h
+++ b/intern/cycles/util/util_types.h
@@ -43,7 +43,7 @@
#define ccl_restrict __restrict
#define __KERNEL_WITH_SSE_ALIGN__
-#if defined(_WIN32) && !defined(FREE_WINDOWS)
+#if defined(_WIN32)
#define ccl_device_inline static __forceinline
#define ccl_device_forceinline static __forceinline
#define ccl_align(...) __declspec(align(__VA_ARGS__))
@@ -63,9 +63,6 @@
#define ccl_device_inline static inline __attribute__((always_inline))
#define ccl_device_forceinline static inline __attribute__((always_inline))
#define ccl_align(...) __attribute__((aligned(__VA_ARGS__)))
-#ifndef FREE_WINDOWS64
-#define __forceinline inline __attribute__((always_inline))
-#endif
#define ccl_try_align(...) __attribute__((aligned(__VA_ARGS__)))
#define ccl_may_alias __attribute__((__may_alias__))
#define ccl_always_inline __attribute__((always_inline))
diff --git a/intern/elbeem/intern/mvmcoords.h b/intern/elbeem/intern/mvmcoords.h
index 56d991aac6e..deeedcf9dd4 100644
--- a/intern/elbeem/intern/mvmcoords.h
+++ b/intern/elbeem/intern/mvmcoords.h
@@ -23,12 +23,10 @@
#define mvmFloat double
#ifdef WIN32
-#ifndef FREE_WINDOWS
#include "float.h"
#define isnan(n) _isnan(n)
#define finite _finite
#endif
-#endif
#ifdef sun
#include "ieeefp.h"
diff --git a/intern/ghost/intern/GHOST_DisplayManagerWin32.cpp
b/intern/ghost/intern/GHOST_DisplayManagerWin32.cpp
index 252ea775329..2dc24e12b34 100644
--- a/intern/ghost/intern/GHOST_DisplayManagerWin32.cpp
+++ b/intern/ghost/intern/GHOST_DisplayManagerWin32.cpp
@@ -41,9 +41,6 @@
// We do not support multiple monitors at the moment
#define COMPILE_MULTIMON_STUBS
-#ifndef FREE_WINDOWS
-#include
-#endif
GHOST_DisplayManagerWin32::GHOST_DisplayManagerWin32(void)
diff --git a/intern/guardedalloc/intern/mallocn_intern.h
b/intern/guardedalloc/intern/mallocn_intern.h
index 3f7e462c1c7..a292a2eb5a0 100644
--- a/intern/guardedalloc/intern/mallocn_intern.h
+++ b/intern/guardedalloc/intern/mallocn_intern.h
@@ -89,14 +89,6 @@
#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__NetBSD__)
// Needed for memalign on Linux and _aligned_alloc on Windows.
-# ifdef FREE_WINDOWS
-/* make sure _aligned_malloc is included
[Bf-blender-cvs] [73151f8dc4f] temp-remove-mingw: MinGW: remove from buildbot
Commit: 73151f8dc4f4e2f8961f19fac9d008179b06b5f1
Author: Aaron Carlisle
Date: Sun Apr 23 19:23:59 2017 -0400
Branches: temp-remove-mingw
https://developer.blender.org/rB73151f8dc4f4e2f8961f19fac9d008179b06b5f1
MinGW: remove from buildbot
MinGW: Remove from CMake configs
MingGW: Remove the rest of cmake hacks
MinGW: Remove custom patchs made to extern
MinGW: Remove from intern
MinGW: Remove more intern stuff
MinGW: Remove the use of free windows in /source
MinGW: Remove mingw in /source
Differential Revision: https://developer.blender.org/D2648
===
M source/blender/blenlib/BLI_winstuff.h
M source/blender/blenlib/intern/fileops.c
M source/blender/blenlib/intern/storage.c
M source/blender/blenlib/intern/winstuff.c
M source/blender/editors/space_file/fsmenu.c
M source/blender/imbuf/intern/openexr/openexr_api.cpp
M source/blenderplayer/CMakeLists.txt
M source/creator/CMakeLists.txt
===
diff --git a/source/blender/blenlib/BLI_winstuff.h
b/source/blender/blenlib/BLI_winstuff.h
index c4145c81721..5755101c9a8 100644
--- a/source/blender/blenlib/BLI_winstuff.h
+++ b/source/blender/blenlib/BLI_winstuff.h
@@ -37,10 +37,6 @@
# error "This include is for Windows only!"
#endif
-/* Some stuff requires WINVER 0x500, but mingw's default is 0x400 */
-# define WINVER 0x0501
-#endif
-
#define WIN32_LEAN_AND_MEAN
#ifndef WIN32_SKIP_HKEY_PROTECTION
diff --git a/source/blender/blenlib/intern/fileops.c
b/source/blender/blenlib/intern/fileops.c
index 3d953aeaad0..1df7f6f81e4 100644
--- a/source/blender/blenlib/intern/fileops.c
+++ b/source/blender/blenlib/intern/fileops.c
@@ -42,9 +42,6 @@
#include "zlib.h"
#ifdef WIN32
-# ifdef __MINGW32__
-#include
-# endif
# include
# include "BLI_winstuff.h"
# include "BLI_callbacks.h"
diff --git a/source/blender/blenlib/intern/storage.c
b/source/blender/blenlib/intern/storage.c
index 3edc00a8c1a..4b75e5a8d08 100644
--- a/source/blender/blenlib/intern/storage.c
+++ b/source/blender/blenlib/intern/storage.c
@@ -253,10 +253,8 @@ int BLI_stat(const char *path, BLI_stat_t *buffer)
int BLI_wstat(const wchar_t *path, BLI_stat_t *buffer)
{
-#if defined(_MSC_VER) || defined(__MINGW64__)
+#if defined(_MSC_VER)
return _wstat64(path, buffer);
-#elif defined(__MINGW32__)
- return _wstati64(path, buffer);
#else
return _wstat(path, buffer);
#endif
@@ -424,23 +422,13 @@ void BLI_file_free_lines(LinkNode *lines)
bool BLI_file_older(const char *file1, const char *file2)
{
#ifdef WIN32
-#ifndef __MINGW32__
- struct _stat st1, st2;
-#else
struct _stati64 st1, st2;
-#endif
UTF16_ENCODE(file1);
UTF16_ENCODE(file2);
-
-#ifndef __MINGW32__
- if (_wstat(file1_16, )) return false;
- if (_wstat(file2_16, )) return false;
-#else
+
if (_wstati64(file1_16, )) return false;
if (_wstati64(file2_16, )) return false;
-#endif
-
UTF16_UN_ENCODE(file2);
UTF16_UN_ENCODE(file1);
diff --git a/source/blender/blenlib/intern/winstuff.c
b/source/blender/blenlib/intern/winstuff.c
index 3b06b7df09a..d6834428376 100644
--- a/source/blender/blenlib/intern/winstuff.c
+++ b/source/blender/blenlib/intern/winstuff.c
@@ -160,8 +160,6 @@ void RegisterBlendExtension(void)
GetSystemDirectory(SysDir, FILE_MAXDIR);
#ifdef _WIN64
ThumbHandlerDLL = "BlendThumb64.dll";
-#elif defined(__MINGW32__)
- ThumbHandlerDLL = "BlendThumb.dll";
#else
IsWow64Process(GetCurrentProcess(), );
if (IsWOW64 == true)
diff --git a/source/blender/editors/space_file/fsmenu.c
b/source/blender/editors/space_file/fsmenu.c
index 71d49e0dc2e..5309399e47d 100644
--- a/source/blender/editors/space_file/fsmenu.c
+++ b/source/blender/editors/space_file/fsmenu.c
@@ -49,7 +49,7 @@
#ifdef WIN32
# include /* need to include windows.h so _WIN32_IE is defined */
# ifndef _WIN32_IE
-#define _WIN32_IE 0x0400 /* minimal requirements for
SHGetSpecialFolderPath on MINGW MSVC has this defined already */
+#define _WIN32_IE 0x0400 /* XXX REMOVE??? minimal requirements for
SHGetSpecialFolderPath on MINGW MSVC has this defined already */
# endif
# include /* for SHGetSpecialFolderPath, has to be done before
BLI_winstuff
* because 'near' is disabled through BLI_windstuff */
diff --git a/source/blender/imbuf/intern/openexr/openexr_api.cpp
b/source/blender/imbuf/intern/openexr/openexr_api.cpp
index 51e0462effc..f3253c50e07 100644
--- a/source/blender/imbuf/intern/openexr/openexr_api.cpp
+++ b/source/blender/imbuf/intern/openexr/openexr_api.cpp
@@ -77,7 +77,7 @@ extern "C"
{
// The following prevents a linking error in debug mode for MSVC using the
libs in CVS
-#if defined(WITH_OPENEXR) && defined(_WIN32) && defined(DEBUG) &&
!defined(__MINGW32__) && _MSC_VER < 1900
+#if
[Bf-blender-cvs] [acbe0d248de] temp-remove-mingw: MinGW: Remove custom patchs made to extern
Commit: acbe0d248de69a0b19e50c1d35fad48391a1fcca
Author: Aaron Carlisle
Date: Sun Apr 23 17:32:37 2017 -0400
Branches: temp-remove-mingw
https://developer.blender.org/rBacbe0d248de69a0b19e50c1d35fad48391a1fcca
MinGW: Remove custom patchs made to extern
===
M extern/carve/include/carve/win32.h
D extern/carve/patches/mingw.patch
D extern/carve/patches/mingw_w64.patch
M extern/carve/patches/series
M extern/carve/patches/win32.patch
===
diff --git a/extern/carve/include/carve/win32.h
b/extern/carve/include/carve/win32.h
index 81b2ea4d6fa..78a101e6f98 100755
--- a/extern/carve/include/carve/win32.h
+++ b/extern/carve/include/carve/win32.h
@@ -8,11 +8,9 @@
#include
#include
-#if !defined(__MINGW32__)
inline int strcasecmp(const char *a, const char *b) {
return _stricmp(a,b);
}
-#endif
inline void srandom(unsigned long input) {
srand(input);
@@ -34,7 +32,7 @@ typedef unsigned long uintptr_t;
# if _MSC_VER < 1600
// stdint.h is not available before VS2010
-#if defined(_WIN32) && !defined(__MINGW32__)
+#if defined(_WIN32)
/* The __intXX are built-in types of the visual complier! So we don't
need to include anything else here.
This typedefs should be in sync with types from MEM_sys_types.h */
diff --git a/extern/carve/patches/mingw.patch b/extern/carve/patches/mingw.patch
deleted file mode 100644
index c237edf18e9..000
--- a/extern/carve/patches/mingw.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -r 525472fb477a include/carve/win32.h
a/include/carve/win32.hSun Jan 15 23:07:40 2012 -0500
-+++ b/include/carve/win32.hWed Jan 18 00:40:10 2012 +0600
-@@ -8,9 +8,11 @@
- #include
- #include
-
-+#if !defined(__MINGW32__)
- inline int strcasecmp(const char *a, const char *b) {
- return _stricmp(a,b);
- }
-+#endif
-
- inline void srandom(unsigned long input) {
- srand(input);
diff --git a/extern/carve/patches/mingw_w64.patch
b/extern/carve/patches/mingw_w64.patch
deleted file mode 100644
index 26a30be84c3..000
--- a/extern/carve/patches/mingw_w64.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: bundle.sh
-===
bundle.sh (revision 45912)
-+++ bundle.sh (working copy)
-@@ -114,7 +114,7 @@
- if env['WITH_BF_BOOST']:
- if env['OURPLATFORM'] not in ('win32-vc', 'win64-vc'):
- # Boost is setting as preferred collections library in the Carve code
when using MSVC compiler
--if env['OURPLATFORM'] != 'win32-mingw':
-+if env['OURPLATFORM'] not in ('win32-mingw', 'win64-mingw'):
- defs.append('HAVE_BOOST_UNORDERED_COLLECTIONS')
-
- defs.append('CARVE_SYSTEM_BOOST')
diff --git a/extern/carve/patches/series b/extern/carve/patches/series
index b7e97d68c4c..c5c5fd766b8 100644
--- a/extern/carve/patches/series
+++ b/extern/carve/patches/series
@@ -1,7 +1,6 @@
includes.patch
win32.patch
mesh_iterator.patch
-mingw.patch
gcc46.patch
clang_is_heap_fix.patch
strict_flags.patch
diff --git a/extern/carve/patches/win32.patch b/extern/carve/patches/win32.patch
index 680bceb2421..1a5f9650532 100644
--- a/extern/carve/patches/win32.patch
+++ b/extern/carve/patches/win32.patch
@@ -8,7 +8,7 @@ diff -r e82d852e4fb0 include/carve/win32.h
-typedef char int8_t;
-typedef short int16_t;
-typedef long int32_t;
-+#if defined(_WIN32) && !defined(__MINGW32__)
++#if defined(_WIN32)
+/* The __intXX are built-in types of the visual complier! So we don't
+ need to include anything else here.
+ This typedefs should be in sync with types from MEM_sys_types.h */
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [bae9a9e9f85] temp-remove-mingw: MinGW: Remove from intern
Commit: bae9a9e9f8566bab93f4de928c6a548250313f8b
Author: Aaron Carlisle
Date: Sun Apr 23 17:49:54 2017 -0400
Branches: temp-remove-mingw
https://developer.blender.org/rBbae9a9e9f8566bab93f4de928c6a548250313f8b
MinGW: Remove from intern
===
M intern/cycles/util/util_optimization.h
M intern/cycles/util/util_path.cpp
M intern/cycles/util/util_simd.h
M intern/dualcon/intern/Projections.h
M intern/dualcon/intern/dualcon_c_api.cpp
M intern/ghost/intern/GHOST_Context.cpp
M intern/ghost/intern/GHOST_SystemPathsWin32.cpp
M intern/ghost/intern/GHOST_SystemWin32.cpp
M intern/ghost/intern/GHOST_SystemWin32.h
M intern/ghost/intern/GHOST_TaskbarWin32.h
M intern/libmv/libmv/numeric/numeric.h
M intern/opencolorio/CMakeLists.txt
===
diff --git a/intern/cycles/util/util_optimization.h
b/intern/cycles/util/util_optimization.h
index 6f70a474fe7..b79c45d437b 100644
--- a/intern/cycles/util/util_optimization.h
+++ b/intern/cycles/util/util_optimization.h
@@ -107,14 +107,6 @@
# include
#endif
-#else
-
-/* MinGW64 has conflicting declarations for these SSE headers in .
- * Since we can't avoid including , better only include that */
-#include "util/util_windows.h"
-
-#endif
-
#endif
#endif /* __UTIL_OPTIMIZATION_H__ */
diff --git a/intern/cycles/util/util_path.cpp b/intern/cycles/util/util_path.cpp
index cd3067f7650..b0d46d39b50 100644
--- a/intern/cycles/util/util_path.cpp
+++ b/intern/cycles/util/util_path.cpp
@@ -50,10 +50,8 @@ OIIO_NAMESPACE_USING
CCL_NAMESPACE_BEGIN
#ifdef _WIN32
-# if defined(_MSC_VER) || defined(__MINGW64__)
+# if defined(_MSC_VER)
typedef struct _stat64 path_stat_t;
-# elif defined(__MINGW32__)
-typedef struct _stati64 path_stat_t;
# else
typedef struct _stat path_stat_t;
# endif
@@ -568,10 +566,8 @@ static string path_make_compatible(const string& path)
static int path_wstat(const wstring& path_wc, path_stat_t *st)
{
-#if defined(_MSC_VER) || defined(__MINGW64__)
+#if defined(_MSC_VER)
return _wstat64(path_wc.c_str(), st);
-#elif defined(__MINGW32__)
- return _wstati64(path_wc.c_str(), st);
#else
return _wstat(path_wc.c_str(), st);
#endif
diff --git a/intern/cycles/util/util_simd.h b/intern/cycles/util/util_simd.h
index 557809a5719..69dbc2ed86d 100644
--- a/intern/cycles/util/util_simd.h
+++ b/intern/cycles/util/util_simd.h
@@ -71,7 +71,7 @@ __forceinline operator int ( ) const { return
std::numeric_limits<
#define _lzcnt_u64 __lzcnt64
#endif
-#if defined(_WIN32) && !defined(__MINGW32__) && !defined(__clang__)
+#if defined(_WIN32) && !defined(__clang__)
__forceinline int __popcnt(int in) {
return _mm_popcnt_u32(in);
diff --git a/intern/dualcon/intern/Projections.h
b/intern/dualcon/intern/Projections.h
index 2d1eca55997..2d245a77d15 100644
--- a/intern/dualcon/intern/Projections.h
+++ b/intern/dualcon/intern/Projections.h
@@ -29,7 +29,7 @@
#define CONTAINS_INDEX
#define GRID_DIMENSION 20
-#if defined(_WIN32) && !defined(__MINGW32__) && !(_MSC_VER >= 1900)
+#if defined(_WIN32) && !(_MSC_VER >= 1900)
#define isnan(n) _isnan(n)
#define LONG __int64
#define int64_t __int64
diff --git a/intern/dualcon/intern/dualcon_c_api.cpp
b/intern/dualcon/intern/dualcon_c_api.cpp
index e55de2ed354..92f8b0cfd1a 100644
--- a/intern/dualcon/intern/dualcon_c_api.cpp
+++ b/intern/dualcon/intern/dualcon_c_api.cpp
@@ -28,7 +28,7 @@
#include
#include
-#if defined(_WIN32) && !defined(__MINGW32__)
+#if defined(_WIN32)
#define isnan(n) _isnan(n)
#endif
diff --git a/intern/ghost/intern/GHOST_Context.cpp
b/intern/ghost/intern/GHOST_Context.cpp
index f69f2181ef7..72db17c4f56 100644
--- a/intern/ghost/intern/GHOST_Context.cpp
+++ b/intern/ghost/intern/GHOST_Context.cpp
@@ -38,7 +38,7 @@
# include
#
# ifndef ERROR_PROFILE_DOES_NOT_MATCH_DEVICE
-#define ERROR_PROFILE_DOES_NOT_MATCH_DEVICE 0x7E7 // Mingw64 headers may
have had this
+#define ERROR_PROFILE_DOES_NOT_MATCH_DEVICE 0x7E7
# endif
#endif
diff --git a/intern/ghost/intern/GHOST_SystemPathsWin32.cpp
b/intern/ghost/intern/GHOST_SystemPathsWin32.cpp
index 7d0ce5158fe..8056bc76edb 100644
--- a/intern/ghost/intern/GHOST_SystemPathsWin32.cpp
+++ b/intern/ghost/intern/GHOST_SystemPathsWin32.cpp
@@ -37,30 +37,6 @@
#include
#include "utfconv.h"
-#ifdef __MINGW32__
-
-#if !defined(SHARD_PIDL)
-#define SHARD_PIDL 0x0001L
-#endif
-
-#if !defined(SHARD_PATHA)
-#define SHARD_PATHA 0x0002L
-#endif
-
-#if !defined(SHARD_PATHW)
-#define SHARD_PATHW 0x0003L
-#endif
-
-#if !defined(SHARD_PATH)
-#ifdef UNICODE
-#define SHARD_PATH SHARD_PATHW
-#else
-#define SHARD_PATH SHARD_PATHA
-#endif
-#endif
-
-#endif
-
GHOST_SystemPathsWin32::GHOST_SystemPathsWin32()
{
}
diff --git a/intern/ghost/intern/GHOST_SystemWin32.cpp
[Bf-blender-cvs] [d2e6e60205e] temp-remove-mingw: MingGW: Remove the rest of cmake hacks
Commit: d2e6e60205e875a382c3812cba2b7109f562fb7d
Author: Aaron Carlisle
Date: Sun Apr 23 17:16:39 2017 -0400
Branches: temp-remove-mingw
https://developer.blender.org/rBd2e6e60205e875a382c3812cba2b7109f562fb7d
MingGW: Remove the rest of cmake hacks
===
M build_files/cmake/Modules/FindGflags.cmake
M build_files/cmake/macros.cmake
M build_files/cmake/platform/platform_win32.cmake
D build_files/cmake/platform/platform_win32_mingw.cmake
M build_files/cmake/platform/platform_win32_msvc.cmake
M build_files/cmake/project_info.py
===
diff --git a/build_files/cmake/Modules/FindGflags.cmake
b/build_files/cmake/Modules/FindGflags.cmake
index 0a138c02465..4766dfb0f9b 100644
--- a/build_files/cmake/Modules/FindGflags.cmake
+++ b/build_files/cmake/Modules/FindGflags.cmake
@@ -496,8 +496,7 @@ if(NOT GFLAGS_FOUND)
# detect threads, we assume that gflags requires it.
find_package(Threads QUIET)
set(GFLAGS_LINK_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
- # On Windows (including MinGW), the Shlwapi library is used by gflags if
- # available.
+ # On Windows, the Shlwapi library is used by gflags if available.
if(WIN32)
include(CheckIncludeFileCXX)
check_include_file_cxx("shlwapi.h" HAVE_SHLWAPI)
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
index f62e55941a7..6303119773d 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -1247,17 +1247,6 @@ endfunction()
# hacks to override initial project settings
# these macros must be called directly before/after project(Blender)
macro(blender_project_hack_pre)
- #
- # MINGW HACK START
- # ignore system set flag, use our own
- # must be before project(...)
- # if the user wants to add their own its ok after first run.
- if(DEFINED CMAKE_C_STANDARD_LIBRARIES)
- set(_reset_standard_libraries OFF)
- else()
- set(_reset_standard_libraries ON)
- endif()
-
# --
# GCC -O3 HACK START
# needed because O3 can cause problems but
@@ -1276,25 +1265,6 @@ endmacro()
macro(blender_project_hack_post)
- # --
- # MINGW HACK END
- if(_reset_standard_libraries)
- # Must come after projecINCt(...)
- #
- # MINGW workaround for -ladvapi32 being included which
surprisingly causes
- # string formatting of floats, eg: printf("%.*f", 3, value). to
crash blender
- # with a meaningless stack trace. by overriding this flag we
ensure we only
- # have libs we define.
- set(CMAKE_C_STANDARD_LIBRARIES "" CACHE STRING "" FORCE)
- set(CMAKE_CXX_STANDARD_LIBRARIES "" CACHE STRING "" FORCE)
- mark_as_advanced(
- CMAKE_C_STANDARD_LIBRARIES
- CMAKE_CXX_STANDARD_LIBRARIES
- )
- endif()
- unset(_reset_standard_libraries)
-
-
#
# GCC -O3 HACK END
if(_reset_standard_cflags_rel)
diff --git a/build_files/cmake/platform/platform_win32.cmake
b/build_files/cmake/platform/platform_win32.cmake
index 631973b758b..952528eb728 100644
--- a/build_files/cmake/platform/platform_win32.cmake
+++ b/build_files/cmake/platform/platform_win32.cmake
@@ -27,12 +27,8 @@ add_definitions(-DWIN32)
if(MSVC)
include(platform_win32_msvc)
-elseif(CMAKE_COMPILER_IS_GNUCC)
- include(platform_win32_mingw)
endif()
-# Things common to both mingw and MSVC should go here
-
set(WINTAB_INC ${LIBDIR}/wintab/include)
if(WITH_OPENAL)
diff --git a/build_files/cmake/platform/platform_win32_mingw.cmake
b/build_files/cmake/platform/platform_win32_mingw.cmake
deleted file mode 100644
index 216568bd069..000
--- a/build_files/cmake/platform/platform_win32_mingw.cmake
+++ /dev/null
@@ -1,302 +0,0 @@
-# * BEGIN GPL LICENSE BLOCK *
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# The Original Code is Copyright (C) 2016, Blender Foundation
-# All rights reserved.
-#
-# Contributor(s): Sergey Sharybin.
-#
-# * END GPL
[Bf-blender-cvs] [a7aeaad4851] temp-remove-mingw: MinGW: Remove from CMake configs
Commit: a7aeaad48516cc2a6b64cf516d35df528cd90d38 Author: Aaron Carlisle Date: Sun Apr 23 16:56:34 2017 -0400 Branches: temp-remove-mingw https://developer.blender.org/rBa7aeaad48516cc2a6b64cf516d35df528cd90d38 MinGW: Remove from CMake configs === M build_files/cmake/config/blender_full.cmake M build_files/cmake/config/blender_release.cmake === diff --git a/build_files/cmake/config/blender_full.cmake b/build_files/cmake/config/blender_full.cmake index bd8a2dbaf2c..1d520b34bd4 100644 --- a/build_files/cmake/config/blender_full.cmake +++ b/build_files/cmake/config/blender_full.cmake @@ -65,11 +65,6 @@ elseif(WIN32) set(WITH_JACKOFF CACHE BOOL "" FORCE) if(NOT CMAKE_COMPILER_IS_GNUCC) set(WITH_OPENSUBDIV ON CACHE BOOL "" FORCE) - else() - # MinGW exceptions - set(WITH_OPENSUBDIV OFF CACHE BOOL "" FORCE) - set(WITH_CODEC_SNDFILE OFF CACHE BOOL "" FORCE) - set(WITH_CYCLES_OSL OFF CACHE BOOL "" FORCE) endif() elseif(APPLE) set(WITH_JACKON CACHE BOOL "" FORCE) diff --git a/build_files/cmake/config/blender_release.cmake b/build_files/cmake/config/blender_release.cmake index 42e8c111714..a35b6dc124f 100644 --- a/build_files/cmake/config/blender_release.cmake +++ b/build_files/cmake/config/blender_release.cmake @@ -66,11 +66,6 @@ elseif(WIN32) set(WITH_JACKOFF CACHE BOOL "" FORCE) if(NOT CMAKE_COMPILER_IS_GNUCC) set(WITH_OPENSUBDIV ON CACHE BOOL "" FORCE) - else() - # MinGW exceptions - set(WITH_OPENSUBDIV OFF CACHE BOOL "" FORCE) - set(WITH_CODEC_SNDFILE OFF CACHE BOOL "" FORCE) - set(WITH_CYCLES_OSL OFF CACHE BOOL "" FORCE) endif() elseif(APPLE) set(WITH_JACKON CACHE BOOL "" FORCE) ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [0c69c8aaf30] temp-remove-mingw: MinGW: remove from buildbot
Commit: 0c69c8aaf306403339b1a77709e61de0fb68933a
Author: Aaron Carlisle
Date: Sun Apr 23 16:54:36 2017 -0400
Branches: temp-remove-mingw
https://developer.blender.org/rB0c69c8aaf306403339b1a77709e61de0fb68933a
MinGW: remove from buildbot
===
M build_files/buildbot/master_unpack.py
===
diff --git a/build_files/buildbot/master_unpack.py
b/build_files/buildbot/master_unpack.py
index 67b628f668a..157e244e210 100644
--- a/build_files/buildbot/master_unpack.py
+++ b/build_files/buildbot/master_unpack.py
@@ -49,7 +49,7 @@ def get_platform(filename):
tokens = filename.split("-")
platforms = ('osx', 'mac', 'bsd',
'win', 'linux', 'source',
- 'irix', 'solaris', 'mingw')
+ 'irix', 'solaris')
platform_tokens = []
found = False
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [f1ada2e719a] master: [msvc/make.bat] Add convenience option to turn off game engine+player
Commit: f1ada2e719a9ee7fb99bd69345c8913d8bc4a035 Author: lazydodo Date: Sun Apr 23 14:45:51 2017 -0600 Branches: master https://developer.blender.org/rBf1ada2e719a9ee7fb99bd69345c8913d8bc4a035 [msvc/make.bat] Add convenience option to turn off game engine+player === M make.bat === diff --git a/make.bat b/make.bat index 390e379830c..9bdab5719da 100644 --- a/make.bat +++ b/make.bat @@ -17,6 +17,7 @@ set BUILD_CMAKE_ARGS= set BUILD_ARCH= set BUILD_VS_VER= set BUILD_VS_YEAR= +set BUILD_NGE= set KEY_NAME= set MSBUILD_PLATFORM= set MUST_CLEAN= @@ -36,6 +37,9 @@ if NOT "%1" == "" ( if "%1" == "debug" ( set BUILD_TYPE=Debug REM Build Configurations + ) else if "%1" == "noge" ( + set BUILD_CMAKE_ARGS=%BUILD_CMAKE_ARGS% -DWITH_GAMEENGINE=OFF -DWITH_PLAYER=OFF + set BUILD_NGE=_noge ) else if "%1" == "builddir" ( set BUILD_DIR_OVERRRIDE="%BLENDER_DIR%..\%2" shift /1 @@ -189,7 +193,7 @@ if %ERRORLEVEL% NEQ 0 ( ) -set BUILD_DIR=%BUILD_DIR%_%TARGET%_%BUILD_ARCH%_vc%BUILD_VS_VER%_%BUILD_TYPE% +set BUILD_DIR=%BUILD_DIR%_%TARGET%%BUILD_NGE%_%BUILD_ARCH%_vc%BUILD_VS_VER%_%BUILD_TYPE% if NOT "%BUILD_DIR_OVERRRIDE%"=="" ( set BUILD_DIR=%BUILD_DIR_OVERRRIDE% ) @@ -293,6 +297,7 @@ goto EOF echo. echo Configuration options echo - with_tests ^(enable building unit tests^) + echo - noge ^(disable building game enginge and player^) echo - debug ^(Build an unoptimized debuggable build^) echo - packagename [newname] ^(override default cpack package name^) echo - buildir [newdir] ^(override default build folder^) ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [da82f654246] master: CMake: Fix CMake for non Apple systems
Commit: da82f6542460067c56669ec64df0b580b8e18274 Author: Thomas Beck Date: Sun Apr 23 19:10:04 2017 +0200 Branches: master https://developer.blender.org/rBda82f6542460067c56669ec64df0b580b8e18274 CMake: Fix CMake for non Apple systems Follow up to https://developer.blender.org/rB14a4ce6d7fb4dcf3d1aa5b58f9a543549df6d5dc apple_check_quicktime() macro is only defined for apple, so ignore it otherwise. === M CMakeLists.txt === diff --git a/CMakeLists.txt b/CMakeLists.txt index a938d9b338f..2674ccb56ad 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -736,7 +736,9 @@ if(WITH_AUDASPACE) endif() endif() -apple_check_quicktime() +if(APPLE) + apple_check_quicktime() +endif() #- # Check for valid directories ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [c9b0113c13a] greasepencil-object: Fix problem with layer drawing order
Commit: c9b0113c13a94706b6128242bc27fea38a6f906a
Author: Antonio Vazquez
Date: Sun Apr 23 18:32:44 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rBc9b0113c13a94706b6128242bc27fea38a6f906a
Fix problem with layer drawing order
The fill and stroke must be in the same pass to keep layer drawing order
===
M source/blender/draw/engines/gpencil/gpencil_mode.c
===
diff --git a/source/blender/draw/engines/gpencil/gpencil_mode.c
b/source/blender/draw/engines/gpencil/gpencil_mode.c
index 5ee3d244ab1..7bcb54ed0b1 100644
--- a/source/blender/draw/engines/gpencil/gpencil_mode.c
+++ b/source/blender/draw/engines/gpencil/gpencil_mode.c
@@ -72,7 +72,6 @@ typedef struct GPENCIL_StorageList {
/* keep it under MAX_PASSES */
typedef struct GPENCIL_PassList {
struct DRWPass *stroke_pass;
- struct DRWPass *fill_pass;
struct DRWPass *edit_pass;
struct DRWPass *drawing_pass;
} GPENCIL_PassList;
@@ -283,9 +282,8 @@ static void GPENCIL_cache_init(void *vedata)
{
/* Stroke pass */
- DRWState state = DRW_STATE_WRITE_COLOR | DRW_STATE_BLEND ;
+ DRWState state = DRW_STATE_WRITE_COLOR | DRW_STATE_BLEND |
DRW_STATE_WRITE_DEPTH;
psl->stroke_pass = DRW_pass_create("Gpencil Stroke Pass",
state);
- psl->fill_pass = DRW_pass_create("Gpencil Fill Pass", state);
stl->storage->pal_id = 0;
memset(stl->storage->shgrps_fill, 0, sizeof(DRWShadingGroup *)
* MAX_GPENCIL_MAT);
memset(stl->storage->shgrps_stroke, 0, sizeof(DRWShadingGroup
*) * MAX_GPENCIL_MAT);
@@ -360,7 +358,7 @@ static void gpencil_draw_strokes(void *vedata, ToolSettings
*ts, Object *ob,
if (id == -1) {
id = stl->storage->pal_id;
stl->storage->materials[id] = gps->palcolor;
- stl->storage->shgrps_fill[id] =
GPENCIL_shgroup_fill_create(vedata, psl->fill_pass, gps->palcolor, id);
+ stl->storage->shgrps_fill[id] =
GPENCIL_shgroup_fill_create(vedata, psl->stroke_pass, gps->palcolor, id);
stl->storage->shgrps_stroke[id] =
GPENCIL_shgroup_stroke_create(vedata, psl->stroke_pass, gps->palcolor);
++stl->storage->pal_id;
}
@@ -608,7 +606,6 @@ static void GPENCIL_draw_scene(void *vedata)
UNUSED_VARS(fbl, dfbl, dtxl);
- DRW_draw_pass(psl->fill_pass);
DRW_draw_pass(psl->stroke_pass);
DRW_draw_pass(psl->edit_pass);
/* current buffer */
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [a192d5b81c8] master: CMake: disable WITH_CODEC_QUICKTIME for macOS > 10.11 for configurations.
Commit: a192d5b81c8fef5d797c73edd5637ad8fa9efa6d
Author: Romain Foyard
Date: Sun Apr 23 17:27:59 2017 +0200
Branches: master
https://developer.blender.org/rBa192d5b81c8fef5d797c73edd5637ad8fa9efa6d
CMake: disable WITH_CODEC_QUICKTIME for macOS > 10.11 for configurations.
QtKit was removed in macOS Sierra, this patch disables WITH_CODEC_QUICKTIME
in Sierra and greater versions of macOS.
Reviewed By: brecht
Differential Revision: https://developer.blender.org/D2645
===
M build_files/cmake/config/blender_full.cmake
M build_files/cmake/config/blender_release.cmake
===
diff --git a/build_files/cmake/config/blender_full.cmake
b/build_files/cmake/config/blender_full.cmake
index cb18500c7ca..1af45289414 100644
--- a/build_files/cmake/config/blender_full.cmake
+++ b/build_files/cmake/config/blender_full.cmake
@@ -75,4 +75,16 @@ elseif(APPLE)
set(WITH_JACKON CACHE BOOL "" FORCE)
set(WITH_CODEC_QUICKTIME ON CACHE BOOL "" FORCE)
set(WITH_OPENSUBDIV OFF CACHE BOOL "" FORCE)
+
+ if(NOT DEFINED OSX_SYSTEM)
+ execute_process(
+ COMMAND xcodebuild -version -sdk macosx SDKVersion
+ OUTPUT_VARIABLE OSX_SYSTEM
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ endif()
+
+ if(${OSX_SYSTEM} VERSION_GREATER 10.11)
+ set(WITH_CODEC_QUICKTIME OFF CACHE BOOL "" FORCE)
+ message(STATUS "QuickTime not supported by SDK ${OSX_SYSTEM},
disabling WITH_CODEC_QUICKTIME")
+ endif()
endif()
diff --git a/build_files/cmake/config/blender_release.cmake
b/build_files/cmake/config/blender_release.cmake
index 050db91e75e..cc167be2b0b 100644
--- a/build_files/cmake/config/blender_release.cmake
+++ b/build_files/cmake/config/blender_release.cmake
@@ -76,4 +76,16 @@ elseif(APPLE)
set(WITH_JACKON CACHE BOOL "" FORCE)
set(WITH_CODEC_QUICKTIME ON CACHE BOOL "" FORCE)
set(WITH_OPENSUBDIV OFF CACHE BOOL "" FORCE)
+
+ if(NOT DEFINED OSX_SYSTEM)
+ execute_process(
+ COMMAND xcodebuild -version -sdk macosx SDKVersion
+ OUTPUT_VARIABLE OSX_SYSTEM
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ endif()
+
+ if(${OSX_SYSTEM} VERSION_GREATER 10.11)
+ set(WITH_CODEC_QUICKTIME OFF CACHE BOOL "" FORCE)
+ message(STATUS "QuickTime not supported by SDK ${OSX_SYSTEM},
disabling WITH_CODEC_QUICKTIME")
+ endif()
endif()
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [14a4ce6d7fb] master: CMake: move some Apple specific code into platform_apple_xcode.cmake.
Commit: 14a4ce6d7fb4dcf3d1aa5b58f9a543549df6d5dc
Author: Brecht Van Lommel
Date: Sun Apr 23 17:42:45 2017 +0200
Branches: master
https://developer.blender.org/rB14a4ce6d7fb4dcf3d1aa5b58f9a543549df6d5dc
CMake: move some Apple specific code into platform_apple_xcode.cmake.
===
M CMakeLists.txt
M build_files/cmake/config/blender_full.cmake
M build_files/cmake/config/blender_release.cmake
A build_files/cmake/platform/platform_apple_xcode.cmake
===
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c0ea2ef679e..a938d9b338f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -566,113 +566,7 @@ endif()
# Apple
if(APPLE)
- # require newer cmake on osx because of version handling,
- # older cmake cannot handle 2 digit subversion!
- cmake_minimum_required(VERSION 3.0.0)
-
- if(NOT CMAKE_OSX_ARCHITECTURES)
- set(CMAKE_OSX_ARCHITECTURES x86_64 CACHE STRING
- "Choose the architecture you want to build Blender for:
i386, x86_64 or ppc"
- FORCE)
- endif()
-
- if(NOT DEFINED OSX_SYSTEM)
- execute_process(
- COMMAND xcodebuild -version -sdk macosx SDKVersion
- OUTPUT_VARIABLE OSX_SYSTEM
- OUTPUT_STRIP_TRAILING_WHITESPACE)
- endif()
-
- # workaround for incorrect cmake xcode lookup for developer previews -
XCODE_VERSION does not
- # take xcode-select path into account but would always look into
/Applications/Xcode.app
- # while dev versions are named Xcode-DP
- execute_process(
- COMMAND xcode-select --print-path
- OUTPUT_VARIABLE XCODE_CHECK OUTPUT_STRIP_TRAILING_WHITESPACE)
- string(REPLACE "/Contents/Developer" "" XCODE_BUNDLE ${XCODE_CHECK}) #
truncate to bundlepath in any case
-
- if(${CMAKE_GENERATOR} MATCHES "Xcode")
-
- # earlier xcode has no bundled developer dir, no sense in
getting xcode path from
- if(${XCODE_VERSION} VERSION_GREATER 4.2)
- # reduce to XCode name without dp extension
- string(SUBSTRING "${XCODE_CHECK}" 14 6 DP_NAME)
- if(${DP_NAME} MATCHES Xcode5)
- set(XCODE_VERSION 5)
- endif()
- endif()
-
- # cmake incompatibility with xcode 4.3 and higher #
- if(${XCODE_VERSION} MATCHES '') # cmake fails due looking for
xcode in the wrong path, thus will be empty var
- message(FATAL_ERROR "Xcode 4.3 and higher must be used
with cmake 2.8-8 or higher")
- endif()
- ### end cmake incompatibility with xcode 4.3 and higher ###
-
- if(${XCODE_VERSION} VERSION_EQUAL 4 OR ${XCODE_VERSION}
VERSION_GREATER 4 AND ${XCODE_VERSION} VERSION_LESS 4.3)
- # Xcode 4 defaults to the Apple LLVM Compiler.
- # Override the default compiler selection because
Blender only compiles with gcc up to xcode 4.2
- set(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION
"com.apple.compilers.llvmgcc42")
- message(STATUS "Setting compiler to: "
${CMAKE_XCODE_ATTRIBUTE_GCC_VERSION})
- endif()
- else() # unix makefile generator does not fill XCODE_VERSION var, so we
get it with a command
- execute_process(COMMAND xcodebuild -version OUTPUT_VARIABLE
XCODE_VERS_BUILD_NR)
- string(SUBSTRING "${XCODE_VERS_BUILD_NR}" 6 3 XCODE_VERSION) #
truncate away build-nr
- unset(XCODE_VERS_BUILD_NR)
- endif()
-
- message(STATUS "Detected OS X ${OSX_SYSTEM} and Xcode ${XCODE_VERSION}
at ${XCODE_BUNDLE}")
-
- if(${XCODE_VERSION} VERSION_LESS 4.3)
- # use guaranteed existing sdk
- set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX${OSX_SYSTEM}.sdk
CACHE PATH "" FORCE)
- else()
- # note: xcode-select path could be ambigous,
- # cause /Applications/Xcode.app/Contents/Developer or
/Applications/Xcode.app would be allowed
- # so i use a selfcomposed bundlepath here
- set(OSX_SYSROOT_PREFIX
${XCODE_BUNDLE}/Contents/Developer/Platforms/MacOSX.platform)
- message(STATUS "OSX_SYSROOT_PREFIX: " ${OSX_SYSROOT_PREFIX})
- set(OSX_DEVELOPER_PREFIX
/Developer/SDKs/MacOSX${OSX_SYSTEM}.sdk) # use guaranteed existing sdk
- set(CMAKE_OSX_SYSROOT
${OSX_SYSROOT_PREFIX}/${OSX_DEVELOPER_PREFIX} CACHE PATH "" FORCE)
- if(${CMAKE_GENERATOR} MATCHES "Xcode")
- # to silence sdk not found warning, just overrides
CMAKE_OSX_SYSROOT
-
[Bf-blender-cvs] [cedb1915fe8] master: CMake: fix wrong alembic test name on Windows.
Commit: cedb1915fe828674e7c313bb1cd9879d13715406
Author: Brecht Van Lommel
Date: Sun Apr 23 17:27:12 2017 +0200
Branches: master
https://developer.blender.org/rBcedb1915fe828674e7c313bb1cd9879d13715406
CMake: fix wrong alembic test name on Windows.
===
M tests/python/CMakeLists.txt
===
diff --git a/tests/python/CMakeLists.txt b/tests/python/CMakeLists.txt
index dca85dbf770..1dddacc191b 100644
--- a/tests/python/CMakeLists.txt
+++ b/tests/python/CMakeLists.txt
@@ -458,7 +458,7 @@ if(WITH_ALEMBIC)
)
if(MSVC)
- add_test(NAME cycles_${subject}_test
+ add_test(NAME alembic_tests
COMMAND
"$/${BLENDER_VERSION_MAJOR}.${BLENDER_VERSION_MINOR}/python/bin/python$<$:_d>"
${CMAKE_CURRENT_LIST_DIR}/alembic_tests.py
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [4a9e546fedd] master: [msvc/make.bat] Allow override of the build folder name
Commit: 4a9e546fedd7f6ee1d2d0ba7b2eeaee309aa6905 Author: lazydodo Date: Sun Apr 23 10:10:57 2017 -0600 Branches: master https://developer.blender.org/rB4a9e546fedd7f6ee1d2d0ba7b2eeaee309aa6905 [msvc/make.bat] Allow override of the build folder name === M make.bat === diff --git a/make.bat b/make.bat index dd82b1ca8a7..390e379830c 100644 --- a/make.bat +++ b/make.bat @@ -1,7 +1,7 @@ @echo off REM This batch file does an out-of-source CMake build in ../build_windows REM This is for users who like to configure & build Blender with a single command. - +setlocal EnableDelayedExpansion setlocal ENABLEEXTENSIONS set BLENDER_DIR=%~dp0 set BLENDER_DIR_NOSPACES=%BLENDER_DIR: =% @@ -12,6 +12,7 @@ if not "%BLENDER_DIR%"=="%BLENDER_DIR_NOSPACES%" ( set BUILD_DIR=%BLENDER_DIR%..\build_windows set BUILD_TYPE=Release rem reset all variables so they do not get accidentally get carried over from previous builds +set BUILD_DIR_OVERRRIDE= set BUILD_CMAKE_ARGS= set BUILD_ARCH= set BUILD_VS_VER= @@ -35,6 +36,9 @@ if NOT "%1" == "" ( if "%1" == "debug" ( set BUILD_TYPE=Debug REM Build Configurations + ) else if "%1" == "builddir" ( + set BUILD_DIR_OVERRRIDE="%BLENDER_DIR%..\%2" + shift /1 ) else if "%1" == "with_tests" ( set TESTS_CMAKE_ARGS=-DWITH_GTESTS=On ) else if "%1" == "full" ( @@ -186,7 +190,9 @@ if %ERRORLEVEL% NEQ 0 ( set BUILD_DIR=%BUILD_DIR%_%TARGET%_%BUILD_ARCH%_vc%BUILD_VS_VER%_%BUILD_TYPE% - +if NOT "%BUILD_DIR_OVERRRIDE%"=="" ( + set BUILD_DIR=%BUILD_DIR_OVERRRIDE% +) where /Q cmake if %ERRORLEVEL% NEQ 0 ( @@ -289,6 +295,7 @@ goto EOF echo - with_tests ^(enable building unit tests^) echo - debug ^(Build an unoptimized debuggable build^) echo - packagename [newname] ^(override default cpack package name^) + echo - buildir [newdir] ^(override default build folder^) echo - x86 ^(override host auto-detect and build 32 bit code^) echo - x64 ^(override host auto-detect and build 64 bit code^) echo - 2013 ^(build with visual studio 2013^) ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [2209f6e23a2] greasepencil-object: Add functions to draw strokes with one point only
Commit: 2209f6e23a2333b796cf917ed0cc21adb6559a8e
Author: Antonio Vazquez
Date: Sun Apr 23 11:24:23 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rB2209f6e23a2333b796cf917ed0cc21adb6559a8e
Add functions to draw strokes with one point only
===
M source/blender/draw/engines/gpencil/gpencil_draw.c
M source/blender/draw/engines/gpencil/gpencil_mode.c
M source/blender/draw/engines/gpencil/gpencil_mode.h
===
diff --git a/source/blender/draw/engines/gpencil/gpencil_draw.c
b/source/blender/draw/engines/gpencil/gpencil_draw.c
index 4e43b9ad655..55984183343 100644
--- a/source/blender/draw/engines/gpencil/gpencil_draw.c
+++ b/source/blender/draw/engines/gpencil/gpencil_draw.c
@@ -18,7 +18,7 @@
* The Original Code is Copyright (C) 2008, Blender Foundation
* This is a new part of Blender
*
- * Contributor(s): Joshua Leung, Antonio Vazquez
+ * Contributor(s): Antonio Vazquez
*
* * END GPL LICENSE BLOCK *
*/
@@ -70,6 +70,33 @@ static void gpencil_set_stroke_point(VertexBuffer *vbo,
const bGPDspoint *pt, in
VertexBuffer_set_attrib(vbo, pos_id, idx, fpt);
}
+/* create batch geometry data for one point stroke shader */
+Batch *gpencil_get_point_geom(bGPDspoint *pt, short thickness, const float
ink[4])
+{
+ static VertexFormat format = { 0 };
+ static unsigned int pos_id, color_id, size_id;
+ if (format.attrib_ct == 0) {
+ pos_id = VertexFormat_add_attrib(, "pos", COMP_F32, 3,
KEEP_FLOAT);
+ color_id = VertexFormat_add_attrib(, "color", COMP_F32,
4, KEEP_FLOAT);
+ size_id = VertexFormat_add_attrib(, "size", COMP_F32, 1,
KEEP_FLOAT);
+ }
+
+ VertexBuffer *vbo = VertexBuffer_create_with_format();
+ VertexBuffer_allocate_data(vbo, 1);
+
+ float alpha = ink[3] * pt->strength;
+ CLAMP(alpha, GPENCIL_STRENGTH_MIN, 1.0f);
+ float col[4] = { ink[0], ink[1], ink[2], alpha };
+ VertexBuffer_set_attrib(vbo, color_id, 0, col);
+
+ float thick = max_ff(pt->pressure * thickness, 1.0f);
+ VertexBuffer_set_attrib(vbo, size_id, 0, );
+
+ VertexBuffer_set_attrib(vbo, pos_id, 0, >x);
+
+ return Batch_create(PRIM_POINTS, vbo, NULL);
+}
+
/* create batch geometry data for stroke shader */
Batch *gpencil_get_stroke_geom(bGPDstroke *gps, short thickness, const float
ink[4])
{
@@ -147,6 +174,8 @@ static void gpencil_stroke_convertcoords(Scene *scene,
ARegion *ar, ScrArea *sa,
zero_v3(out);
}
}
+
+/* convert 2d tGPspoint to 3d bGPDspoint */
void gpencil_tpoint_to_point(Scene *scene, ARegion *ar, ScrArea *sa, const
tGPspoint *tpt, bGPDspoint *pt)
{
float p3d[3];
@@ -158,6 +187,46 @@ void gpencil_tpoint_to_point(Scene *scene, ARegion *ar,
ScrArea *sa, const tGPsp
pt->strength = tpt->strength;
}
+/* create batch geometry data for current buffer for one point stroke shader */
+Batch *gpencil_get_buffer_point_geom(bGPdata *gpd, short thickness)
+{
+ const struct bContext *C = DRW_get_context();
+ Scene *scene = CTX_data_scene(C);
+ ScrArea *sa = CTX_wm_area(C);
+ ARegion *ar = CTX_wm_region(C);
+
+ const tGPspoint *tpt = gpd->sbuffer;
+ bGPDspoint pt;
+ float ink[4];
+ copy_v4_v4(ink, gpd->scolor);
+
+ static VertexFormat format = { 0 };
+ static unsigned int pos_id, color_id, size_id;
+ if (format.attrib_ct == 0) {
+ pos_id = VertexFormat_add_attrib(, "pos", COMP_F32, 3,
KEEP_FLOAT);
+ color_id = VertexFormat_add_attrib(, "color", COMP_F32,
4, KEEP_FLOAT);
+ size_id = VertexFormat_add_attrib(, "size", COMP_F32, 1,
KEEP_FLOAT);
+ }
+
+ VertexBuffer *vbo = VertexBuffer_create_with_format();
+ VertexBuffer_allocate_data(vbo, 1);
+
+ /* convert to 3D */
+ gpencil_tpoint_to_point(scene, ar, sa, tpt, );
+
+ float alpha = ink[3] * pt.strength;
+ CLAMP(alpha, GPENCIL_STRENGTH_MIN, 1.0f);
+ float col[4] = { ink[0], ink[1], ink[2], alpha };
+ VertexBuffer_set_attrib(vbo, color_id, 0, col);
+
+ float thick = max_ff(pt.pressure * thickness, 1.0f);
+ VertexBuffer_set_attrib(vbo, size_id, 0, );
+
+ VertexBuffer_set_attrib(vbo, pos_id, 0, );
+
+ return Batch_create(PRIM_POINTS, vbo, NULL);
+}
+
/* create batch geometry data for current buffer stroke shader */
Batch *gpencil_get_buffer_stroke_geom(bGPdata *gpd, short thickness)
{
diff --git a/source/blender/draw/engines/gpencil/gpencil_mode.c
b/source/blender/draw/engines/gpencil/gpencil_mode.c
index b750afbd2db..5ee3d244ab1 100644
--- a/source/blender/draw/engines/gpencil/gpencil_mode.c
+++ b/source/blender/draw/engines/gpencil/gpencil_mode.c
@@ -98,6 +98,7 @@ typedef struct GPENCIL_Data {
/* *** STATIC *** */
[Bf-blender-cvs] [f93f4169cbf] blender2.8: Merge branch 'master' into blender2.8
Commit: f93f4169cbfb2e3d5583d1bca5aa8466f37393dc
Author: Bastien Montagne
Date: Sun Apr 23 10:49:39 2017 +0200
Branches: blender2.8
https://developer.blender.org/rBf93f4169cbfb2e3d5583d1bca5aa8466f37393dc
Merge branch 'master' into blender2.8
Conflicts:
build_files/cmake/platform/platform_apple.cmake
===
===
diff --cc build_files/cmake/platform/platform_apple.cmake
index f2a6aee7a59,6105f2e04de..5336024b75c
--- a/build_files/cmake/platform/platform_apple.cmake
+++ b/build_files/cmake/platform/platform_apple.cmake
@@@ -23,8 -23,10 +23,12 @@@
# Libraries configuration for Apple.
+set(MACOSX_DEPLOYMENT_TARGET "10.9")
+
+ macro(find_package_wrapper)
+ # do nothing, just satisfy the macro
+ endmacro()
+
if(NOT DEFINED LIBDIR)
if(WITH_CXX11)
set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/darwin)
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
