[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47146] branches/soc-2012-swiss_cheese: Merged w/ Trunk r46993-r46142
Jason Wilkins
Jason.A.Wilkins at gmail.com
Tue May 29 02:16:09 CEST 2012
Revision: 47146
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47146
Author: jwilkins
Date: 2012-05-29 00:16:08 +0000 (Tue, 29 May 2012)
Log Message:
-----------
Merged w/ Trunk r46993-r46142
This merge was funny. The merge-info property was not up to date from the last merge and there were conflicts with things that should have been merged before.
I did my best to fix things up.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46993
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46142
Modified Paths:
--------------
branches/soc-2012-swiss_cheese/CMakeLists.txt
branches/soc-2012-swiss_cheese/intern/ghost/CMakeLists.txt
branches/soc-2012-swiss_cheese/intern/ghost/GHOST_ISystemPaths.h
branches/soc-2012-swiss_cheese/intern/ghost/GHOST_Path-api.h
branches/soc-2012-swiss_cheese/intern/ghost/intern/GHOST_Debug.h
branches/soc-2012-swiss_cheese/intern/ghost/intern/GHOST_Path-api.cpp
branches/soc-2012-swiss_cheese/intern/ghost/intern/GHOST_System.cpp
branches/soc-2012-swiss_cheese/intern/ghost/intern/GHOST_SystemPaths.h
branches/soc-2012-swiss_cheese/intern/ghost/intern/GHOST_SystemPathsWin32.cpp
branches/soc-2012-swiss_cheese/intern/ghost/intern/GHOST_SystemPathsWin32.h
branches/soc-2012-swiss_cheese/intern/ghost/intern/GHOST_SystemWin32.cpp
branches/soc-2012-swiss_cheese/intern/guardedalloc/intern/mallocn.c
branches/soc-2012-swiss_cheese/intern/utfconv/utfconv.c
branches/soc-2012-swiss_cheese/source/blender/blenfont/intern/blf.c
branches/soc-2012-swiss_cheese/source/blender/blenfont/intern/blf_font.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/CCGSubSurf.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/anim_sys.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/armature.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/blender.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/bullet.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/constraint.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/context.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/customdata.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/editderivedmesh.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/effect.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/fmodifier.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/group.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/image.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/image_gen.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/ipo.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/lattice.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/library.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/material.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/mball.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/mesh.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/mesh_validate.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/multires.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/object.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/particle.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/particle_system.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/pointcache.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/scene.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/seqeffects.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/sequencer.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/shrinkwrap.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/smoke.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/softbody.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/subsurf_ccg.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/text.c
branches/soc-2012-swiss_cheese/source/blender/blenlib/BLI_ghash.h
branches/soc-2012-swiss_cheese/source/blender/blenlib/BLI_kdtree.h
branches/soc-2012-swiss_cheese/source/blender/blenlib/BLI_math_base.h
branches/soc-2012-swiss_cheese/source/blender/blenlib/BLI_math_color.h
branches/soc-2012-swiss_cheese/source/blender/blenlib/BLI_utildefines.h
branches/soc-2012-swiss_cheese/source/blender/blenlib/CMakeLists.txt
branches/soc-2012-swiss_cheese/source/blender/blenlib/PIL_time.h
branches/soc-2012-swiss_cheese/source/blender/blenlib/intern/BLI_ghash.c
branches/soc-2012-swiss_cheese/source/blender/blenlib/intern/BLI_heap.c
branches/soc-2012-swiss_cheese/source/blender/blenlib/intern/BLI_kdopbvh.c
branches/soc-2012-swiss_cheese/source/blender/blenlib/intern/BLI_kdtree.c
branches/soc-2012-swiss_cheese/source/blender/blenlib/intern/bpath.c
branches/soc-2012-swiss_cheese/source/blender/blenlib/intern/edgehash.c
branches/soc-2012-swiss_cheese/source/blender/blenlib/intern/math_color.c
branches/soc-2012-swiss_cheese/source/blender/blenlib/intern/noise.c
branches/soc-2012-swiss_cheese/source/blender/blenlib/intern/path_util.c
branches/soc-2012-swiss_cheese/source/blender/blenlib/intern/string_utf8.c
branches/soc-2012-swiss_cheese/source/blender/blenlib/intern/threads.c
branches/soc-2012-swiss_cheese/source/blender/blenloader/intern/readfile.c
branches/soc-2012-swiss_cheese/source/blender/blenloader/intern/readfile.h
branches/soc-2012-swiss_cheese/source/blender/blenloader/intern/runtime.c
branches/soc-2012-swiss_cheese/source/blender/blenpluginapi/iff.h
branches/soc-2012-swiss_cheese/source/blender/blenpluginapi/util.h
branches/soc-2012-swiss_cheese/source/blender/bmesh/intern/bmesh_core.c
branches/soc-2012-swiss_cheese/source/blender/bmesh/intern/bmesh_queries.c
branches/soc-2012-swiss_cheese/source/blender/bmesh/intern/bmesh_queries.h
branches/soc-2012-swiss_cheese/source/blender/bmesh/operators/bmo_connect.c
branches/soc-2012-swiss_cheese/source/blender/compositor/intern/COM_WorkScheduler.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/operations/COM_MovieClipOperation.cpp
branches/soc-2012-swiss_cheese/source/blender/editors/animation/anim_channels_defines.c
branches/soc-2012-swiss_cheese/source/blender/editors/animation/anim_channels_edit.c
branches/soc-2012-swiss_cheese/source/blender/editors/animation/anim_ipo_utils.c
branches/soc-2012-swiss_cheese/source/blender/editors/animation/drivers.c
branches/soc-2012-swiss_cheese/source/blender/editors/animation/fmodifier_ui.c
branches/soc-2012-swiss_cheese/source/blender/editors/animation/keyframes_edit.c
branches/soc-2012-swiss_cheese/source/blender/editors/armature/BIF_generate.h
branches/soc-2012-swiss_cheese/source/blender/editors/armature/editarmature.c
branches/soc-2012-swiss_cheese/source/blender/editors/armature/editarmature_generate.c
branches/soc-2012-swiss_cheese/source/blender/editors/armature/poselib.c
branches/soc-2012-swiss_cheese/source/blender/editors/armature/poseobject.c
branches/soc-2012-swiss_cheese/source/blender/editors/armature/reeb.c
branches/soc-2012-swiss_cheese/source/blender/editors/curve/editcurve.c
branches/soc-2012-swiss_cheese/source/blender/editors/datafiles/Bfont.c
branches/soc-2012-swiss_cheese/source/blender/editors/gpencil/gpencil_paint.c
branches/soc-2012-swiss_cheese/source/blender/editors/include/ED_anim_api.h
branches/soc-2012-swiss_cheese/source/blender/editors/include/ED_keyframes_edit.h
branches/soc-2012-swiss_cheese/source/blender/editors/include/ED_object.h
branches/soc-2012-swiss_cheese/source/blender/editors/include/ED_screen.h
branches/soc-2012-swiss_cheese/source/blender/editors/interface/interface.c
branches/soc-2012-swiss_cheese/source/blender/editors/interface/interface_handlers.c
branches/soc-2012-swiss_cheese/source/blender/editors/interface/interface_panel.c
branches/soc-2012-swiss_cheese/source/blender/editors/interface/interface_regions.c
branches/soc-2012-swiss_cheese/source/blender/editors/interface/interface_templates.c
branches/soc-2012-swiss_cheese/source/blender/editors/interface/interface_widgets.c
branches/soc-2012-swiss_cheese/source/blender/editors/interface/resources.c
branches/soc-2012-swiss_cheese/source/blender/editors/interface/view2d.c
branches/soc-2012-swiss_cheese/source/blender/editors/mesh/editmesh_add.c
branches/soc-2012-swiss_cheese/source/blender/editors/mesh/editmesh_bvh.c
branches/soc-2012-swiss_cheese/source/blender/editors/object/object_add.c
branches/soc-2012-swiss_cheese/source/blender/editors/object/object_edit.c
branches/soc-2012-swiss_cheese/source/blender/editors/object/object_modifier.c
branches/soc-2012-swiss_cheese/source/blender/editors/object/object_shapekey.c
branches/soc-2012-swiss_cheese/source/blender/editors/object/object_vgroup.c
branches/soc-2012-swiss_cheese/source/blender/editors/physics/dynamicpaint_ops.c
branches/soc-2012-swiss_cheese/source/blender/editors/physics/physics_fluid.c
branches/soc-2012-swiss_cheese/source/blender/editors/render/render_internal.c
branches/soc-2012-swiss_cheese/source/blender/editors/screen/screen_edit.c
branches/soc-2012-swiss_cheese/source/blender/editors/screen/screen_ops.c
branches/soc-2012-swiss_cheese/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2012-swiss_cheese/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_buttons/buttons_header.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_clip/clip_dopesheet_draw.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_clip/clip_ops.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_clip/tracking_ops.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_image/CMakeLists.txt
branches/soc-2012-swiss_cheese/source/blender/editors/space_image/image_buttons.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_node/drawnode.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_node/node_edit.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_outliner/outliner_intern.h
branches/soc-2012-swiss_cheese/source/blender/editors/space_outliner/outliner_tools.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_outliner/outliner_tree.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_text/space_text.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_view3d/drawarmature.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_view3d/drawobject.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_view3d/drawvolume.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_view3d/view3d_fly.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2012-swiss_cheese/source/blender/editors/transform/transform.c
branches/soc-2012-swiss_cheese/source/blender/editors/transform/transform_conversions.c
branches/soc-2012-swiss_cheese/source/blender/editors/transform/transform_generics.c
branches/soc-2012-swiss_cheese/source/blender/editors/util/editmode_undo.c
branches/soc-2012-swiss_cheese/source/blender/editors/uvedit/uvedit_parametrizer.c
branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_buffers.c
branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_draw.c
branches/soc-2012-swiss_cheese/source/blender/ikplugin/intern/iksolver_plugin.c
branches/soc-2012-swiss_cheese/source/blender/imbuf/IMB_imbuf.h
branches/soc-2012-swiss_cheese/source/blender/imbuf/intern/anim_movie.c
branches/soc-2012-swiss_cheese/source/blender/imbuf/intern/divers.c
branches/soc-2012-swiss_cheese/source/blender/imbuf/intern/jpeg.c
branches/soc-2012-swiss_cheese/source/blender/imbuf/intern/rectop.c
branches/soc-2012-swiss_cheese/source/blender/imbuf/intern/targa.c
branches/soc-2012-swiss_cheese/source/blender/makesdna/DNA_modifier_types.h
branches/soc-2012-swiss_cheese/source/blender/makesdna/DNA_object_types.h
branches/soc-2012-swiss_cheese/source/blender/makesdna/DNA_view3d_types.h
branches/soc-2012-swiss_cheese/source/blender/makesdna/intern/CMakeLists.txt
branches/soc-2012-swiss_cheese/source/blender/makesdna/intern/dna_genfile.c
branches/soc-2012-swiss_cheese/source/blender/makesdna/intern/makesdna.c
branches/soc-2012-swiss_cheese/source/blender/makesrna/intern/CMakeLists.txt
branches/soc-2012-swiss_cheese/source/blender/makesrna/intern/makesrna.c
branches/soc-2012-swiss_cheese/source/blender/makesrna/intern/rna_access.c
branches/soc-2012-swiss_cheese/source/blender/makesrna/intern/rna_color.c
branches/soc-2012-swiss_cheese/source/blender/makesrna/intern/rna_define.c
branches/soc-2012-swiss_cheese/source/blender/makesrna/intern/rna_image.c
branches/soc-2012-swiss_cheese/source/blender/makesrna/intern/rna_image_api.c
branches/soc-2012-swiss_cheese/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2012-swiss_cheese/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2012-swiss_cheese/source/blender/makesrna/intern/rna_object.c
branches/soc-2012-swiss_cheese/source/blender/makesrna/intern/rna_particle.c
branches/soc-2012-swiss_cheese/source/blender/makesrna/intern/rna_scene_api.c
branches/soc-2012-swiss_cheese/source/blender/makesrna/intern/rna_screen.c
branches/soc-2012-swiss_cheese/source/blender/makesrna/intern/rna_space.c
branches/soc-2012-swiss_cheese/source/blender/modifiers/intern/MOD_skin.c
branches/soc-2012-swiss_cheese/source/blender/modifiers/intern/MOD_solidify.c
branches/soc-2012-swiss_cheese/source/blender/modifiers/intern/MOD_weightvg_util.c
branches/soc-2012-swiss_cheese/source/blender/nodes/composite/node_composite_util.c
branches/soc-2012-swiss_cheese/source/blender/nodes/composite/node_composite_util.h
branches/soc-2012-swiss_cheese/source/blender/nodes/intern/node_common.c
branches/soc-2012-swiss_cheese/source/blender/python/generic/py_capi_utils.c
branches/soc-2012-swiss_cheese/source/blender/python/intern/bpy_interface.c
branches/soc-2012-swiss_cheese/source/blender/python/intern/bpy_props.c
branches/soc-2012-swiss_cheese/source/blender/python/intern/bpy_rna.c
branches/soc-2012-swiss_cheese/source/blender/python/mathutils/mathutils_Color.c
branches/soc-2012-swiss_cheese/source/blender/render/intern/include/pixelblending.h
branches/soc-2012-swiss_cheese/source/blender/render/intern/include/rendercore.h
branches/soc-2012-swiss_cheese/source/blender/render/intern/include/renderdatabase.h
branches/soc-2012-swiss_cheese/source/blender/render/intern/include/shading.h
branches/soc-2012-swiss_cheese/source/blender/render/intern/include/sss.h
branches/soc-2012-swiss_cheese/source/blender/render/intern/include/texture.h
branches/soc-2012-swiss_cheese/source/blender/render/intern/include/zbuf.h
branches/soc-2012-swiss_cheese/source/blender/render/intern/source/convertblender.c
branches/soc-2012-swiss_cheese/source/blender/render/intern/source/envmap.c
branches/soc-2012-swiss_cheese/source/blender/render/intern/source/imagetexture.c
branches/soc-2012-swiss_cheese/source/blender/render/intern/source/pixelblending.c
branches/soc-2012-swiss_cheese/source/blender/render/intern/source/pixelshading.c
branches/soc-2012-swiss_cheese/source/blender/render/intern/source/rayshade.c
branches/soc-2012-swiss_cheese/source/blender/render/intern/source/render_texture.c
branches/soc-2012-swiss_cheese/source/blender/render/intern/source/rendercore.c
branches/soc-2012-swiss_cheese/source/blender/render/intern/source/renderdatabase.c
branches/soc-2012-swiss_cheese/source/blender/render/intern/source/shadbuf.c
branches/soc-2012-swiss_cheese/source/blender/render/intern/source/shadeoutput.c
branches/soc-2012-swiss_cheese/source/blender/render/intern/source/sss.c
branches/soc-2012-swiss_cheese/source/blender/render/intern/source/strand.c
branches/soc-2012-swiss_cheese/source/blender/render/intern/source/zbuf.c
branches/soc-2012-swiss_cheese/source/blender/windowmanager/WM_api.h
branches/soc-2012-swiss_cheese/source/blender/windowmanager/intern/wm_cursors.c
branches/soc-2012-swiss_cheese/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2012-swiss_cheese/source/blender/windowmanager/intern/wm_gesture.c
branches/soc-2012-swiss_cheese/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2012-swiss_cheese/source/blender/windowmanager/intern/wm_subwindow.c
branches/soc-2012-swiss_cheese/source/blender/windowmanager/intern/wm_window.c
branches/soc-2012-swiss_cheese/source/blenderplayer/CMakeLists.txt
branches/soc-2012-swiss_cheese/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2012-swiss_cheese/source/creator/CMakeLists.txt
branches/soc-2012-swiss_cheese/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soc-2012-swiss_cheese/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp
branches/soc-2012-swiss_cheese/source/gameengine/Ketsji/KX_BulletPhysicsController.h
branches/soc-2012-swiss_cheese/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h
branches/soc-2012-swiss_cheese/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
branches/soc-2012-swiss_cheese/source/gameengine/Ketsji/KX_IPhysicsController.cpp
branches/soc-2012-swiss_cheese/source/gameengine/Ketsji/KX_IPhysicsController.h
branches/soc-2012-swiss_cheese/source/gameengine/Ketsji/KX_Scene.cpp
branches/soc-2012-swiss_cheese/source/gameengine/Physics/common/PHY_Pro.h
branches/soc-2012-swiss_cheese/source/gameengine/VideoTexture/VideoFFmpeg.cpp
Property Changed:
----------------
branches/soc-2012-swiss_cheese/source/blender/editors/interface/interface.c
Modified: branches/soc-2012-swiss_cheese/CMakeLists.txt
===================================================================
--- branches/soc-2012-swiss_cheese/CMakeLists.txt 2012-05-28 23:53:28 UTC (rev 47145)
+++ branches/soc-2012-swiss_cheese/CMakeLists.txt 2012-05-29 00:16:08 UTC (rev 47146)
@@ -1,4 +1,3 @@
-# -*- mode: cmake; indent-tabs-mode: t; -*-
# ***** BEGIN GPL LICENSE BLOCK *****
#
# This program is free software; you can redistribute it and/or
@@ -161,8 +160,6 @@
option(WITH_X11_XINPUT "Enable X11 Xinput (tablet support and unicode input)" ON)
option(WITH_X11_XF86VMODE "Enable X11 video mode switching" ON)
option(WITH_BUILTIN_GLEW "Use GLEW OpenGL wrapper library bundled with blender" ON)
- option(WITH_XDG_USER_DIRS "Build with XDG Base Directory Specification (only config and documents for now)" OFF)
- mark_as_advanced(WITH_XDG_USER_DIRS)
# freebsd doesn't seems to support XDND
if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
@@ -231,8 +228,10 @@
set(PYTHON_NUMPY_PATH "" CACHE PATH "Python to python site-packages or dist-packages containing 'numpy' module")
mark_as_advanced(PYTHON_NUMPY_PATH)
-option(WITH_MINGW64 "Use the 64-bit version of MinGW" OFF)
-mark_as_advanced(WITH_MINGW64)
+if(MINGW)
+ option(WITH_MINGW64 "Use the 64-bit version of MinGW" OFF)
+ mark_as_advanced(WITH_MINGW64)
+endif()
# Cycles
option(WITH_CYCLES "Enable cycles Render Engine" ON)
@@ -627,7 +626,7 @@
endif()
mark_as_advanced(FFMPEG)
- set(FFMPEG_INCLUDE_DIRS ${FFMPEG}/include)
+ set(FFMPEG_INCLUDE_DIRS ${FFMPEG}/include ${FFMPEG}/include/ffmpeg)
mark_as_advanced(FFMPEG_LIBRARIES)
set(FFMPEG_LIBPATH ${FFMPEG}/lib)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D__STDC_CONSTANT_MACROS")
@@ -1184,7 +1183,7 @@
if(WITH_CODEC_FFMPEG)
set(FFMPEG ${LIBDIR}/ffmpeg)
- set(FFMPEG_INCLUDE_DIRS ${FFMPEG}/include ${FFMPEG}/include)
+ set(FFMPEG_INCLUDE_DIRS ${FFMPEG}/include)
if(WITH_MINGW64)
set(FFMPEG_LIBRARIES avcodec.dll avformat.dll avdevice.dll avutil.dll swscale.dll swresample.dll)
else()
Modified: branches/soc-2012-swiss_cheese/intern/ghost/CMakeLists.txt
===================================================================
--- branches/soc-2012-swiss_cheese/intern/ghost/CMakeLists.txt 2012-05-28 23:53:28 UTC (rev 47145)
+++ branches/soc-2012-swiss_cheese/intern/ghost/CMakeLists.txt 2012-05-29 00:16:08 UTC (rev 47146)
@@ -108,10 +108,6 @@
)
endif()
-if(WITH_XDG_USER_DIRS)
- add_definitions(-DWITH_XDG_USER_DIRS)
-endif()
-
if(WITH_HEADLESS OR WITH_GHOST_SDL)
if(WITH_HEADLESS)
list(APPEND SRC
Modified: branches/soc-2012-swiss_cheese/intern/ghost/GHOST_ISystemPaths.h
===================================================================
--- branches/soc-2012-swiss_cheese/intern/ghost/GHOST_ISystemPaths.h 2012-05-28 23:53:28 UTC (rev 47145)
+++ branches/soc-2012-swiss_cheese/intern/ghost/GHOST_ISystemPaths.h 2012-05-29 00:16:08 UTC (rev 47146)
@@ -72,17 +72,17 @@
public:
/**
* Determine the base dir in which shared resources are located. It will first try to use
- * "unpack and run" path, then look for properly installed path, not including versioning.
+ * "unpack and run" path, then look for properly installed path, including versioning.
* @return Unsigned char string pointing to system dir (eg /usr/share/blender/).
*/
- virtual const GHOST_TUns8 *getSystemDir() const = 0;
+ virtual const GHOST_TUns8 *getSystemDir(int version, const char *versionstr) const = 0;
/**
- * Determine the base dir in which user configuration is stored, not including versioning.
+ * Determine the base dir in which user configuration is stored, including versioning.
* If needed, it will create the base directory.
* @return Unsigned char string pointing to user dir (eg ~/.blender/).
*/
- virtual const GHOST_TUns8 *getUserDir() const = 0;
+ virtual const GHOST_TUns8 *getUserDir(int version, const char *versionstr) const = 0;
/**
* Determine the directory of the current binary
Modified: branches/soc-2012-swiss_cheese/intern/ghost/GHOST_Path-api.h
===================================================================
--- branches/soc-2012-swiss_cheese/intern/ghost/GHOST_Path-api.h 2012-05-28 23:53:28 UTC (rev 47145)
+++ branches/soc-2012-swiss_cheese/intern/ghost/GHOST_Path-api.h 2012-05-29 00:16:08 UTC (rev 47146)
@@ -55,16 +55,16 @@
/**
* Determine the base dir in which shared resources are located. It will first try to use
- * "unpack and run" path, then look for properly installed path, not including versioning.
+ * "unpack and run" path, then look for properly installed path, including versioning.
* @return Unsigned char string pointing to system dir (eg /usr/share/blender/).
*/
-extern const GHOST_TUns8 *GHOST_getSystemDir(void);
+extern const GHOST_TUns8 *GHOST_getSystemDir(int version, const char *versionstr);
/**
- * Determine the base dir in which user configuration is stored, not including versioning.
+ * Determine the base dir in which user configuration is stored, including versioning.
* @return Unsigned char string pointing to user dir (eg ~).
*/
-extern const GHOST_TUns8 *GHOST_getUserDir(void);
+extern const GHOST_TUns8 *GHOST_getUserDir(int version, const char *versionstr);
/**
Modified: branches/soc-2012-swiss_cheese/intern/ghost/intern/GHOST_Debug.h
===================================================================
--- branches/soc-2012-swiss_cheese/intern/ghost/intern/GHOST_Debug.h 2012-05-28 23:53:28 UTC (rev 47145)
+++ branches/soc-2012-swiss_cheese/intern/ghost/intern/GHOST_Debug.h 2012-05-29 00:16:08 UTC (rev 47146)
@@ -51,8 +51,8 @@
#ifdef GHOST_DEBUG
-# define GHOST_PRINT(x) { std::cout << x; }
-# define GHOST_PRINTF(x, ...) { printf(x, __VA_ARGS__); }
+# define GHOST_PRINT(x) { std::cout << x; } (void)0
+# define GHOST_PRINTF(x, ...) { printf(x, __VA_ARGS__); } (void)0
#else // GHOST_DEBUG
# define GHOST_PRINT(x)
# define GHOST_PRINTF(x, ...)
@@ -67,7 +67,7 @@
GHOST_PRINT(info); \
GHOST_PRINT("\n"); \
} \
- }
+ } (void)0
#else // GHOST_DEBUG
# define GHOST_ASSERT(x, info)
#endif // GHOST_DEBUG
Modified: branches/soc-2012-swiss_cheese/intern/ghost/intern/GHOST_Path-api.cpp
===================================================================
--- branches/soc-2012-swiss_cheese/intern/ghost/intern/GHOST_Path-api.cpp 2012-05-28 23:53:28 UTC (rev 47145)
+++ branches/soc-2012-swiss_cheese/intern/ghost/intern/GHOST_Path-api.cpp 2012-05-29 00:16:08 UTC (rev 47146)
@@ -45,16 +45,16 @@
return GHOST_ISystemPaths::dispose();
}
-const GHOST_TUns8 *GHOST_getSystemDir()
+const GHOST_TUns8 *GHOST_getSystemDir(int version, const char *versionstr)
{
GHOST_ISystemPaths *systemPaths = GHOST_ISystemPaths::get();
- return systemPaths ? systemPaths->getSystemDir() : 0;
+ return systemPaths ? systemPaths->getSystemDir(version, versionstr) : 0;
}
-const GHOST_TUns8 *GHOST_getUserDir()
+const GHOST_TUns8 *GHOST_getUserDir(int version, const char *versionstr)
{
GHOST_ISystemPaths *systemPaths = GHOST_ISystemPaths::get();
- return systemPaths ? systemPaths->getUserDir() : 0; /* shouldn't be NULL */
+ return systemPaths ? systemPaths->getUserDir(version, versionstr) : 0; /* shouldn't be NULL */
}
const GHOST_TUns8 *GHOST_getBinaryDir()
Modified: branches/soc-2012-swiss_cheese/intern/ghost/intern/GHOST_System.cpp
===================================================================
--- branches/soc-2012-swiss_cheese/intern/ghost/intern/GHOST_System.cpp 2012-05-28 23:53:28 UTC (rev 47145)
+++ branches/soc-2012-swiss_cheese/intern/ghost/intern/GHOST_System.cpp 2012-05-29 00:16:08 UTC (rev 47146)
@@ -142,7 +142,7 @@
const bool stereoVisual, const GHOST_TUns16 numOfAASamples)
{
GHOST_TSuccess success = GHOST_kFailure;
- GHOST_ASSERT(m_windowManager, "GHOST_System::beginFullScreen(): invalid window manager")
+ GHOST_ASSERT(m_windowManager, "GHOST_System::beginFullScreen(): invalid window manager");
if (m_displayManager) {
if (!m_windowManager->getFullScreen()) {
m_displayManager->getCurrentDisplaySetting(GHOST_DisplayManager::kMainDisplay, m_preFullScreenSetting);
@@ -184,12 +184,12 @@
GHOST_TSuccess GHOST_System::endFullScreen(void)
{
GHOST_TSuccess success = GHOST_kFailure;
- GHOST_ASSERT(m_windowManager, "GHOST_System::endFullScreen(): invalid window manager")
+ GHOST_ASSERT(m_windowManager, "GHOST_System::endFullScreen(): invalid window manager");
if (m_windowManager->getFullScreen()) {
//GHOST_IWindow* window = m_windowManager->getFullScreenWindow();
//GHOST_PRINT("GHOST_System::endFullScreen(): leaving window manager full-screen mode\n");
success = m_windowManager->endFullScreen();
- GHOST_ASSERT(m_displayManager, "GHOST_System::endFullScreen(): invalid display manager")
+ GHOST_ASSERT(m_displayManager, "GHOST_System::endFullScreen(): invalid display manager");
//GHOST_PRINT("GHOST_System::endFullScreen(): leaving full-screen mode\n");
success = m_displayManager->setCurrentDisplaySetting(GHOST_DisplayManager::kMainDisplay, m_preFullScreenSetting);
}
@@ -350,7 +350,7 @@
GHOST_TSuccess GHOST_System::createFullScreenWindow(GHOST_Window **window, const bool stereoVisual, const GHOST_TUns16 numOfAASamples)
{
GHOST_TSuccess success;
- GHOST_ASSERT(m_displayManager, "GHOST_System::createFullScreenWindow(): invalid display manager")
+ GHOST_ASSERT(m_displayManager, "GHOST_System::createFullScreenWindow(): invalid display manager");
GHOST_DisplaySetting settings;
success = m_displayManager->getCurrentDisplaySetting(GHOST_DisplayManager::kMainDisplay, settings);
Modified: branches/soc-2012-swiss_cheese/intern/ghost/intern/GHOST_SystemPaths.h
===================================================================
--- branches/soc-2012-swiss_cheese/intern/ghost/intern/GHOST_SystemPaths.h 2012-05-28 23:53:28 UTC (rev 47145)
+++ branches/soc-2012-swiss_cheese/intern/ghost/intern/GHOST_SystemPaths.h 2012-05-29 00:16:08 UTC (rev 47146)
@@ -52,17 +52,17 @@
/**
* Determine the base dir in which shared resources are located. It will first try to use
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list