Revision: 37856
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37856
Author: nazgul
Date: 2011-06-27 12:03:28 +0000 (Mon, 27 Jun 2011)
Log Message:
-----------
Merging r37736 through r37855 from trunk into soc-2011-salad
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37736
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37855
Modified Paths:
--------------
branches/soc-2011-salad/CMakeLists.txt
branches/soc-2011-salad/SConstruct
branches/soc-2011-salad/build_files/cmake/macros.cmake
branches/soc-2011-salad/build_files/scons/config/aix4-config.py
branches/soc-2011-salad/build_files/scons/config/win32-vc-config.py
branches/soc-2011-salad/build_files/scons/config/win64-vc-config.py
branches/soc-2011-salad/doc/python_api/rst/change_log.rst
branches/soc-2011-salad/doc/python_api/sphinx_doc_gen.py
branches/soc-2011-salad/intern/CMakeLists.txt
branches/soc-2011-salad/intern/ffmpeg/ffmpeg_compat.h
branches/soc-2011-salad/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/soc-2011-salad/intern/ghost/intern/GHOST_Window.cpp
branches/soc-2011-salad/intern/ghost/intern/GHOST_Window.h
branches/soc-2011-salad/intern/ghost/intern/GHOST_WindowCarbon.cpp
branches/soc-2011-salad/intern/ghost/intern/GHOST_WindowCocoa.h
branches/soc-2011-salad/intern/ghost/intern/GHOST_WindowCocoa.mm
branches/soc-2011-salad/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/soc-2011-salad/intern/ghost/intern/GHOST_WindowX11.cpp
branches/soc-2011-salad/intern/iksolver/intern/IK_QSegment.cpp
branches/soc-2011-salad/intern/itasc/ConstraintSet.cpp
branches/soc-2011-salad/release/scripts/startup/bl_operators/uvcalc_smart_project.py
branches/soc-2011-salad/release/scripts/startup/bl_operators/wm.py
branches/soc-2011-salad/release/scripts/startup/bl_ui/properties_material.py
branches/soc-2011-salad/release/scripts/startup/bl_ui/properties_particle.py
branches/soc-2011-salad/release/scripts/startup/bl_ui/space_userpref.py
branches/soc-2011-salad/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2011-salad/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/soc-2011-salad/source/blender/blenkernel/BKE_blender.h
branches/soc-2011-salad/source/blender/blenkernel/BKE_particle.h
branches/soc-2011-salad/source/blender/blenkernel/CMakeLists.txt
branches/soc-2011-salad/source/blender/blenkernel/intern/blender.c
branches/soc-2011-salad/source/blender/blenkernel/intern/brush.c
branches/soc-2011-salad/source/blender/blenkernel/intern/bvhutils.c
branches/soc-2011-salad/source/blender/blenkernel/intern/paint.c
branches/soc-2011-salad/source/blender/blenkernel/intern/particle.c
branches/soc-2011-salad/source/blender/blenkernel/intern/sequencer.c
branches/soc-2011-salad/source/blender/blenkernel/intern/sound.c
branches/soc-2011-salad/source/blender/blenkernel/intern/writeffmpeg.c
branches/soc-2011-salad/source/blender/blenlib/BLI_math_color.h
branches/soc-2011-salad/source/blender/blenlib/BLI_math_geom.h
branches/soc-2011-salad/source/blender/blenlib/CMakeLists.txt
branches/soc-2011-salad/source/blender/blenlib/intern/math_color.c
branches/soc-2011-salad/source/blender/blenlib/intern/math_geom.c
branches/soc-2011-salad/source/blender/blenloader/intern/readfile.c
branches/soc-2011-salad/source/blender/blenloader/intern/writefile.c
branches/soc-2011-salad/source/blender/editors/armature/armature_intern.h
branches/soc-2011-salad/source/blender/editors/armature/armature_ops.c
branches/soc-2011-salad/source/blender/editors/armature/editarmature.c
branches/soc-2011-salad/source/blender/editors/datafiles/startup.blend.c
branches/soc-2011-salad/source/blender/editors/interface/interface_style.c
branches/soc-2011-salad/source/blender/editors/mesh/editmesh_mods.c
branches/soc-2011-salad/source/blender/editors/object/object_bake.c
branches/soc-2011-salad/source/blender/editors/render/render_opengl.c
branches/soc-2011-salad/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2011-salad/source/blender/editors/sound/CMakeLists.txt
branches/soc-2011-salad/source/blender/editors/sound/sound_ops.c
branches/soc-2011-salad/source/blender/editors/space_file/file_ops.c
branches/soc-2011-salad/source/blender/editors/space_graph/CMakeLists.txt
branches/soc-2011-salad/source/blender/editors/space_graph/graph_edit.c
branches/soc-2011-salad/source/blender/editors/space_info/info_stats.c
branches/soc-2011-salad/source/blender/editors/space_sequencer/CMakeLists.txt
branches/soc-2011-salad/source/blender/editors/space_sequencer/sequencer_add.c
branches/soc-2011-salad/source/blender/editors/space_view3d/drawobject.c
branches/soc-2011-salad/source/blender/editors/transform/transform_constraints.c
branches/soc-2011-salad/source/blender/imbuf/CMakeLists.txt
branches/soc-2011-salad/source/blender/imbuf/IMB_imbuf.h
branches/soc-2011-salad/source/blender/imbuf/intern/divers.c
branches/soc-2011-salad/source/blender/makesdna/DNA_particle_types.h
branches/soc-2011-salad/source/blender/makesrna/intern/CMakeLists.txt
branches/soc-2011-salad/source/blender/makesrna/intern/makesrna.c
branches/soc-2011-salad/source/blender/makesrna/intern/rna_ID.c
branches/soc-2011-salad/source/blender/makesrna/intern/rna_access.c
branches/soc-2011-salad/source/blender/makesrna/intern/rna_curve.c
branches/soc-2011-salad/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2011-salad/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2011-salad/source/blender/makesrna/intern/rna_object.c
branches/soc-2011-salad/source/blender/makesrna/intern/rna_particle.c
branches/soc-2011-salad/source/blender/makesrna/intern/rna_rna.c
branches/soc-2011-salad/source/blender/makesrna/intern/rna_scene.c
branches/soc-2011-salad/source/blender/makesrna/intern/rna_space.c
branches/soc-2011-salad/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2011-salad/source/blender/nodes/intern/CMP_nodes/CMP_channelMatte.c
branches/soc-2011-salad/source/blender/nodes/intern/CMP_nodes/CMP_glare.c
branches/soc-2011-salad/source/blender/nodes/intern/CMP_nodes/CMP_rotate.c
branches/soc-2011-salad/source/blender/python/BPY_extern.h
branches/soc-2011-salad/source/blender/python/generic/mathutils_Matrix.c
branches/soc-2011-salad/source/blender/python/generic/mathutils_geometry.c
branches/soc-2011-salad/source/blender/python/intern/CMakeLists.txt
branches/soc-2011-salad/source/blender/python/intern/bpy.c
branches/soc-2011-salad/source/blender/python/intern/bpy_app.c
branches/soc-2011-salad/source/blender/python/intern/bpy_interface.c
branches/soc-2011-salad/source/blender/quicktime/CMakeLists.txt
branches/soc-2011-salad/source/blender/quicktime/apple/qtkit_export.m
branches/soc-2011-salad/source/blender/render/intern/source/convertblender.c
branches/soc-2011-salad/source/blender/render/intern/source/pipeline.c
branches/soc-2011-salad/source/blender/render/intern/source/volume_precache.c
branches/soc-2011-salad/source/blender/render/intern/source/volumetric.c
branches/soc-2011-salad/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2011-salad/source/blender/windowmanager/intern/wm_files.c
branches/soc-2011-salad/source/blender/windowmanager/intern/wm_init_exit.c
branches/soc-2011-salad/source/blender/windowmanager/intern/wm_window.c
branches/soc-2011-salad/source/creator/creator.c
branches/soc-2011-salad/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/soc-2011-salad/source/gameengine/BlenderRoutines/CMakeLists.txt
branches/soc-2011-salad/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soc-2011-salad/source/gameengine/Converter/CMakeLists.txt
branches/soc-2011-salad/source/gameengine/Converter/KX_ConvertActuators.cpp
branches/soc-2011-salad/source/gameengine/Ketsji/CMakeLists.txt
branches/soc-2011-salad/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/soc-2011-salad/source/gameengine/Ketsji/KX_SoundActuator.cpp
branches/soc-2011-salad/source/gameengine/Ketsji/KX_SoundActuator.h
branches/soc-2011-salad/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
branches/soc-2011-salad/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
Added Paths:
-----------
branches/soc-2011-salad/doc/python_api/examples/aud.py
branches/soc-2011-salad/source/blender/blenlib/BLI_callbacks.h
branches/soc-2011-salad/source/blender/blenlib/intern/callbacks.c
branches/soc-2011-salad/source/blender/python/intern/bpy_app_handlers.c
branches/soc-2011-salad/source/blender/python/intern/bpy_app_handlers.h
Removed Paths:
-------------
branches/soc-2011-salad/source/blender/blenlib/intern/BLI_callbacks.h
Property Changed:
----------------
branches/soc-2011-salad/
Property changes on: branches/soc-2011-salad
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-30783,30792-30793,30797-30798,30815
/branches/soc-2011-cucumber:36829-36994
/branches/soc-2011-onion:36833-37529
/branches/soc-2011-pepper:36830-37151
/branches/soc-2011-tomato:36831-37740
/trunk/blender:36834-37735
+ /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-30783,30792-30793,30797-30798,30815
/branches/soc-2011-cucumber:36829-36994
/branches/soc-2011-onion:36833-37529
/branches/soc-2011-pepper:36830-37151
/branches/soc-2011-tomato:36831-37740
/trunk/blender:36834-37855
Modified: branches/soc-2011-salad/CMakeLists.txt
===================================================================
--- branches/soc-2011-salad/CMakeLists.txt 2011-06-27 11:40:15 UTC (rev
37855)
+++ branches/soc-2011-salad/CMakeLists.txt 2011-06-27 12:03:28 UTC (rev
37856)
@@ -104,6 +104,9 @@
option(WITH_GAMEENGINE "Enable Game Engine" ON)
option(WITH_PLAYER "Build Player" OFF)
+option(WITH_AUDASPACE "Build with blenders audio library" ON)
+mark_as_advanced(WITH_AUDASPACE)
+
option(WITH_HEADLESS "Build without graphical support (renderfarm, server
mode only)" OFF)
mark_as_advanced(WITH_HEADLESS)
@@ -204,8 +207,8 @@
message(FATAL_ERROR "WITH_PLAYER requires WITH_GAMEENGINE")
endif()
-if(NOT WITH_SAMPLERATE AND (WITH_OPENAL OR WITH_SDL OR WITH_JACK))
- message(FATAL_ERROR "WITH_OPENAL/WITH_SDL/WITH_JACK require
WITH_SAMPLERATE")
+if(NOT WITH_AUDASPACE AND (WITH_OPENAL OR WITH_SDL OR WITH_JACK))
+ message(FATAL_ERROR "WITH_OPENAL/WITH_SDL/WITH_JACK/WITH_CODEC_FFMPEG
require WITH_AUDASPACE")
endif()
if(NOT WITH_IMAGE_OPENJPEG AND WITH_IMAGE_REDCODE)
@@ -545,13 +548,13 @@
if(MSVC)
if(CMAKE_CL_64)
- set(LLIBS ws2_32 vfw32 winmm kernel32 user32 gdi32
comdlg32 advapi32 shfolder shell32 ole32 oleaut32 uuid )
+ set(LLIBS ws2_32 vfw32 winmm kernel32 user32 gdi32
comdlg32 advapi32 shfolder shell32 ole32 oleaut32 uuid)
else()
- set(LLIBS kernel32 user32 gdi32 comdlg32 advapi32
shell32 ole32 oleaut32 uuid ws2_32 vfw32 winmm)
+ set(LLIBS ws2_32 vfw32 winmm kernel32 user32 gdi32
comdlg32 advapi32 shfolder shell32 ole32 oleaut32 uuid)
endif()
- set(CMAKE_CXX_FLAGS "/D_CRT_NONSTDC_NO_DEPRECATE
/D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /we4013 /wd4018 /wd4800
/wd4244 /wd4305 /wd4065 /wd4267" CACHE STRING "MSVC MT C++ flags " FORCE)
- set(CMAKE_C_FLAGS "/D_CRT_NONSTDC_NO_DEPRECATE
/D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /we4013 /wd4018 /wd4800
/wd4244 /wd4305 /wd4065 /wd4267" CACHE STRING "MSVC MT C++ flags " FORCE)
+ set(CMAKE_CXX_FLAGS "/D_CRT_NONSTDC_NO_DEPRECATE
/D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /D_CONSOLE /D_LIB /nologo
/Ob1 /J /W0 /Gd /wd4018 /wd4244 /wd4305 /wd4800 /wd4065 /wd4267 /we4013" CACHE
STRING "MSVC MT C++ flags " FORCE)
+ set(CMAKE_C_FLAGS "/D_CRT_NONSTDC_NO_DEPRECATE
/D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /D_CONSOLE /D_LIB /nologo
/Ob1 /J /W0 /Gd /wd4018 /wd4244 /wd4305 /wd4800 /wd4065 /wd4267 /we4013 /EHsc"
CACHE STRING "MSVC MT C++ flags " FORCE)
if(CMAKE_CL_64)
set(CMAKE_CXX_FLAGS_DEBUG "/D_DEBUG /Od /Gm /EHsc /RTC1
/MTd /W3 /nologo /Zi /J" CACHE STRING "MSVC MT flags " FORCE)
@@ -696,9 +699,9 @@
# MSVC only, Mingw doesnt need
if(CMAKE_CL_64)
- set(PLATFORM_LINKFLAGS "/MACHINE:X64
/NODEFAULTLIB:libc.lib /STACK:2097152 ")
+ set(PLATFORM_LINKFLAGS "/SUBSYSTEM:CONSOLE /MACHINE:X64
/STACK:2097152 /OPT:NOREF /INCREMENTAL:NO /NODEFAULTLIB:\"msvcrt.lib\"
/NODEFAULTLIB:\"msvcmrt.lib\" /NODEFAULTLIB:\"msvcurt.lib\"
/NODEFAULTLIB:\"msvcrtd.lib\" ")
else()
- set(PLATFORM_LINKFLAGS "/NODEFAULTLIB:libc.lib
/STACK:2097152 ")
+ set(PLATFORM_LINKFLAGS "/SUBSYSTEM:CONSOLE
/MACHINE:IX86 /STACK:2097152 /INCREMENTAL:NO /LARGEADDRESSAWARE
/NODEFAULTLIB:\"msvcrt.lib\" /NODEFAULTLIB:\"msvcmrt.lib\"
/NODEFAULTLIB:\"msvcurt.lib\" /NODEFAULTLIB:\"msvcrtd.lib\" ")
endif()
set(CMAKE_EXE_LINKER_FLAGS_DEBUG
"${CMAKE_EXE_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:libcmt.lib;libc.lib ")
@@ -797,7 +800,7 @@
set(PYTHON_VERSION 3.2)
set(PYTHON_INCLUDE_DIRS
"${PYTHON}/include/python${PYTHON_VERSION}")
# set(PYTHON_BINARY python) # not used yet
- set(PYTHON_LIBRARIES python32mw)
+ set(PYTHON_LIBRARIES ${PYTHON}/lib/python32mw.lib)
set(PYTHON_LIBPATH ${PYTHON}/lib)
endif()
@@ -997,7 +1000,7 @@
# Common.
if(APPLE OR WIN32)
- if(NOT IS_DIRECTORY "${LIBDIR}")
+ if(NOT EXISTS "${LIBDIR}/")
message(FATAL_ERROR "Apple and Windows require pre-compiled
libs at: '${LIBDIR}'")
endif()
endif()
Modified: branches/soc-2011-salad/SConstruct
===================================================================
--- branches/soc-2011-salad/SConstruct 2011-06-27 11:40:15 UTC (rev 37855)
+++ branches/soc-2011-salad/SConstruct 2011-06-27 12:03:28 UTC (rev 37856)
@@ -306,6 +306,11 @@
env['CXXFLAGS'].append('-DDISABLE_ELBEEM')
env['CCFLAGS'].append('-DDISABLE_ELBEEM')
+# TODO, make optional
+env['CPPFLAGS'].append('-DWITH_AUDASPACE')
+env['CXXFLAGS'].append('-DWITH_AUDASPACE')
+env['CCFLAGS'].append('-DWITH_AUDASPACE')
+
# lastly we check for root_build_dir ( we should not do before, otherwise we
might do wrong builddir
B.root_build_dir = env['BF_BUILDDIR']
B.doc_build_dir = os.path.join(env['BF_INSTALLDIR'], 'doc')
Modified: branches/soc-2011-salad/build_files/cmake/macros.cmake
===================================================================
--- branches/soc-2011-salad/build_files/cmake/macros.cmake 2011-06-27
11:40:15 UTC (rev 37855)
+++ branches/soc-2011-salad/build_files/cmake/macros.cmake 2011-06-27
12:03:28 UTC (rev 37856)
@@ -39,6 +39,21 @@
endmacro()
+
+macro(target_link_libraries_optimized TARGET LIBS)
+ foreach(_LIB ${LIBS})
+ target_link_libraries(${TARGET} optimized "${_LIB}")
+ endforeach()
+ unset(_LIB)
+endmacro()
+
+macro(target_link_libraries_debug TARGET LIBS)
+ foreach(_LIB ${LIBS})
+ target_link_libraries(${TARGET} debug "${_LIB}")
+ endforeach()
+ unset(_LIB)
+endmacro()
+
# Nicer makefiles with -I/1/foo/ instead of -I/1/2/3/../../foo/
# use it instead of include_directories()
macro(blender_include_dirs
@@ -202,9 +217,8 @@
if(WIN32 AND NOT UNIX)
file_list_suffix(PYTHON_LIBRARIES_DEBUG
"${PYTHON_LIBRARIES}" "_d")
- target_link_libraries(${target}
- debug ${PYTHON_LIBRARIES_DEBUG}
- optimized ${PYTHON_LIBRARIES})
+ target_link_libraries_debug(${target}
"${PYTHON_LIBRARIES_DEBUG}")
+ target_link_libraries_optimized(${target}
"${PYTHON_LIBRARIES}")
unset(PYTHON_LIBRARIES_DEBUG)
else()
target_link_libraries(${target} ${PYTHON_LIBRARIES})
@@ -257,9 +271,8 @@
if(WITH_IMAGE_OPENEXR)
if(WIN32 AND NOT UNIX)
file_list_suffix(OPENEXR_LIBRARIES_DEBUG
"${OPENEXR_LIBRARIES}" "_d")
- target_link_libraries(${target}
- debug ${OPENEXR_LIBRARIES_DEBUG}
- optimized ${OPENEXR_LIBRARIES})
+ target_link_libraries_debug(${target}
"${OPENEXR_LIBRARIES_DEBUG}")
+ target_link_libraries_optimized(${target}
"${OPENEXR_LIBRARIES}")
unset(OPENEXR_LIBRARIES_DEBUG)
else()
target_link_libraries(${target} ${OPENEXR_LIBRARIES})
@@ -274,22 +287,19 @@
if(WITH_OPENCOLLADA)
if(WIN32 AND NOT UNIX)
file_list_suffix(OPENCOLLADA_LIBRARIES_DEBUG
"${OPENCOLLADA_LIBRARIES}" "_d")
- target_link_libraries(${target}
- debug ${OPENCOLLADA_LIBRARIES_DEBUG}
- optimized ${OPENCOLLADA_LIBRARIES})
+ target_link_libraries_debug(${target}
"${OPENCOLLADA_LIBRARIES_DEBUG}")
+ target_link_libraries_optimized(${target}
"${OPENCOLLADA_LIBRARIES}")
unset(OPENCOLLADA_LIBRARIES_DEBUG)
file_list_suffix(PCRE_LIB_DEBUG "${PCRE_LIB}" "_d")
- target_link_libraries(${target}
- debug ${PCRE_LIB_DEBUG}
- optimized ${PCRE_LIB})
+ target_link_libraries_debug(${target}
"${PCRE_LIB_DEBUG}")
+ target_link_libraries_optimized(${target} "${PCRE_LIB}")
unset(PCRE_LIB_DEBUG)
if(EXPAT_LIB)
file_list_suffix(EXPAT_LIB_DEBUG "${EXPAT_LIB}"
"_d")
- target_link_libraries(${target}
- debug ${EXPAT_LIB_DEBUG}
- optimized ${EXPAT_LIB})
+ target_link_libraries_debug(${target}
"${EXPAT_LIB_DEBUG}")
+ target_link_libraries_optimized(${target}
"${EXPAT_LIB}")
unset(EXPAT_LIB_DEBUG)
endif()
else()
Modified: branches/soc-2011-salad/build_files/scons/config/aix4-config.py
===================================================================
--- branches/soc-2011-salad/build_files/scons/config/aix4-config.py
2011-06-27 11:40:15 UTC (rev 37855)
+++ branches/soc-2011-salad/build_files/scons/config/aix4-config.py
2011-06-27 12:03:28 UTC (rev 37856)
@@ -76,11 +76,6 @@
BF_GETTEXT_LIB = 'gettextpo intl'
BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
-WITH_BF_FTGL = 'false'
-BF_FTGL = '#extern/bFTGL'
-BF_FTGL_INC = '${BF_FTGL}/include'
-BF_FTGL_LIB = 'extern_ftgl'
-
WITH_BF_GAMEENGINE='false'
WITH_BF_BULLET = 'true'
Modified: branches/soc-2011-salad/build_files/scons/config/win32-vc-config.py
===================================================================
--- branches/soc-2011-salad/build_files/scons/config/win32-vc-config.py
2011-06-27 11:40:15 UTC (rev 37855)
+++ branches/soc-2011-salad/build_files/scons/config/win32-vc-config.py
2011-06-27 12:03:28 UTC (rev 37856)
@@ -173,7 +173,7 @@
BF_DEBUG_CCFLAGS = ['/Zi', '/FR${TARGET}.sbr']
-CPPFLAGS = ['-DWIN32','-D_CONSOLE', '-D_LIB', '-DFTGL_LIBRARY_STATIC',
'-D_CRT_SECURE_NO_DEPRECATE']
+CPPFLAGS = ['-DWIN32','-D_CONSOLE', '-D_LIB', '-D_CRT_SECURE_NO_DEPRECATE']
REL_CFLAGS = ['-O2', '-DNDEBUG']
REL_CCFLAGS = ['-O2', '-DNDEBUG']
REL_CXXFLAGS = ['-O2', '-DNDEBUG']
Modified: branches/soc-2011-salad/build_files/scons/config/win64-vc-config.py
===================================================================
--- branches/soc-2011-salad/build_files/scons/config/win64-vc-config.py
2011-06-27 11:40:15 UTC (rev 37855)
+++ branches/soc-2011-salad/build_files/scons/config/win64-vc-config.py
2011-06-27 12:03:28 UTC (rev 37856)
@@ -175,7 +175,7 @@
BF_DEBUG_CCFLAGS = ['/Zi', '/FR${TARGET}.sbr', '/Od']
-CPPFLAGS = ['-DWIN32', '-D_CONSOLE', '-D_LIB', '-DFTGL_LIBRARY_STATIC',
'-D_CRT_SECURE_NO_DEPRECATE']
+CPPFLAGS = ['-DWIN32', '-D_CONSOLE', '-D_LIB', '-D_CRT_SECURE_NO_DEPRECATE']
REL_CFLAGS = ['-O2', '-DNDEBUG']
REL_CCFLAGS = ['-O2', '-DNDEBUG']
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
