https://svn.blender.org/svnroot/bf-blender/branches/soc-2008-mxcurioni (r22789) and https://svn.blender.org/svnroot/bf-blender/trunk/blender (r23338) with the "Ignore ancestry" and "Ignore line endings" options enabled (using TortoiseSVN on Windows). After the merge operation, all changes (i.e., deletion) in source/blender/freestyle/ were reverted in order to keep the primary source tree of the Freestyle renderer.
		
			
				
	
	
		
			27 lines
		
	
	
		
			762 B
		
	
	
	
		
			Python
		
	
	
	
	
	
			
		
		
	
	
			27 lines
		
	
	
		
			762 B
		
	
	
	
		
			Python
		
	
	
	
	
	
| #!/usr/bin/python
 | |
| Import ('env')
 | |
| 
 | |
| cflags=''
 | |
| sources = env.Glob('intern/source/*.c')
 | |
| 
 | |
| incs = 'intern/include #/intern/guardedalloc ../blenlib ../makesdna ../makesrna'
 | |
| incs += ' extern/include ../blenkernel ../radiosity/extern/include ../imbuf'
 | |
| incs += ' ../include ../blenloader ../../../intern/smoke/extern'
 | |
| 
 | |
| defs = []
 | |
| 
 | |
| if env['WITH_BF_QUICKTIME']:
 | |
|     defs.append('WITH_QUICKTIME')
 | |
|     incs += ' ../quicktime ' + env['BF_QUICKTIME_INC']
 | |
| 
 | |
| if env['WITH_BF_FFMPEG']:
 | |
|     defs.append('WITH_FFMPEG')
 | |
| 
 | |
| if env['WITH_BF_OPENEXR']:
 | |
|     defs.append('WITH_OPENEXR')
 | |
| 
 | |
| if env['OURPLATFORM']=='linux2':
 | |
|     cflags='-pthread'
 | |
| 
 | |
| env.BlenderLib ( libname = 'bf_render', sources = sources, includes = Split(incs), defines=defs, libtype='core', priority=145, compileflags=cflags )
 |