[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14102] branches/ndof: 3d part of resolved conflicts
JLuc Peuriere
jlp at nerim.net
Fri Mar 14 01:17:42 CET 2008
Revision: 14102
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14102
Author: lukep
Date: 2008-03-14 01:17:42 +0100 (Fri, 14 Mar 2008)
Log Message:
-----------
3d part of resolved conflicts
still no compile
Modified Paths:
--------------
branches/ndof/CMakeLists.txt
branches/ndof/Makefile
branches/ndof/SConstruct
branches/ndof/bin/.blender/.Blanguages
branches/ndof/bin/.blender/locale/de/LC_MESSAGES/blender.mo
branches/ndof/bin/.blender/locale/fr/LC_MESSAGES/blender.mo
branches/ndof/bin/.blender/locale/it/LC_MESSAGES/blender.mo
branches/ndof/config/darwin-config.py
branches/ndof/config/linux2-config.py
branches/ndof/config/linuxcross-config.py
branches/ndof/config/openbsd3-config.py
branches/ndof/config/sunos5-config.py
branches/ndof/config/win32-mingw-config.py
branches/ndof/config/win32-vc-config.py
branches/ndof/doc/blender-scons.txt
branches/ndof/po/Makefile
branches/ndof/po/de.po
branches/ndof/po/fi.po
branches/ndof/po/fr.po
branches/ndof/po/it.po
branches/ndof/projectfiles/blender/src/BL_src.dsp
branches/ndof/projectfiles/blender/src/BL_src_cre.dsp
branches/ndof/projectfiles_vc7/blender/blender.sln
branches/ndof/projectfiles_vc7/blender/blender.vcproj
branches/ndof/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj
branches/ndof/projectfiles_vc7/blender/blenlib/BLI_blenlib.vcproj
branches/ndof/projectfiles_vc7/blender/ftfont/FTF_ftfont.vcproj
branches/ndof/projectfiles_vc7/blender/imbuf/BL_imbuf.vcproj
branches/ndof/projectfiles_vc7/blender/makesdna/DNA_makesdna.vcproj
branches/ndof/projectfiles_vc7/blender/nodes/nodes.vcproj
branches/ndof/projectfiles_vc7/blender/render/BRE_render.vcproj
branches/ndof/projectfiles_vc7/blender/src/BL_src.vcproj
branches/ndof/projectfiles_vc7/blender/src/BL_src_cre.vcproj
branches/ndof/projectfiles_vc7/gameengine/gamelogic/SCA_GameLogic.vcproj
branches/ndof/projectfiles_vc7/gameengine/gameplayer/ghost/GP_ghost.vcproj
branches/ndof/projectfiles_vc7/gameengine/rasterizer/RAS_rasterizer.vcproj
branches/ndof/projectfiles_vc7/gameengine/rasterizer/openglrasterizer/RAS_openglrasterizer.vcproj
branches/ndof/release/Makefile
branches/ndof/release/datafiles/preview.blend
branches/ndof/release/datafiles/splash.jpg
branches/ndof/release/scripts/3ds_import.py
branches/ndof/release/scripts/DirectX8Importer.py
branches/ndof/release/scripts/ac3d_import.py
branches/ndof/release/scripts/add_mesh_torus.py
branches/ndof/release/scripts/bpymodules/BPyMesh.py
branches/ndof/release/scripts/bpymodules/BPyMessages.py
branches/ndof/release/scripts/bpymodules/BPyObject.py
branches/ndof/release/scripts/bpymodules/BPyRender.py
branches/ndof/release/scripts/bpymodules/colladaImEx/collada.py
branches/ndof/release/scripts/bpymodules/colladaImEx/cstartup.py
branches/ndof/release/scripts/bpymodules/colladaImEx/cutils.py
branches/ndof/release/scripts/bpymodules/colladaImEx/helperObjects.py
branches/ndof/release/scripts/bpymodules/colladaImEx/xmlUtils.py
branches/ndof/release/scripts/bpymodules/paths_ai2obj.py
branches/ndof/release/scripts/bpymodules/paths_gimp2obj.py
branches/ndof/release/scripts/bvh_import.py
branches/ndof/release/scripts/colladaExport14.py
branches/ndof/release/scripts/colladaImport14.py
branches/ndof/release/scripts/collada_export.py
branches/ndof/release/scripts/collada_import.py
branches/ndof/release/scripts/console.py
branches/ndof/release/scripts/export_fbx.py
branches/ndof/release/scripts/export_m3g.py
branches/ndof/release/scripts/export_mdd.py
branches/ndof/release/scripts/export_obj.py
branches/ndof/release/scripts/flt_export.py
branches/ndof/release/scripts/flt_filewalker.py
branches/ndof/release/scripts/flt_import.py
branches/ndof/release/scripts/image_auto_layout.py
branches/ndof/release/scripts/image_billboard.py
branches/ndof/release/scripts/import_dxf.py
branches/ndof/release/scripts/import_mdd.py
branches/ndof/release/scripts/import_obj.py
branches/ndof/release/scripts/lightwave_import.py
branches/ndof/release/scripts/mesh_edges2curves.py
branches/ndof/release/scripts/mesh_skin.py
branches/ndof/release/scripts/mesh_unfolder.py
branches/ndof/release/scripts/mesh_wire.py
branches/ndof/release/scripts/object_drop.py
branches/ndof/release/scripts/object_find.py
branches/ndof/release/scripts/object_random_loc_sz_rot.py
branches/ndof/release/scripts/ply_export.py
branches/ndof/release/scripts/ply_import.py
branches/ndof/release/scripts/save_theme.py
branches/ndof/release/scripts/scripttemplate_mesh_edit.py
branches/ndof/release/scripts/uv_export.py
branches/ndof/release/scripts/uv_seams_from_islands.py
branches/ndof/release/scripts/uvcalc_follow_active_coords.py
branches/ndof/release/scripts/uvcalc_lightmap.py
branches/ndof/release/scripts/uvcalc_quad_clickproj.py
branches/ndof/release/scripts/uvcalc_smart_project.py
branches/ndof/release/scripts/vertexpaint_selfshadow_ao.py
branches/ndof/release/scripts/vrml97_export.py
branches/ndof/release/scripts/weightpaint_normalize.py
branches/ndof/release/scripts/x3d_export.py
branches/ndof/release/text/BlenderQuickStart.pdf
branches/ndof/release/windows/installer/00.sconsblender.nsi
branches/ndof/tools/Blender.py
branches/ndof/tools/btools.py
Added Paths:
-----------
branches/ndof/bin/.blender/locale/el/
branches/ndof/bin/.blender/locale/el/LC_MESSAGES/
branches/ndof/bin/.blender/locale/el/LC_MESSAGES/blender.mo
branches/ndof/po/el.po
branches/ndof/release/datafiles/prvicons
branches/ndof/release/getversion.py
branches/ndof/release/scripts/add_mesh_empty.py
branches/ndof/release/scripts/bpymodules/blend2renderinfo.py
branches/ndof/release/scripts/flt_defaultp.py
branches/ndof/release/scripts/flt_palettemanager.py
branches/ndof/release/scripts/flt_properties.py
branches/ndof/release/scripts/flt_toolbar.py
branches/ndof/release/scripts/object_timeofs_follow_act.py
branches/ndof/release/scripts/render_save_layers.py
branches/ndof/release/scripts/scripttemplate_pyconstraint.py
branches/ndof/release/scripts/weightpaint_average.py
branches/ndof/release/scripts/weightpaint_invert.py
branches/ndof/release/scripts/wizard_curve2tree.py
Removed Paths:
-------------
branches/ndof/bin/.blender/locale/el/LC_MESSAGES/
branches/ndof/bin/.blender/locale/el/LC_MESSAGES/blender.mo
branches/ndof/bin/.blender/locale/pt_br/
branches/ndof/bin/.blender/locale/zh_cn/
branches/ndof/release/scripts/image_find_paths.py
branches/ndof/release/scripts/uvcalc_from_adjacent.py
Property Changed:
----------------
branches/ndof/projectfiles/blender/yafray/BRE_yafray.dsp
branches/ndof/release/datafiles/.Bfs
branches/ndof/release/datafiles/DejaVuSans-Lite.sfd.bz2
branches/ndof/release/datafiles/blenderbuttons
branches/ndof/release/datafiles/splash.jpg
branches/ndof/release/freedesktop/icons/16x16/blender.png
branches/ndof/release/freedesktop/icons/16x16/blender.xcf.bz2
branches/ndof/release/freedesktop/icons/22x22/blender.png
branches/ndof/release/freedesktop/icons/22x22/blender.xcf.bz2
branches/ndof/release/freedesktop/icons/32x32/blender.png
branches/ndof/release/freedesktop/icons/32x32/blender.svg
branches/ndof/release/scripts/IDPropBrowser.py
branches/ndof/release/scripts/bpymodules/BPyWindow.py
branches/ndof/release/scripts/bpymodules/colladaImEx/logo.png
branches/ndof/release/scripts/bpymodules/mesh_gradient.py
branches/ndof/release/scripts/flt_export.py
branches/ndof/release/scripts/flt_import.py
branches/ndof/release/scripts/mesh_boneweight_copy.py
branches/ndof/release/scripts/object_cookie_cutter.py
branches/ndof/release/scripts/object_random_loc_sz_rot.py
branches/ndof/release/scripts/vertexpaint_gradient.py
branches/ndof/release/scripts/weightpaint_gradient.py
branches/ndof/release/text/BlenderQuickStart.pdf
branches/ndof/release/text/blender.html
branches/ndof/release/windows/extra/Python24.zip
branches/ndof/release/windows/extra/python25.zip
branches/ndof/release/windows/installer/00.checked.bmp
branches/ndof/release/windows/installer/00.header.bmp
branches/ndof/release/windows/installer/00.unchecked.bmp
branches/ndof/release/windows/installer/01.installer.bmp
branches/ndof/release/windows/publ_installer/01.installer.bmp
Modified: branches/ndof/CMakeLists.txt
===================================================================
--- branches/ndof/CMakeLists.txt 2008-03-14 00:05:20 UTC (rev 14101)
+++ branches/ndof/CMakeLists.txt 2008-03-14 00:17:42 UTC (rev 14102)
@@ -65,8 +65,9 @@
OPTION(WITH_QUICKTIME "Enable Quicktime Support" OFF)
OPTION(WITH_OPENEXR "Enable OpenEXR Support (http://www.openexr.com)" OFF)
OPTION(WITH_FFMPEG "Enable FFMPeg Support (http://ffmpeg.mplayerhq.hu/)" OFF)
-OPTION(WITH_OPENAL "Enable OpenAL Support (http://www.openal.org)" ON)
-OPTION(YESIAMSTUPID "Enable execution on 64-bit platforms" OFF)
+OPTION(WITH_OPENAL "Enable OpenAL Support (http://www.openal.org)" ON)
+OPTION(YESIAMSTUPID "Enable execution on 64-bit platforms" OFF)
+OPTION(WITH_OPENMP "Enable OpenMP (has to be supported by the compiler)" OFF)
IF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
MESSAGE("WARNING: WITH_PLAYER needs WITH_GAMEENGINE")
@@ -183,6 +184,13 @@
SET(LLIBS "-lXi -lutil -lc -lm -lpthread -lstdc++")
+ IF(WITH_OPENMP)
+ SET(LLIBS "${LLIBS} -lgomp ")
+ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fopenmp ")
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp ")
+ ENDIF(WITH_OPENMP)
+
+
SET(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing -DXP_UNIX -Wno-char-subscripts")
SET(PLATFORM_LINKFLAGS "-pthread")
@@ -239,7 +247,11 @@
SET(OPENEXR ${LIBDIR}/openexr)
SET(OPENEXR_INC ${OPENEXR}/include ${OPENEXR}/include/IlmImf ${OPENEXR}/include/Iex ${OPENEXR}/include/Imath)
SET(OPENEXR_LIB Iex Half IlmImf Imath IlmThread)
+ IF (MSVC80)
+ SET(OPENEXR_LIBPATH ${OPENEXR}/lib_vs2005)
+ ELSE (MSVC80)
SET(OPENEXR_LIBPATH ${OPENEXR}/lib_msvc)
+ ENDIF(MSVC80)
SET(QUICKTIME ${LIBDIR}/QTDevWin)
SET(QUICKTIME_INC ${QUICKTIME}/CIncludes)
@@ -265,6 +277,11 @@
SET(CMAKE_C_FLAGS_MINSIZEREL "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305 /O1 /Ob1 /DNDEBUG /EHsc /MT /W3 /nologo /J" CACHE STRING "MSVC MT flags " FORCE)
SET(CMAKE_C_FLAGS_RELWITHDEBINFO "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305 /O2 /Ob1 /DNDEBUG /EHsc /MT /W3 /nologo /Zi /J" CACHE STRING "MSVC MT flags " FORCE)
+ IF(WITH_OPENMP)
+ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /openmp ")
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /openmp ")
+ ENDIF(WITH_OPENMP)
+
SET(SDL ${LIBDIR}/sdl)
SET(SDL_INC ${SDL}/include)
SET(SDL_LIB SDL)
@@ -342,6 +359,12 @@
SET(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing")
SET(PLATFORM_LINKFLAGS "-fexceptions -framework CoreServices -framework Foundation -framework IOKit -framework AppKit -framework Carbon -framework AGL -framework AudioUnit -framework AudioToolbox -framework CoreAudio -framework QuickTime")
+ IF(WITH_OPENMP)
+ SET(LLIBS "${LLIBS} -lgomp ")
+ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fopenmp ")
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp ")
+ ENDIF(WITH_OPENMP)
+
SET(SDL ${LIBDIR}/sdl)
SET(SDL_INC ${SDL}/include)
SET(SDL_LIB SDL)
@@ -361,6 +384,11 @@
SET(EXETYPE MACOSX_BUNDLE)
ENDIF(APPLE)
+IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+ SET(BINRELOC ${CMAKE_SOURCE_DIR}/extern/binreloc)
+ SET(BINRELOC_INC ${BINRELOC}/include)
+ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+
#-----------------------------------------------------------------------------
# Common.
SET(VERSE_INC ${CMAKE_SOURCE_DIR}/extern/verse/dist)
@@ -379,6 +407,9 @@
IF(WITH_GAMEENGINE)
SET(PLATFORM_CFLAGS "${PLATFORM_CFLAGS} -DGAMEBLENDER ")
ENDIF(WITH_GAMEENGINE)
+IF(WITH_BULLET)
+ SET(PLATFORM_CFLAGS "${PLATFORM_CFLAGS} -DWITH_BULLET ")
+ENDIF(WITH_BULLET)
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${PLATFORM_CFLAGS} ")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${PLATFORM_CFLAGS} ")
Modified: branches/ndof/Makefile
===================================================================
--- branches/ndof/Makefile 2008-03-14 00:05:20 UTC (rev 14101)
+++ branches/ndof/Makefile 2008-03-14 00:17:42 UTC (rev 14102)
@@ -47,10 +47,15 @@
SOURCEDIR =
ifeq ($(FREE_WINDOWS),true)
- DIRS ?= dlltool extern intern source po
+ DIRS ?= dlltool extern intern source
endif
-DIRS ?= extern intern source po
+DIRS ?= extern intern source
+
+ifneq ($(INTERNATIONAL),false)
+ DIRS += po
+endif
+
include source/nan_subdirs.mk
.PHONY: release
Modified: branches/ndof/SConstruct
===================================================================
--- branches/ndof/SConstruct 2008-03-14 00:05:20 UTC (rev 14101)
+++ branches/ndof/SConstruct 2008-03-14 00:17:42 UTC (rev 14102)
@@ -170,12 +170,32 @@
opts = btools.read_opts(optfiles, B.arguments)
opts.Update(env)
+if not env['BF_FANCY']:
+ B.bc.disable()
+
# disable elbeem (fluidsim) compilation?
if env['BF_NO_ELBEEM'] == 1:
env['CPPFLAGS'].append('-DDISABLE_ELBEEM')
env['CXXFLAGS'].append('-DDISABLE_ELBEEM')
env['CCFLAGS'].append('-DDISABLE_ELBEEM')
+if env['WITH_BF_OPENMP'] == 1:
+ if env['OURPLATFORM']=='win32-vc':
+ env['CCFLAGS'].append('/openmp')
+ env['CPPFLAGS'].append('/openmp')
+ env['CXXFLAGS'].append('/openmp')
+ else:
+ if env['CC'] == 'icc':
+ env.Append(LINKFLAGS=['-openmp', '-static-intel'])
+ env['CCFLAGS'].append('-openmp')
+ env['CPPFLAGS'].append('-openmp')
+ env['CXXFLAGS'].append('-openmp')
+ else:
+ env.Append(LINKFLAGS=['-lgomp'])
+ env['CCFLAGS'].append('-fopenmp')
+ env['CPPFLAGS'].append('-fopenmp')
+ env['CXXFLAGS'].append('-fopenmp')
+
#check for additional debug libnames
if env.has_key('BF_DEBUG_LIBS'):
@@ -241,13 +261,16 @@
do_clean = True
if not quickie and do_clean:
- print B.bc.HEADER+'Cleaning...'+B.bc.ENDC
- dirs = os.listdir(B.root_build_dir)
- for dir in dirs:
- if os.path.isdir(B.root_build_dir + dir) == 1:
- print "clean dir %s"%(B.root_build_dir+dir)
- shutil.rmtree(B.root_build_dir+dir)
- print B.bc.OKGREEN+'...done'+B.bc.ENDC
+ if os.path.exists(B.root_build_dir):
+ print B.bc.HEADER+'Cleaning...'+B.bc.ENDC
+ dirs = os.listdir(B.root_build_dir)
+ for dir in dirs:
+ if os.path.isdir(B.root_build_dir + dir) == 1:
+ print "clean dir %s"%(B.root_build_dir+dir)
+ shutil.rmtree(B.root_build_dir+dir)
+ print B.bc.OKGREEN+'...done'+B.bc.ENDC
+ else:
+ print B.bc.HEADER+'Already Clean, nothing to do.'+B.bc.ENDC
Exit()
if not os.path.isdir ( B.root_build_dir):
@@ -390,12 +413,12 @@
dllsources = ['${LCGDIR}/gettext/lib/gnu_gettext.dll',
'${LCGDIR}/png/lib/libpng.dll',
'#release/windows/extra/python25.zip',
-# '#release/windows/extra/zlib.pyd',
+ '#release/windows/extra/zlib.pyd',
'${LCGDIR}/sdl/lib/SDL.dll',
'${LCGDIR}/zlib/lib/zlib.dll',
'${LCGDIR}/tiff/lib/libtiff.dll']
if env['BF_DEBUG']:
- dllsources.append('${LCGDIR}/python/lib/${BF_PYTHON_LIB}.dll')
+ dllsources.append('${LCGDIR}/python/lib/${BF_PYTHON_LIB}_d.dll')
else:
dllsources.append('${LCGDIR}/python/lib/${BF_PYTHON_LIB}.dll')
if env['OURPLATFORM'] == 'win32-mingw':
@@ -404,10 +427,10 @@
dllsources += ['${LCGDIR}/pthreads/lib/pthreadVC2.dll']
if env['WITH_BF_ICONV']:
dllsources += ['${LCGDIR}/iconv/lib/iconv.dll']
- if env['WITH_BF_FFMPEG']:
- dllsources += ['${LCGDIR}/ffmpeg/lib/avcodec-51.dll',
- '${LCGDIR}/ffmpeg/lib/avformat-51.dll',
- '${LCGDIR}/ffmpeg/lib/avutil-49.dll']
+# if env['WITH_BF_FFMPEG']:
+# dllsources += ['${LCGDIR}/ffmpeg/lib/avcodec-51.dll',
+# '${LCGDIR}/ffmpeg/lib/avformat-51.dll',
+# '${LCGDIR}/ffmpeg/lib/avutil-49.dll']
windlls = env.Install(dir=env['BF_INSTALLDIR'], source = dllsources)
allinstall += windlls
@@ -429,8 +452,10 @@
Depends(nsiscmd, allinstall)
Default(B.program_list)
-Default(installtarget)
+if not env['WITHOUT_BF_INSTALL']:
+ Default(installtarget)
+
#------------ RELEASE
# TODO: zipup the installation
Modified: branches/ndof/bin/.blender/.Blanguages
===================================================================
--- branches/ndof/bin/.blender/.Blanguages 2008-03-14 00:05:20 UTC (rev 14101)
+++ branches/ndof/bin/.blender/.Blanguages 2008-03-14 00:17:42 UTC (rev 14102)
@@ -19,3 +19,4 @@
Romanian:ro
Arabic:ar
Bulgarian:bg
+Greek:el
Modified: branches/ndof/bin/.blender/locale/de/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)
Copied: branches/ndof/bin/.blender/locale/el (from rev 14096, trunk/blender/bin/.blender/locale/el)
Copied: branches/ndof/bin/.blender/locale/el/LC_MESSAGES (from rev 14096, trunk/blender/bin/.blender/locale/el/LC_MESSAGES)
Deleted: branches/ndof/bin/.blender/locale/el/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)
Copied: branches/ndof/bin/.blender/locale/el/LC_MESSAGES/blender.mo (from rev 14096, trunk/blender/bin/.blender/locale/el/LC_MESSAGES/blender.mo)
===================================================================
(Binary files differ)
Modified: branches/ndof/bin/.blender/locale/fr/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)
Modified: branches/ndof/bin/.blender/locale/it/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)
Modified: branches/ndof/config/darwin-config.py
===================================================================
--- branches/ndof/config/darwin-config.py 2008-03-14 00:05:20 UTC (rev 14101)
+++ branches/ndof/config/darwin-config.py 2008-03-14 00:17:42 UTC (rev 14102)
@@ -54,6 +54,8 @@
BF_OPENEXR_LIB = ' Iex Half IlmImf Imath IlmThread'
BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib'
+WITH_BF_DDS = 'true'
+
WITH_BF_JPEG = 'true'
BF_JPEG = LIBDIR + '/jpeg'
BF_JPEG_INC = '${BF_JPEG}/include'
Modified: branches/ndof/config/linux2-config.py
===================================================================
--- branches/ndof/config/linux2-config.py 2008-03-14 00:05:20 UTC (rev 14101)
+++ branches/ndof/config/linux2-config.py 2008-03-14 00:17:42 UTC (rev 14102)
@@ -29,9 +29,15 @@
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list