← Back to branch summary

~ubuntu-branches/ubuntu/lucid/blender/lucid

« back to all changes in this revision

Viewing changes to source/gameengine/Ketsji/KXNetwork/SConscript

  • Committer: Bazaar Package Importer
  • Author(s): Chris Coulson
  • Date: 2009-08-06 22:32:19 UTC
  • mfrom: (1.2.10 upstream)
  • Revision ID: james.westby@ubuntu.com-20090806223219-8z4eej1u8levu4pz
Tags: 2.49a+dfsg-0ubuntu1
https://launchpad.net/bugs/382153
* Merge from debian unstable, remaining changes:
  - debian/control: Build-depend on python-2.6 rather than python-2.5.
  - debian/misc/*.desktop: Add Spanish translation to .desktop 
    files.
  - debian/pyversions: 2.6.
  - debian/rules: Clean *.o of source/blender/python/api2_2x/
* New upstream release (LP: #382153).
* Refreshed patches:
  - 01_sanitize_sys.patch
  - 02_tmp_in_HOME
  - 10_use_systemwide_ftgl
  - 70_portability_platform_detection
* Removed patches merged upstream:
  - 30_fix_python_syntax_warning
  - 90_ubuntu_ffmpeg_52_changes

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/gameengine/Ketsji/KXNetwork/SConscript
3
3
 
4
4
sources = env.Glob('*.cpp')
5
5
 
6
 
incs = '. #source/kernel/gen_system #intern/string #source/gameengine/Ketsji'
 
6
incs = '. #source/kernel/gen_system #intern/string #intern/moto/include #source/gameengine/Ketsji'
7
7
incs += ' #source/gameengine/GameLogic #source/gameengine/Expressions'
8
 
incs += ' #source/gameengine/Network'
 
8
incs += ' #source/gameengine/Network #source/gameengine/SceneGraph'
9
9
 
10
10
incs += ' ' + env['BF_PYTHON_INC']
11
11
 
12
 
env.BlenderLib ( 'kx_network', Split(sources), Split(incs), defines=[],libtype=['game2', 'player'], priority=[5, 155] )
 
12
cxxflags = []
 
13
if env['OURPLATFORM']=='win32-vc':
 
14
        cxxflags.append ('/GR')
 
15
        cxxflags.append ('/O2')
 
16
 
 
17
 
 
18
env.BlenderLib ( 'kx_network', Split(sources), Split(incs), defines=[],libtype=['game2', 'player'], priority=[5, 155], cxx_compileflags=cxxflags )