Revision: 38952
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38952
Author: nazgul
Date: 2011-08-02 18:29:42 +0000 (Tue, 02 Aug 2011)
Log Message:
-----------
Merging r38933 through r38951 from trunk into soc-2011-salad
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38933
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38951
Modified Paths:
--------------
branches/soc-2011-salad/CMakeLists.txt
branches/soc-2011-salad/build_files/buildbot/config/user-config-i686.py
branches/soc-2011-salad/build_files/buildbot/config/user-config-player-i686.py
branches/soc-2011-salad/build_files/buildbot/config/user-config-player-x86_64.py
branches/soc-2011-salad/build_files/buildbot/config/user-config-x86_64.py
branches/soc-2011-salad/build_files/scons/config/linux2-config.py
branches/soc-2011-salad/build_files/scons/tools/Blender.py
branches/soc-2011-salad/build_files/scons/tools/btools.py
branches/soc-2011-salad/intern/ghost/SConscript
branches/soc-2011-salad/release/scripts/modules/bpy/path.py
branches/soc-2011-salad/release/scripts/presets/ffmpeg/xvid.py
Property Changed:
----------------
branches/soc-2011-salad/
branches/soc-2011-salad/build_files/cmake/Modules/FindSpacenav.cmake
Property changes on: branches/soc-2011-salad
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-30783,30792-30793,30797-30798,30815
/branches/soc-2011-carrot:36854,37548,37564,37602,37622,37848,38043,38064,38226,38231,38282,38620,38661-38662
/branches/soc-2011-cucumber:36829-36994
/branches/soc-2011-onion:36833-38309
/branches/soc-2011-pepper:36830-38934
/branches/soc-2011-tomato:36831-38900
/trunk/blender:36834-38932
+ /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-30783,30792-30793,30797-30798,30815
/branches/soc-2011-carrot:36854,37548,37564,37602,37622,37848,38043,38064,38226,38231,38282,38620,38661-38662
/branches/soc-2011-cucumber:36829-36994
/branches/soc-2011-onion:36833-38309
/branches/soc-2011-pepper:36830-38934
/branches/soc-2011-tomato:36831-38900
/trunk/blender:36834-38951
Modified: branches/soc-2011-salad/CMakeLists.txt
===================================================================
--- branches/soc-2011-salad/CMakeLists.txt 2011-08-02 18:28:05 UTC (rev
38951)
+++ branches/soc-2011-salad/CMakeLists.txt 2011-08-02 18:29:42 UTC (rev
38952)
@@ -914,29 +914,16 @@
endif()
if(WITH_PYTHON)
- set(PYTHON_VERSION 3.2)
- if(PYTHON_VERSION MATCHES 3.2)
- # we use precompiled libraries for py 3.2 and up by
default
+ # we use precompiled libraries for py 3.2 and up by default
- # normally cached but not since we include them with
blender
- set(PYTHON_INCLUDE_DIR
"${LIBDIR}/python/include/python${PYTHON_VERSION}")
- # set(PYTHON_BINARY
"${LIBDIR}/python/bin/python${PYTHON_VERSION}") # not used yet
- set(PYTHON_LIBRARY python${PYTHON_VERSION})
- set(PYTHON_LIBPATH
"${LIBDIR}/python/lib/python${PYTHON_VERSION}")
- # set(PYTHON_LINKFLAGS "-u _PyMac_Error") # won't
build with this enabled
- else()
- # otherwise, use custom system framework
- # *not used but maintained incase some dev wants to*
+ # normally cached but not since we include them with blender
+ set(PYTHON_VERSION 3.2)
+ set(PYTHON_INCLUDE_DIR
"${LIBDIR}/python/include/python${PYTHON_VERSION}")
+ # set(PYTHON_BINARY
"${LIBDIR}/python/bin/python${PYTHON_VERSION}") # not used yet
+ set(PYTHON_LIBRARY python${PYTHON_VERSION})
+ set(PYTHON_LIBPATH
"${LIBDIR}/python/lib/python${PYTHON_VERSION}")
+ # set(PYTHON_LINKFLAGS "-u _PyMac_Error") # won't build with
this enabled
- set(PYTHON
"/System/Library/Frameworks/Python.framework/Versions/" CACHE PATH)
- set(PYTHON_INCLUDE_DIR
"${PYTHON}${PYTHON_VERSION}/include/python${PYTHON_VERSION}" CACHE PATH)
- # set(PYTHON_BINARY
${PYTHON}${PYTHON_VERSION}/bin/python${PYTHON_VERSION}) # not used yet
- set(PYTHON_LIBRARY "" CACHE FILEPATH)
- set(PYTHON_LIBPATH
"${PYTHON}${PYTHON_VERSION}/lib/python${PYTHON_VERSION}/config" CACHE PATH)
- set(PYTHON_LINKFLAGS "-u _PyMac_Error -framework System
-framework Python" CACHE STRING)
- unset(PYTHON)
- endif()
-
# uncached vars
set(PYTHON_INCLUDE_DIRS "${PYTHON_INCLUDE_DIR}")
set(PYTHON_LIBRARIES "${PYTHON_LIBRARY}")
@@ -990,7 +977,17 @@
set(SAMPLERATE_LIBPATH ${SAMPLERATE}/lib)
endif()
- set(PLATFORM_LINKLIBS stdc++ SystemStubs)
+ find_library(SYSTEMSTUBS_LIBRARY
+ NAMES
+ SystemStubs
+ PATHS
+ )
+ mark_as_advanced(SYSTEMSTUBS_LIBRARY)
+ if(SYSTEMSTUBS_LIBRARY)
+ set(PLATFORM_LINKLIBS stdc++ SystemStubs)
+ else()
+ set(PLATFORM_LINKLIBS stdc++)
+ endif()
if(WITH_COCOA)
set(PLATFORM_CFLAGS "-pipe -funsigned-char -DGHOST_COCOA")
Modified:
branches/soc-2011-salad/build_files/buildbot/config/user-config-i686.py
===================================================================
--- branches/soc-2011-salad/build_files/buildbot/config/user-config-i686.py
2011-08-02 18:28:05 UTC (rev 38951)
+++ branches/soc-2011-salad/build_files/buildbot/config/user-config-i686.py
2011-08-02 18:29:42 UTC (rev 38952)
@@ -81,6 +81,12 @@
BF_JEMALLOC = '/home/sources/staticlibs/jemalloc'
BF_JEMALLOC_LIBPATH = '${BF_JEMALLOC}/lib32'
+# Use 3d mouse library
+WITH_BF_3DMOUSE = True
+WITH_BF_STATIC3DMOUSE = True
+BF_3DMOUSE = '/home/sources/staticlibs/spnav'
+BF_3DMOUSE_LIBPATH = '${BF_3DMOUSE}/lib32'
+
# Compilation and optimization
BF_DEBUG = False
REL_CFLAGS = ['-O2']
Modified:
branches/soc-2011-salad/build_files/buildbot/config/user-config-player-i686.py
===================================================================
---
branches/soc-2011-salad/build_files/buildbot/config/user-config-player-i686.py
2011-08-02 18:28:05 UTC (rev 38951)
+++
branches/soc-2011-salad/build_files/buildbot/config/user-config-player-i686.py
2011-08-02 18:29:42 UTC (rev 38952)
@@ -65,6 +65,12 @@
BF_JEMALLOC = '/home/sources/staticlibs/jemalloc'
BF_JEMALLOC_LIBPATH = '${BF_JEMALLOC}/lib32'
+# Use 3d mouse library
+WITH_BF_3DMOUSE = True
+WITH_BF_STATIC3DMOUSE = True
+BF_3DMOUSE = '/home/sources/staticlibs/spnav'
+BF_3DMOUSE_LIBPATH = '${BF_3DMOUSE}/lib32'
+
# Compilation and optimization
BF_DEBUG = False
REL_CFLAGS = ['-O2']
Modified:
branches/soc-2011-salad/build_files/buildbot/config/user-config-player-x86_64.py
===================================================================
---
branches/soc-2011-salad/build_files/buildbot/config/user-config-player-x86_64.py
2011-08-02 18:28:05 UTC (rev 38951)
+++
branches/soc-2011-salad/build_files/buildbot/config/user-config-player-x86_64.py
2011-08-02 18:29:42 UTC (rev 38952)
@@ -65,6 +65,12 @@
BF_JEMALLOC = '/home/sources/staticlibs/jemalloc'
BF_JEMALLOC_LIBPATH = '${BF_JEMALLOC}/lib64'
+# Use 3d mouse library
+WITH_BF_3DMOUSE = True
+WITH_BF_STATIC3DMOUSE = True
+BF_3DMOUSE = '/home/sources/staticlibs/spnav'
+BF_3DMOUSE_LIBPATH = '${BF_3DMOUSE}/lib64'
+
# Compilation and optimization
BF_DEBUG = False
REL_CFLAGS = ['-O2']
Modified:
branches/soc-2011-salad/build_files/buildbot/config/user-config-x86_64.py
===================================================================
--- branches/soc-2011-salad/build_files/buildbot/config/user-config-x86_64.py
2011-08-02 18:28:05 UTC (rev 38951)
+++ branches/soc-2011-salad/build_files/buildbot/config/user-config-x86_64.py
2011-08-02 18:29:42 UTC (rev 38952)
@@ -81,6 +81,12 @@
BF_JEMALLOC = '/home/sources/staticlibs/jemalloc'
BF_JEMALLOC_LIBPATH = '${BF_JEMALLOC}/lib64'
+# Use 3d mouse library
+WITH_BF_3DMOUSE = True
+WITH_BF_STATIC3DMOUSE = True
+BF_3DMOUSE = '/home/sources/staticlibs/spnav'
+BF_3DMOUSE_LIBPATH = '${BF_3DMOUSE}/lib64'
+
# Compilation and optimization
BF_DEBUG = False
REL_CFLAGS = ['-O2']
Property changes on:
branches/soc-2011-salad/build_files/cmake/Modules/FindSpacenav.cmake
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Modified: branches/soc-2011-salad/build_files/scons/config/linux2-config.py
===================================================================
--- branches/soc-2011-salad/build_files/scons/config/linux2-config.py
2011-08-02 18:28:05 UTC (rev 38951)
+++ branches/soc-2011-salad/build_files/scons/config/linux2-config.py
2011-08-02 18:29:42 UTC (rev 38952)
@@ -197,7 +197,11 @@
#SpaceNavigator and friends
WITH_BF_3DMOUSE = True
+BF_3DMOUSE = '/usr'
+BF_3DMOUSE_INC = '${BF_3DMOUSE}/include'
+BF_3DMOUSE_LIBPATH = '${BF_3DMOUSE}/lib'
BF_3DMOUSE_LIB = 'spnav'
+BF_3DMOUSE_LIB_STATIC = '${BF_3DMOUSE_LIBPATH}/libspnav.a'
##
CC = 'gcc'
@@ -230,8 +234,6 @@
##FIX_STUBS_WARNINGS = -Wno-unused
LLIBS = ['util', 'c', 'm', 'dl', 'pthread', 'stdc++']
-if WITH_BF_3DMOUSE:
- LLIBS = LLIBS + [BF_3DMOUSE_LIB];
##LOPTS = --dynamic
##DYNLDFLAGS = -shared $(LDFLAGS)
Modified: branches/soc-2011-salad/build_files/scons/tools/Blender.py
===================================================================
--- branches/soc-2011-salad/build_files/scons/tools/Blender.py 2011-08-02
18:28:05 UTC (rev 38951)
+++ branches/soc-2011-salad/build_files/scons/tools/Blender.py 2011-08-02
18:29:42 UTC (rev 38952)
@@ -206,6 +206,12 @@
if lenv['WITH_BF_STATICJEMALLOC']:
statlibs += Split(lenv['BF_JEMALLOC_LIB_STATIC'])
+ if lenv['OURPLATFORM']=='linux2':
+ if lenv['WITH_BF_3DMOUSE']:
+ libincs += Split(lenv['BF_3DMOUSE_LIBPATH'])
+ if lenv['WITH_BF_STATIC3DMOUSE']:
+ statlibs += Split(lenv['BF_3DMOUSE_LIB_STATIC'])
+
return statlibs, libincs
def setup_syslibs(lenv):
@@ -271,6 +277,11 @@
if not lenv['WITH_BF_STATICJEMALLOC']:
syslibs += Split(lenv['BF_JEMALLOC_LIB'])
+ if lenv['OURPLATFORM']=='linux2':
+ if lenv['WITH_BF_3DMOUSE']:
+ if not lenv['WITH_BF_STATIC3DMOUSE']:
+ syslibs += Split(lenv['BF_3DMOUSE_LIB'])
+
syslibs += lenv['LLIBS']
return syslibs
Modified: branches/soc-2011-salad/build_files/scons/tools/btools.py
===================================================================
--- branches/soc-2011-salad/build_files/scons/tools/btools.py 2011-08-02
18:28:05 UTC (rev 38951)
+++ branches/soc-2011-salad/build_files/scons/tools/btools.py 2011-08-02
18:29:42 UTC (rev 38952)
@@ -439,6 +439,12 @@
(BoolVariable('WITH_BF_NOBLENDER', 'Do not build blender if true',
False)),
(BoolVariable('WITH_BF_3DMOUSE', 'Build blender with support of 3D
mouses', False)),
+ (BoolVariable('WITH_BF_STATIC3DMOUSE', 'Staticly link to 3d mouse
library', False)),
+ ('BF_3DMOUSE', '3d mouse library base path', ''),
+ ('BF_3DMOUSE_INC', '3d mouse library include path', ''),
+ ('BF_3DMOUSE_LIB', '3d mouse library', ''),
+ ('BF_3DMOUSE_LIBPATH', '3d mouse library path', ''),
+ ('BF_3DMOUSE_LIB_STATIC', '3d mouse static library', ''),
('CFLAGS', 'C only flags', []),
('CCFLAGS', 'Generic C and C++ flags', []),
Modified: branches/soc-2011-salad/intern/ghost/SConscript
===================================================================
--- branches/soc-2011-salad/intern/ghost/SConscript 2011-08-02 18:28:05 UTC
(rev 38951)
+++ branches/soc-2011-salad/intern/ghost/SConscript 2011-08-02 18:29:42 UTC
(rev 38952)
@@ -80,6 +80,9 @@
if env['WITH_BF_3DMOUSE']:
defs.append('WITH_INPUT_NDOF')
+
+ if env['OURPLATFORM']=='linux2':
+ incs += ' ' + env['BF_3DMOUSE_INC']
else:
sources.remove('intern' + os.sep + 'GHOST_NDOFManager.cpp')
try:
@@ -88,7 +91,7 @@
elif window_system=='darwin':
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
