← Back to branch summary

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

« back to all changes in this revision

Viewing changes to config/win32-vc-config.py

  • 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:
config/win32-vc-config.py
9
9
BF_FFMPEG = LIBDIR +'/ffmpeg'
10
10
BF_FFMPEG_INC = '${BF_FFMPEG}/include'
11
11
BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
12
 
BF_FFMPEG_LIB = 'avformat-52.lib avcodec-51.lib avdevice-52.lib avutil-49.lib swscale-0.lib'
 
12
BF_FFMPEG_LIB = 'avformat-52.lib avcodec-52.lib avdevice-52.lib avutil-50.lib swscale-0.lib'
13
13
 
14
14
BF_PYTHON = LIBDIR + '/python'
15
 
BF_PYTHON_VERSION = '2.5'
 
15
BF_PYTHON_VERSION = '2.6'
16
16
BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
17
17
BF_PYTHON_BINARY = 'python'
18
 
BF_PYTHON_LIB = 'python25'
 
18
BF_PYTHON_LIB = 'python26'
19
19
BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
20
20
 
21
21
WITH_BF_OPENAL = True
49
49
BF_PTHREADS_LIB = 'pthreadVC2'
50
50
BF_PTHREADS_LIBPATH = '${BF_PTHREADS}/lib'
51
51
 
52
 
WITH_BF_FMOD = False
53
 
BF_FMOD = LIBDIR + '/fmod'
54
 
 
55
52
WITH_BF_OPENEXR = True
56
53
WITH_BF_STATICOPENEXR = False
57
54
BF_OPENEXR = LIBDIR + '/openexr'
77
74
 
78
75
BF_TIFF = LIBDIR + '/tiff'
79
76
BF_TIFF_INC = '${BF_TIFF}/include'
 
77
BF_TIFF_LIB = 'libtiff'
 
78
BF_TIFF_LIBPATH = '${BF_TIFF}/lib'
80
79
 
81
80
WITH_BF_ZLIB = True
82
81
BF_ZLIB = LIBDIR + '/zlib'
150
149
BF_QUICKTIME_LIB = 'qtmlClient'
151
150
BF_QUICKTIME_LIBPATH = '${BF_QUICKTIME}/Libraries'
152
151
 
 
152
WITH_BF_OPENJPEG = True 
 
153
BF_OPENJPEG = '#extern/libopenjpeg'
 
154
BF_OPENJPEG_LIB = ''
 
155
BF_OPENJPEG_INC = '${BF_OPENJPEG}'
 
156
BF_OPENJPEG_LIBPATH='${BF_OPENJPEG}/lib'
 
157
 
 
158
WITH_BF_REDCODE = False  
 
159
BF_REDCODE_INC = '#extern'
 
160
 
153
161
WITH_BF_STATICOPENGL = False
154
162
BF_OPENGL_INC = '${BF_OPENGL}/include'
155
163
BF_OPENGL_LIBINC = '${BF_OPENGL}/lib'
161
169
CXX = 'cl.exe'
162
170
 
163
171
CCFLAGS = ['/nologo', '/Ob1', '/J', '/W3', '/Gd', '/MT']
 
172
CXXFLAGS = ['/EHsc']
164
173
 
165
 
BF_DEBUG_FLAGS = ['/Zi', '/FR${TARGET}.sbr']
 
174
BF_DEBUG_CCFLAGS = ['/Zi', '/FR${TARGET}.sbr']
166
175
 
167
176
CPPFLAGS = ['-DWIN32','-D_CONSOLE', '-D_LIB', '-DFTGL_LIBRARY_STATIC', '-D_CRT_SECURE_NO_DEPRECATE']
168
177
REL_CFLAGS = ['-O2', '-DNDEBUG']
169
178
REL_CCFLAGS = ['-O2', '-DNDEBUG']
 
179
REL_CXXFLAGS = ['-O2', '-DNDEBUG']
 
180
 
170
181
C_WARN = []
171
182
CC_WARN = []
 
183
CXX_WARN = []
172
184
 
173
 
LLIBS = 'ws2_32 vfw32 winmm kernel32 user32 gdi32 comdlg32 advapi32 shfolder shell32 ole32 oleaut32 uuid'
 
185
LLIBS = ['ws2_32', 'vfw32', 'winmm', 'kernel32', 'user32', 'gdi32', 'comdlg32', 'advapi32', 'shfolder', 'shell32', 'ole32', 'oleaut32', 'uuid']
174
186
 
175
187
PLATFORM_LINKFLAGS = '''
176
188
                       /SUBSYSTEM:CONSOLE
186
198
                       /LARGEADDRESSAWARE
187
199
                   '''
188
200
 
 
201
# # Todo
 
202
# BF_PROFILE_CCFLAGS = ['-pg', '-g ']
 
203
# BF_PROFILE_LINKFLAGS = ['-pg']
 
204
# BF_PROFILE = False
 
205
 
189
206
BF_BUILDDIR = '..\\build\\win32-vc'
190
207
BF_INSTALLDIR='..\\install\\win32-vc'
191
208
BF_DOCDIR='..\\install\\doc'