forked from bartvdbraak/blender
bdfe7d89e2
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r12987:17416 Issues: * GHOST/X11 had conflicting changes. Some code was added in 2.5, which was later added in trunk also, but reverted partially, specifically revision 16683. I have left out this reversion in the 2.5 branch since I think it is needed there. http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16683 * Scons had various conflicting changes, I decided to go with trunk version for everything except priorities and some library renaming. * In creator.c, there were various fixes and fixes for fixes related to the -w -W and -p options. In 2.5 -w and -W is not coded yet, and -p is done differently. Since this is changed so much, and I don't think those fixes would be needed in 2.5, I've left them out. * Also in creator.c: there was code for a python bugfix where the screen was not initialized when running with -P. The code that initializes the screen there I had to disable, that can't work in 2.5 anymore but left it commented as a reminder. Further I had to disable some new function calls. using src/ and python/, as was done already in this branch, disabled function calls: * bpath.c: error reporting * BME_conversions.c: editmesh conversion functions. * SHD_dynamic: disabled almost completely, there is no python/. * KX_PythonInit.cpp and Ketsji/ build files: Mathutils is not there, disabled. * text.c: clipboard copy call. * object.c: OB_SUPPORT_MATERIAL. * DerivedMesh.c and subsurf_ccg, stipple_quarttone. Still to be done: * Go over files and functions that were moved to a different location but could still use changes that were done in trunk.
33 lines
1.1 KiB
Python
33 lines
1.1 KiB
Python
#!/usr/bin/python
|
|
import sys
|
|
import os
|
|
|
|
Import ('env')
|
|
|
|
window_system = env['OURPLATFORM']
|
|
|
|
sources = env.Glob('intern/*.cpp')
|
|
|
|
pf = ['GHOST_DisplayManager', 'GHOST_System', 'GHOST_Window']
|
|
|
|
if window_system in ('linux2', 'openbsd3', 'sunos5', 'freebsd6', 'irix6'):
|
|
for f in pf:
|
|
sources.remove('intern' + os.sep + f + 'Win32.cpp')
|
|
sources.remove('intern' + os.sep + f + 'Carbon.cpp')
|
|
elif window_system in ('win32-vc', 'win32-mingw', 'cygwin', 'linuxcross'):
|
|
for f in pf:
|
|
sources.remove('intern' + os.sep + f + 'X11.cpp')
|
|
sources.remove('intern' + os.sep + f + 'Carbon.cpp')
|
|
elif window_system == 'darwin':
|
|
for f in pf:
|
|
sources.remove('intern' + os.sep + f + 'Win32.cpp')
|
|
sources.remove('intern' + os.sep + f + 'X11.cpp')
|
|
else:
|
|
print "Unknown window system specified."
|
|
Exit()
|
|
|
|
incs = '. ../string ' + env['BF_OPENGL_INC']
|
|
if window_system in ('win32-vc', 'win32-mingw', 'cygwin', 'linuxcross'):
|
|
incs = env['BF_WINTAB_INC'] + ' ' + incs
|
|
env.BlenderLib ('bf_ghost', sources, Split(incs), defines=['_USE_MATH_DEFINES'], libtype=['core','intern','player'], priority = [40,44,5] )
|