From 0528162eb691e9d0de39b5f72c427a4d96542f64 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 19 Feb 2013 12:05:38 +0000 Subject: patch [#34320] Cross compiling with mingw-w64 on ubuntu from Martijn Berger (juicyfruit) applying since this is only corrects header case which is ignored on windows anyway. --- source/creator/creator.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/creator') diff --git a/source/creator/creator.c b/source/creator/creator.c index 4b74e225ec4..d7b2d87ffe8 100644 --- a/source/creator/creator.c +++ b/source/creator/creator.c @@ -48,7 +48,7 @@ #endif #ifdef WIN32 -# include +# include # include "utfconv.h" #endif -- cgit v1.2.3 From 1f88ee6213ed5e8b60597034d52188256448b104 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Wed, 20 Feb 2013 11:29:43 +0000 Subject: Fix #34299: Motion Tracking 20x slower under Windows Root of the issue goes to SSBA library which didn't work properly when using optimization in MSVC. It was worked around by disabling optimization for libmv, which is in fact shame and shouldn't have been done. It seems after some changes optimization does not affect on SSBA code, but enabling optimization could be risky so close to release. For now solved by splitting SSBA to separate CMake/SCons library, disabling optimization only for this particular library and enabling optimization for rest of libmv. Tested on all files which used to fail with optimization enabled in SSBA and all of them works the same as before. Tracking speed is significantly higher now. After release we'll enable optimization for SSBA as well, so there'll be no crappy build setup. Later we'll replace old SSBA library with new BA code based on Ceres. Bundle script would be broken for until then, so better not to use it. --- source/creator/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'source/creator') diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index bb5f34167bc..a5d7763487f 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -924,6 +924,7 @@ endif() if(WITH_LIBMV) list(APPEND BLENDER_SORTED_LIBS extern_libmv) list(APPEND BLENDER_SORTED_LIBS extern_ceres) + list(APPEND BLENDER_SORTED_LIBS extern_ssba) endif() if(WITH_MOD_CLOTH_ELTOPO) -- cgit v1.2.3 From ea99b9a392bddec4ea58b816b1fb66f78c77ff6e Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Wed, 20 Feb 2013 12:07:27 +0000 Subject: Made ldl code a part of extern_ssba library, otherwise gcc fails to find ldl symbols because order of libraries seems to be critical for gcc linker. A bit stupid, but that's how linker works.. Both CMake and SCons shall work fine on linux now. --- source/creator/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/creator') diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index a5d7763487f..bb10bdd0bae 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -923,8 +923,8 @@ endif() if(WITH_LIBMV) list(APPEND BLENDER_SORTED_LIBS extern_libmv) - list(APPEND BLENDER_SORTED_LIBS extern_ceres) list(APPEND BLENDER_SORTED_LIBS extern_ssba) + list(APPEND BLENDER_SORTED_LIBS extern_ceres) endif() if(WITH_MOD_CLOTH_ELTOPO) -- cgit v1.2.3 From 4cf9034f6d59840f8312094c184b9708a251fe0a Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Fri, 22 Feb 2013 10:06:54 +0000 Subject: Remove extern_ssba workaround SSBA seemed to be working OK last time i've checked it with MSVC and optimization enabled. Also, we'll likely replace it with own BA soon, which works fine with MSVC anyway. --- source/creator/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) (limited to 'source/creator') diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index bb10bdd0bae..bb5f34167bc 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -923,7 +923,6 @@ endif() if(WITH_LIBMV) list(APPEND BLENDER_SORTED_LIBS extern_libmv) - list(APPEND BLENDER_SORTED_LIBS extern_ssba) list(APPEND BLENDER_SORTED_LIBS extern_ceres) endif() -- cgit v1.2.3 From 3d9dc6a2e488cd47eafb716b65f479831c4bcd9f Mon Sep 17 00:00:00 2001 From: Dalai Felinto Date: Fri, 22 Feb 2013 22:24:38 +0000 Subject: WITH_PYTHON_FRAMEWORK cmake option for OSX This option allow Blender to be linked against the Framework python It's useful if you want to have blenderplayer and bpy in the same application and need to avoid PyThread problems. patch reviewed by Jens Verwiebe before 2.66. He may want to change something though. (also small: I changed: /Library/Frameworks/Python.framework/Versions//python by /Library/Frameworks/Python.framework/Versions//Python as the latter seems to be the norm) --- source/creator/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source/creator') diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index bb5f34167bc..69bad2b8cce 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -689,7 +689,7 @@ elseif(APPLE) ) # python - if(WITH_PYTHON AND NOT WITH_PYTHON_MODULE) + if(WITH_PYTHON AND NOT WITH_PYTHON_MODULE AND NOT WITH_PYTHON_FRAMEWORK) # the python zip is first extract as part of the build process, # and then later installed as part of make install. this is much # quicker, and means we can easily exclude files on copy @@ -742,7 +742,7 @@ elseif(APPLE) ) # python - if(WITH_PYTHON) + if(WITH_PYTHON AND NOT WITH_PYTHON_FRAMEWORK) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/python COMMAND rm -rf ${CMAKE_CURRENT_BINARY_DIR}/python/ -- cgit v1.2.3