[Bf-blender-cvs] [f0653c3] soc-2014-viewport_context: Merge branch 'master' into soc-2014-viewport_context
Antony Riakiotakis
noreply at git.blender.org
Mon Sep 1 15:38:35 CEST 2014
Commit: f0653c3d3f1b24b45e6f1c5ac659bf130b58af3f
Author: Antony Riakiotakis
Date: Mon Sep 1 15:37:21 2014 +0200
Branches: soc-2014-viewport_context
https://developer.blender.org/rBf0653c3d3f1b24b45e6f1c5ac659bf130b58af3f
Merge branch 'master' into soc-2014-viewport_context
Also fix scons issues with SDL. There is still a linking problem
somewhere but i expect this is an issue in master as well.
Conflicts:
intern/cycles/SConscript
intern/ghost/CMakeLists.txt
intern/ghost/intern/GHOST_WindowX11.cpp
source/blender/nodes/CMakeLists.txt
===================================================================
===================================================================
diff --cc intern/cycles/SConscript
index cbc9ef6,a6c947b..2d7fbe9
--- a/intern/cycles/SConscript
+++ b/intern/cycles/SConscript
@@@ -62,9 -62,7 +62,12 @@@ if env['WITH_BF_CYCLES_OSL']
incs.extend('. bvh render device kernel kernel/osl kernel/svm util subd'.split())
incs.extend('#intern/guardedalloc #source/blender/makesrna #source/blender/makesdna #source/blender/blenlib'.split())
incs.extend('#source/blender/blenloader ../../source/blender/makesrna/intern'.split())
++
+incs.append(env['BF_GLEW_INC'])
+incs.append('#/intern/glew-mx')
+incs.append('#intern/mikktspace')
+ incs.extend('#extern/glew/include #extern/clew/include #extern/cuew/include #intern/mikktspace'.split())
++
incs.append(cycles['BF_OIIO_INC'])
incs.append(cycles['BF_BOOST_INC'])
incs.append(cycles['BF_OPENEXR_INC'].split())
diff --cc intern/cycles/app/CMakeLists.txt
index 96ac761,5876ac3..c846489
--- a/intern/cycles/app/CMakeLists.txt
+++ b/intern/cycles/app/CMakeLists.txt
@@@ -29,10 -28,10 +29,12 @@@ set(LIBRARIE
${JPEG_LIBRARIES}
${ZLIB_LIBRARIES}
${TIFF_LIBRARY}
+ extern_clew
+ extern_cuew
)
+add_definitions(${GL_DEFINITIONS})
+
if(WIN32)
list(APPEND LIBRARIES ${PTHREADS_LIBRARIES})
endif()
diff --cc intern/cycles/blender/CMakeLists.txt
index ad553fb,548aac8..e97ad2e
--- a/intern/cycles/blender/CMakeLists.txt
+++ b/intern/cycles/blender/CMakeLists.txt
@@@ -44,9 -43,10 +44,10 @@@ set(ADDON_FILE
addon/presets.py
addon/properties.py
addon/ui.py
+ addon/version_update.py
)
-add_definitions(-DGLEW_STATIC)
+add_definitions(${GL_DEFINITIONS})
blender_add_lib(bf_intern_cycles "${SRC}" "${INC}" "${INC_SYS}")
diff --cc intern/cycles/device/CMakeLists.txt
index 318e446,a62ce29..998b353
--- a/intern/cycles/device/CMakeLists.txt
+++ b/intern/cycles/device/CMakeLists.txt
@@@ -10,7 -9,10 +10,9 @@@ set(IN
)
set(INC_SYS
- ${OPENGL_INCLUDE_DIR}
${GLEW_INCLUDE_PATH}
+ ../../../extern/cuew/include
+ ../../../extern/clew/include
)
set(SRC
diff --cc intern/ghost/SConscript
index e855075,8075647..5a4572c
--- a/intern/ghost/SConscript
+++ b/intern/ghost/SConscript
@@@ -36,21 -36,10 +36,22 @@@ sources = env.Glob('intern/*.cpp'
sources2 = env.Glob('intern/GHOST_NDOFManager3Dconnexion.c')
if window_system == 'darwin':
sources += env.Glob('intern/*.mm')
++ #remove, will be readded below if needed.
++ sources.remove('intern' + os.sep + 'GHOST_ContextCGL.mm')
+if not env['WITH_BF_GL_EGL']:
+ sources.remove('intern' + os.sep + 'GHOST_ContextEGL.cpp')
-pf = ['GHOST_DisplayManager', 'GHOST_System', 'GHOST_SystemPaths', 'GHOST_Window', 'GHOST_DropTarget', 'GHOST_NDOFManager']
-defs=['_USE_MATH_DEFINES', 'GLEW_STATIC']
+# seems cleaner to remove these now then add back the one that is needed
- sources.remove('intern' + os.sep + 'GHOST_ContextCGL.mm')
+sources.remove('intern' + os.sep + 'GHOST_ContextGLX.cpp')
+sources.remove('intern' + os.sep + 'GHOST_ContextWGL.cpp')
+
- pf = ['GHOST_DisplayManager', 'GHOST_System', 'GHOST_SystemPaths', 'GHOST_Window', 'GHOST_DropTarget', 'GHOST_NDOFManager']
++pf = ['GHOST_DisplayManager', 'GHOST_System', 'GHOST_SystemPaths', 'GHOST_Window', 'GHOST_DropTarget', 'GHOST_NDOFManager', 'GHOST_Context']
+
+defs = env['BF_GL_DEFINITIONS']
+
+if env['WITH_BF_GL_EGL']:
+ defs.append('WITH_EGL')
incs = [
'.',
@@@ -75,6 -65,6 +76,10 @@@ elif window_system in ('linux', 'openbs
for f in pf:
try:
sources.remove('intern' + os.sep + f + 'Win32.cpp')
++ except ValueError:
++ pass
++
++ try:
sources.remove('intern' + os.sep + f + 'SDL.cpp')
except ValueError:
pass
@@@ -108,27 -92,19 +113,38 @@@ elif window_system in ('win32-vc', 'win
for f in pf:
try:
sources.remove('intern' + os.sep + f + 'X11.cpp')
++ except ValueError:
++ pass
++
++ try:
sources.remove('intern' + os.sep + f + 'SDL.cpp')
except ValueError:
pass
+
+ if not env['WITH_BF_GL_EGL']:
+ sources.append('intern' + os.sep + 'GHOST_ContextWGL.cpp')
+
elif window_system == 'darwin':
- if env['WITH_BF_QUICKTIME']:
- defs.append('WITH_QUICKTIME')
- for f in pf:
- try:
- sources.remove('intern' + os.sep + f + 'Win32.cpp')
- sources.remove('intern' + os.sep + f + 'X11.cpp')
- sources.remove('intern' + os.sep + f + 'SDL.cpp')
- except ValueError:
- pass
+ if env['WITH_BF_QUICKTIME']:
+ defs.append('WITH_QUICKTIME')
+ for f in pf:
+ try:
+ sources.remove('intern' + os.sep + f + 'Win32.cpp')
++ except ValueError:
++ pass
++
++ try:
+ sources.remove('intern' + os.sep + f + 'X11.cpp')
++ except ValueError:
++ pass
++ try:
+ sources.remove('intern' + os.sep + f + 'SDL.cpp')
+ except ValueError:
+ pass
+
+ if not env['WITH_BF_GL_EGL']:
+ sources.append('intern' + os.sep + 'GHOST_ContextCGL.mm')
+
else:
print "Unknown window system specified."
Exit()
diff --cc source/blender/nodes/CMakeLists.txt
index 716841b,2293415..9eb6c16
--- a/source/blender/nodes/CMakeLists.txt
+++ b/source/blender/nodes/CMakeLists.txt
@@@ -278,6 -279,8 +280,10 @@@ if(WITH_COMPOSITOR
add_definitions(-DWITH_COMPOSITOR)
endif()
+add_definitions(${GL_DEFINITIONS})
+
+ if(WITH_FREESTYLE)
+ add_definitions(-DWITH_FREESTYLE)
+ endif()
+
blender_add_lib(bf_nodes "${SRC}" "${INC}" "${INC_SYS}")
More information about the Bf-blender-cvs
mailing list