[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29073] branches/soc-2010-moguri: I rolled back the merge and merged correctly this time.

Mitchell Stokes mogurijin at gmail.com
Sun May 30 03:48:05 CEST 2010


Revision: 29073
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29073
Author:   moguri
Date:     2010-05-30 03:48:03 +0200 (Sun, 30 May 2010)

Log Message:
-----------
I rolled back the merge and merged correctly this time. (hopefully)

Modified Paths:
--------------
    branches/soc-2010-moguri/CMake/macros.cmake
    branches/soc-2010-moguri/CMakeLists.txt
    branches/soc-2010-moguri/SConstruct
    branches/soc-2010-moguri/config/darwin-config.py
    branches/soc-2010-moguri/config/linux2-config.py
    branches/soc-2010-moguri/config/linuxcross-config.py
    branches/soc-2010-moguri/config/win32-mingw-config.py
    branches/soc-2010-moguri/config/win32-vc-config.py
    branches/soc-2010-moguri/config/win64-vc-config.py
    branches/soc-2010-moguri/intern/ghost/intern/GHOST_SystemCocoa.mm
    branches/soc-2010-moguri/release/scripts/io/export_fbx.py
    branches/soc-2010-moguri/release/scripts/io/import_anim_bvh.py
    branches/soc-2010-moguri/release/scripts/keyingsets/keyingsets_utils.py
    branches/soc-2010-moguri/release/scripts/op/add_mesh_torus.py
    branches/soc-2010-moguri/release/scripts/op/object.py
    branches/soc-2010-moguri/release/scripts/op/uv.py
    branches/soc-2010-moguri/release/scripts/ui/properties_animviz.py
    branches/soc-2010-moguri/release/scripts/ui/properties_render.py
    branches/soc-2010-moguri/release/scripts/ui/space_view3d.py
    branches/soc-2010-moguri/source/blender/blenkernel/BKE_global.h
    branches/soc-2010-moguri/source/blender/blenkernel/BKE_multires.h
    branches/soc-2010-moguri/source/blender/blenkernel/CMakeLists.txt
    branches/soc-2010-moguri/source/blender/blenkernel/SConscript
    branches/soc-2010-moguri/source/blender/blenkernel/intern/Makefile
    branches/soc-2010-moguri/source/blender/blenkernel/intern/anim.c
    branches/soc-2010-moguri/source/blender/blenkernel/intern/armature.c
    branches/soc-2010-moguri/source/blender/blenkernel/intern/image.c
    branches/soc-2010-moguri/source/blender/blenkernel/intern/multires.c
    branches/soc-2010-moguri/source/blender/blenloader/intern/readfile.c
    branches/soc-2010-moguri/source/blender/editors/CMakeLists.txt
    branches/soc-2010-moguri/source/blender/editors/animation/anim_channels_edit.c
    branches/soc-2010-moguri/source/blender/editors/animation/anim_filter.c
    branches/soc-2010-moguri/source/blender/editors/include/ED_anim_api.h
    branches/soc-2010-moguri/source/blender/editors/interface/interface_handlers.c
    branches/soc-2010-moguri/source/blender/editors/interface/interface_regions.c
    branches/soc-2010-moguri/source/blender/editors/object/object_intern.h
    branches/soc-2010-moguri/source/blender/editors/object/object_modifier.c
    branches/soc-2010-moguri/source/blender/editors/object/object_ops.c
    branches/soc-2010-moguri/source/blender/editors/render/render_opengl.c
    branches/soc-2010-moguri/source/blender/editors/screen/screen_ops.c
    branches/soc-2010-moguri/source/blender/editors/sound/sound_ops.c
    branches/soc-2010-moguri/source/blender/editors/space_action/action_edit.c
    branches/soc-2010-moguri/source/blender/editors/space_action/action_select.c
    branches/soc-2010-moguri/source/blender/editors/space_file/Makefile
    branches/soc-2010-moguri/source/blender/editors/space_file/SConscript
    branches/soc-2010-moguri/source/blender/editors/space_file/writeimage.c
    branches/soc-2010-moguri/source/blender/editors/space_graph/graph_buttons.c
    branches/soc-2010-moguri/source/blender/editors/space_graph/graph_edit.c
    branches/soc-2010-moguri/source/blender/editors/space_graph/graph_select.c
    branches/soc-2010-moguri/source/blender/editors/space_graph/space_graph.c
    branches/soc-2010-moguri/source/blender/editors/space_image/Makefile
    branches/soc-2010-moguri/source/blender/editors/space_image/SConscript
    branches/soc-2010-moguri/source/blender/editors/space_image/image_ops.c
    branches/soc-2010-moguri/source/blender/editors/space_logic/logic_ops.c
    branches/soc-2010-moguri/source/blender/editors/space_logic/logic_window.c
    branches/soc-2010-moguri/source/blender/editors/space_nla/nla_select.c
    branches/soc-2010-moguri/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/soc-2010-moguri/source/blender/editors/space_text/space_text.c
    branches/soc-2010-moguri/source/blender/editors/space_view3d/drawanimviz.c
    branches/soc-2010-moguri/source/blender/editors/space_view3d/drawobject.c
    branches/soc-2010-moguri/source/blender/editors/space_view3d/view3d_draw.c
    branches/soc-2010-moguri/source/blender/editors/space_view3d/view3d_edit.c
    branches/soc-2010-moguri/source/blender/editors/space_view3d/view3d_view.c
    branches/soc-2010-moguri/source/blender/editors/transform/transform_conversions.c
    branches/soc-2010-moguri/source/blender/gpu/GPU_draw.h
    branches/soc-2010-moguri/source/blender/gpu/intern/gpu_draw.c
    branches/soc-2010-moguri/source/blender/imbuf/CMakeLists.txt
    branches/soc-2010-moguri/source/blender/imbuf/SConscript
    branches/soc-2010-moguri/source/blender/imbuf/intern/Makefile
    branches/soc-2010-moguri/source/blender/imbuf/intern/filetype.c
    branches/soc-2010-moguri/source/blender/imbuf/intern/openexr/openexr_api.cpp
    branches/soc-2010-moguri/source/blender/imbuf/intern/util.c
    branches/soc-2010-moguri/source/blender/makesdna/DNA_action_types.h
    branches/soc-2010-moguri/source/blender/makesdna/DNA_object_types.h
    branches/soc-2010-moguri/source/blender/makesrna/SConscript
    branches/soc-2010-moguri/source/blender/makesrna/intern/CMakeLists.txt
    branches/soc-2010-moguri/source/blender/makesrna/intern/Makefile
    branches/soc-2010-moguri/source/blender/makesrna/intern/rna_actuator.c
    branches/soc-2010-moguri/source/blender/makesrna/intern/rna_animation.c
    branches/soc-2010-moguri/source/blender/makesrna/intern/rna_animviz.c
    branches/soc-2010-moguri/source/blender/makesrna/intern/rna_curve.c
    branches/soc-2010-moguri/source/blender/makesrna/intern/rna_fcurve.c
    branches/soc-2010-moguri/source/blender/makesrna/intern/rna_image.c
    branches/soc-2010-moguri/source/blender/makesrna/intern/rna_internal.h
    branches/soc-2010-moguri/source/blender/makesrna/intern/rna_main_api.c
    branches/soc-2010-moguri/source/blender/makesrna/intern/rna_material.c
    branches/soc-2010-moguri/source/blender/makesrna/intern/rna_object.c
    branches/soc-2010-moguri/source/blender/makesrna/intern/rna_object_api.c
    branches/soc-2010-moguri/source/blender/makesrna/intern/rna_scene.c
    branches/soc-2010-moguri/source/blender/makesrna/intern/rna_sensor.c
    branches/soc-2010-moguri/source/blender/makesrna/intern/rna_space.c
    branches/soc-2010-moguri/source/blender/makesrna/intern/rna_texture.c
    branches/soc-2010-moguri/source/blender/python/doc/blender-org/layout.html
    branches/soc-2010-moguri/source/blender/python/doc/blender-org/static/default.css_t
    branches/soc-2010-moguri/source/blender/python/doc/sphinx_doc_gen.py
    branches/soc-2010-moguri/source/blender/python/intern/bpy_app.c
    branches/soc-2010-moguri/source/blender/render/intern/source/rendercore.c
    branches/soc-2010-moguri/source/blender/render/intern/source/texture.c
    branches/soc-2010-moguri/source/blender/windowmanager/wm_event_types.h
    branches/soc-2010-moguri/source/creator/Makefile
    branches/soc-2010-moguri/source/creator/SConscript
    branches/soc-2010-moguri/source/nan_link.mk
    branches/soc-2010-moguri/tools/Blender.py
    branches/soc-2010-moguri/tools/btools.py
    branches/soc-2010-moguri/tools/crossmingw.py

Removed Paths:
-------------
    branches/soc-2010-moguri/source/blender/imbuf/intern/dynlibtiff.c
    branches/soc-2010-moguri/source/blender/imbuf/intern/dynlibtiff.h

Modified: branches/soc-2010-moguri/CMake/macros.cmake
===================================================================
--- branches/soc-2010-moguri/CMake/macros.cmake	2010-05-30 01:42:04 UTC (rev 29072)
+++ branches/soc-2010-moguri/CMake/macros.cmake	2010-05-30 01:48:03 UTC (rev 29073)
@@ -61,6 +61,9 @@
   IF(WITH_OPENEXR)
     LINK_DIRECTORIES(${OPENEXR_LIBPATH})
   ENDIF(WITH_OPENEXR)
+  IF(WITH_TIFF)
+    LINK_DIRECTORIES(${TIFF_LIBPATH})
+  ENDIF(WITH_TIFF)
   IF(WITH_QUICKTIME)
     LINK_DIRECTORIES(${QUICKTIME_LIBPATH})
   ENDIF(WITH_QUICKTIME)
@@ -134,6 +137,9 @@
   IF(WITH_QUICKTIME)
     TARGET_LINK_LIBRARIES(${target} ${QUICKTIME_LIB})
   ENDIF(WITH_QUICKTIME)
+  IF(WITH_TIFF)
+    TARGET_LINK_LIBRARIES(${target} ${TIFF_LIBRARY})
+  ENDIF(WITH_TIFF)
   IF(WITH_OPENEXR)
     IF(WIN32)
       FOREACH(loop_var ${OPENEXR_LIB})

Modified: branches/soc-2010-moguri/CMakeLists.txt
===================================================================
--- branches/soc-2010-moguri/CMakeLists.txt	2010-05-30 01:42:04 UTC (rev 29072)
+++ branches/soc-2010-moguri/CMakeLists.txt	2010-05-30 01:48:03 UTC (rev 29073)
@@ -162,20 +162,24 @@
 	FIND_PACKAGE(Freetype)
 	# UNSET(FREETYPE_INCLUDE_DIRS CACHE) # cant use
 
-	# No way to set py31. remove for now.
-	# FIND_PACKAGE(PythonLibs)
-	SET(PYTHON /usr)
-	SET(PYTHON_VERSION 3.1)
-	SET(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}" CACHE STRING "")
-	# SET(PYTHON_BINARY python) # not used yet
-	SET(PYTHON_LIB python${PYTHON_VERSION} CACHE STRING "")
-	SET(PYTHON_LIBPATH ${PYTHON}/lib CACHE STRING "")
-  
-	# FIND_PACKAGE(PythonInterp) # not used yet
-	# SET(PYTHON_BINARY ${PYTHON_EXECUTABLE} CACHE STRING "")
-  
-	SET(PYTHON_LINKFLAGS "-Xlinker -export-dynamic")
 
+	IF(WITH_PYTHON)
+		# No way to set py31. remove for now.
+		# FIND_PACKAGE(PythonLibs)
+		SET(PYTHON /usr)
+		SET(PYTHON_VERSION 3.1)
+		SET(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}" CACHE STRING "")
+		# SET(PYTHON_BINARY python) # not used yet
+		SET(PYTHON_LIB python${PYTHON_VERSION} CACHE STRING "")
+		SET(PYTHON_LIBPATH ${PYTHON}/lib CACHE STRING "")
+	
+		# FIND_PACKAGE(PythonInterp) # not used yet
+		# SET(PYTHON_BINARY ${PYTHON_EXECUTABLE} CACHE STRING "")
+
+		SET(PYTHON_LINKFLAGS "-Xlinker -export-dynamic")
+	ENDIF(WITH_PYTHON)
+
+
 	IF(WITH_SDL)
 		FIND_PACKAGE(SDL)
 		# UNSET(SDLMAIN_LIBRARY CACHE)
@@ -184,23 +188,27 @@
 		ENDIF(NOT SDL_FOUND)
 	ENDIF(WITH_SDL)
 
-	SET(OPENEXR /usr CACHE FILEPATH "OPENEXR Directory")
-	FIND_PATH(OPENEXR_INC
-		ImfXdr.h
-		PATHS
-		${OPENEXR}/include/OpenEXR
-		/usr/local/include/OpenEXR
-		/sw/include/OpenEXR
-		/opt/local/include/OpenEXR
-		/opt/csw/include/OpenEXR
-		/opt/include/OpenEXR
-	)
-	SET(OPENEXR_LIB Half IlmImf Iex Imath)
+	IF(WITH_OPENEXR)
+		SET(OPENEXR /usr CACHE FILEPATH "OPENEXR Directory")
+		FIND_PATH(OPENEXR_INC
+			ImfXdr.h
+			PATHS
+			${OPENEXR}/include/OpenEXR
+			/usr/local/include/OpenEXR
+			/sw/include/OpenEXR
+			/opt/local/include/OpenEXR
+			/opt/csw/include/OpenEXR
+			/opt/include/OpenEXR
+		)
+		SET(OPENEXR_LIB Half IlmImf Iex Imath)
+	ENDIF(WITH_OPENEXR)
 
-	SET(FFMPEG /usr CACHE FILEPATH "FFMPEG Directory")
-	SET(FFMPEG_INC ${FFMPEG}/include)
-	SET(FFMPEG_LIB avformat avcodec avutil avdevice swscale CACHE STRING "FFMPEG Libraries")
-	SET(FFMPEG_LIBPATH ${FFMPEG}/lib)
+	IF(WITH_FFMPEG)
+		SET(FFMPEG /usr CACHE FILEPATH "FFMPEG Directory")
+		SET(FFMPEG_INC ${FFMPEG}/include)
+		SET(FFMPEG_LIB avformat avcodec avutil avdevice swscale CACHE STRING "FFMPEG Libraries")
+		SET(FFMPEG_LIBPATH ${FFMPEG}/lib)
+	ENDIF(WITH_FFMPEG)
   
 	IF(WITH_FFTW3)
 		SET(FFTW3 /usr)
@@ -247,6 +255,10 @@
 	IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
 		# BSD's dont use libdl.so
 		SET(LLIBS "${LLIBS} -ldl")
+
+		# binreloc is linux only
+		SET(BINRELOC ${CMAKE_SOURCE_DIR}/extern/binreloc)
+		SET(BINRELOC_INC ${BINRELOC}/include)
 	ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
 
 	IF(WITH_OPENMP)
@@ -267,6 +279,7 @@
 	INCLUDE_DIRECTORIES(${JPEG_INCLUDE_DIR} ${PNG_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} )
 ENDIF(UNIX AND NOT APPLE)
 
+
 IF(WIN32)
 
 	# this file is included anyway when building under Windows with cl.exe
@@ -279,48 +292,19 @@
 		message("64 bit compiler detected.")
 		SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/win64)
 	ENDIF(CMAKE_CL_64)
+	
+	ADD_DEFINITIONS(-DWIN32)
 
-	SET(PYTHON ${LIBDIR}/python)
-	SET(PYTHON_VERSION 3.1)
-	SET(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}")
-	# SET(PYTHON_BINARY python) # not used yet
-	SET(PYTHON_LIB python31)
-	SET(PYTHON_LIBPATH ${PYTHON}/lib)
-
-	IF(WITH_OPENAL)
-		SET(OPENAL ${LIBDIR}/openal)
-		SET(OPENAL_INCLUDE_DIR ${OPENAL}/include)
-		SET(OPENAL_LIBRARY wrap_oal)
-		SET(OPENAL_LIBPATH ${OPENAL}/lib)
-	ENDIF(WITH_OPENAL)
-
-	IF(WITH_SNDFILE)
-		SET(SNDFILE ${LIBDIR}/sndfile)
-		SET(SNDFILE_INC ${SNDFILE}/include)
-		SET(SNDFILE_LIB libsndfile-1)
-		SET(SNDFILE_LIBPATH ${SNDFILE}/lib)
-	ENDIF(WITH_SNDFILE)
-  
 	SET(ICONV ${LIBDIR}/iconv)
 	SET(ICONV_INC ${ICONV}/include)
 	SET(ICONV_LIB iconv)
 	SET(ICONV_LIBPATH ${ICONV}/lib)
 
-	SET(QUICKTIME ${LIBDIR}/QTDevWin)
-	SET(QUICKTIME_INC ${QUICKTIME}/CIncludes)
-	SET(QUICKTIME_LIB qtmlClient)
-	SET(QUICKTIME_LIBPATH ${QUICKTIME}/Libraries)
-
 	SET(LIBSAMPLERATE ${LIBDIR}/samplerate)
 	SET(LIBSAMPLERATE_INC ${LIBSAMPLERATE}/include)
 	SET(LIBSAMPLERATE_LIB libsamplerate)
 	SET(LIBSAMPLERATE_LIBPATH ${LIBSAMPLERATE}/lib)
 
-	SET(SDL ${LIBDIR}/sdl)
-	SET(SDL_INCLUDE_DIR ${SDL}/include)
-	SET(SDL_LIBRARY SDL)
-	SET(SDL_LIBPATH ${SDL}/lib)
-
 	SET(PNG "${LIBDIR}/png")
 	SET(PNG_INC "${PNG}/include")
 	SET(PNG_LIBPATH ${PNG}/lib)
@@ -331,6 +315,43 @@
 
 	SET(WINTAB_INC ${LIBDIR}/wintab/include) 
 
+	IF(WITH_PYTHON)
+		SET(PYTHON ${LIBDIR}/python)
+		SET(PYTHON_VERSION 3.1)
+		SET(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}")
+		# SET(PYTHON_BINARY python) # not used yet
+		SET(PYTHON_LIB python31)
+		SET(PYTHON_LIBPATH ${PYTHON}/lib)
+	ENDIF(WITH_PYTHON)
+
+	IF(WITH_OPENAL)
+		SET(OPENAL ${LIBDIR}/openal)
+		SET(OPENAL_INCLUDE_DIR ${OPENAL}/include)
+		SET(OPENAL_LIBRARY wrap_oal)
+		SET(OPENAL_LIBPATH ${OPENAL}/lib)
+	ENDIF(WITH_OPENAL)
+
+	IF(WITH_SNDFILE)
+		SET(SNDFILE ${LIBDIR}/sndfile)
+		SET(SNDFILE_INC ${SNDFILE}/include)
+		SET(SNDFILE_LIB libsndfile-1)
+		SET(SNDFILE_LIBPATH ${SNDFILE}/lib)
+	ENDIF(WITH_SNDFILE)
+
+	IF(WITH_SDL)
+		SET(SDL ${LIBDIR}/sdl)
+		SET(SDL_INCLUDE_DIR ${SDL}/include)
+		SET(SDL_LIBRARY SDL)
+		SET(SDL_LIBPATH ${SDL}/lib)
+	ENDIF(WITH_SDL)
+
+	IF(WITH_QUICKTIME)
+		SET(QUICKTIME ${LIBDIR}/QTDevWin)
+		SET(QUICKTIME_INC ${QUICKTIME}/CIncludes)
+		SET(QUICKTIME_LIB qtmlClient)
+		SET(QUICKTIME_LIBPATH ${QUICKTIME}/Libraries)
+	ENDIF(WITH_QUICKTIME)
+
 	IF(MSVC)
 		IF(CMAKE_CL_64)
 			SET(LLIBS kernel32 user32 vfw32 winmm ws2_32 )
@@ -455,19 +476,19 @@
 	ELSE(MSVC) # MINGW
 		SET(LLIBS "-lshell32 -lshfolder -lgdi32 -lmsvcrt -lwinmm -lmingw32 -lm -lws2_32 -lz -lstdc++ -lole32 -luuid")
 
-		SET(CMAKE_CXX_FLAGS                "-pipe -funsigned-char -fno-strict-aliasing -mwindows" CACHE STRING "Mingw C++ flags " FORCE)
-		SET(CMAKE_C_FLAGS                  "-pipe -funsigned-char -fno-strict-aliasing" CACHE STRING "Mingw C flags " FORCE)
+		SET(CMAKE_CXX_FLAGS                "-pipe -funsigned-char -fno-strict-aliasing -mwindows" CACHE STRING "Mingw C++ flags ")
+		SET(CMAKE_C_FLAGS                  "-pipe -funsigned-char -fno-strict-aliasing" CACHE STRING "Mingw C flags ")
 
-		SET(CMAKE_CXX_FLAGS_DEBUG          "-O0 -g" CACHE STRING "Mingw debug C++ flags " FORCE)
-		SET(CMAKE_CXX_FLAGS_RELEASE        "   -O2" CACHE STRING "Mingw release C++ flags " FORCE)
-		SET(CMAKE_CXX_FLAGS_MINSIZEREL     "   -Os" CACHE STRING "Mingw minsize release C++ flags " FORCE)
-		SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g" CACHE STRING "Mingw release, debug C++ flags " FORCE)
+		SET(CMAKE_CXX_FLAGS_DEBUG          "-O0 -g" CACHE STRING "Mingw debug C++ flags ")
+		SET(CMAKE_CXX_FLAGS_RELEASE        "   -O2" CACHE STRING "Mingw release C++ flags ")
+		SET(CMAKE_CXX_FLAGS_MINSIZEREL     "   -Os" CACHE STRING "Mingw minsize release C++ flags ")
+		SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g" CACHE STRING "Mingw release, debug C++ flags ")
 
-		SET(CMAKE_C_FLAGS_DEBUG            "-O0 -g" CACHE STRING "Mingw debug C flags " FORCE)
-		SET(CMAKE_C_FLAGS_RELEASE          "-O2"    CACHE STRING "Mingw release C flags " FORCE)
-		SET(CMAKE_C_FLAGS_MINSIZEREL       "-Os"    CACHE STRING "Mingw minsize release C flags " FORCE)
-		SET(CMAKE_C_FLAGS_RELWITHDEBINFO   "-O2 -g" CACHE STRING "Mingw release, debug C++ flags " FORCE)
-		ADD_DEFINITIONS(-DFREE_WINDOWS -DWIN32)
+		SET(CMAKE_C_FLAGS_DEBUG            "-O0 -g" CACHE STRING "Mingw debug C flags ")
+		SET(CMAKE_C_FLAGS_RELEASE          "-O2"    CACHE STRING "Mingw release C flags ")
+		SET(CMAKE_C_FLAGS_MINSIZEREL       "-Os"    CACHE STRING "Mingw minsize release C flags ")
+		SET(CMAKE_C_FLAGS_RELWITHDEBINFO   "-O2 -g" CACHE STRING "Mingw release, debug C++ flags ")
+		ADD_DEFINITIONS(-DFREE_WINDOWS)
 		
 		IF(WITH_OPENMP)
 			SET(LLIBS "${LLIBS} -lgomp")
@@ -524,7 +545,7 @@
 		IF(WITH_OPENEXR)
 			SET(OPENEXR ${LIBDIR}/gcc/openexr)
 			SET(OPENEXR_INC ${OPENEXR}/include ${OPENEXR}/include/OpenEXR)
-			SET(OPENEXR_LIB Half IlmImf Iex)
+			SET(OPENEXR_LIB Half IlmImf Iex IlmThread)
 			SET(OPENEXR_LIBPATH ${OPENEXR}/lib)
 		ENDIF(WITH_OPENEXR)
 
@@ -549,6 +570,7 @@
 
 ENDIF(WIN32)
 
+
 IF(APPLE)
 	IF(WITH_LIBS10.5)
 		SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/darwin-9.x.universal)
@@ -727,12 +749,7 @@
 
 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")
 
-
 # buildinfo
 IF(WITH_BUILDINFO)
 	# BUILD_PLATFORM and BUILD_PLATFORM are taken from CMake

Modified: branches/soc-2010-moguri/SConstruct
===================================================================
--- branches/soc-2010-moguri/SConstruct	2010-05-30 01:42:04 UTC (rev 29072)
+++ branches/soc-2010-moguri/SConstruct	2010-05-30 01:48:03 UTC (rev 29073)
@@ -182,7 +182,7 @@
 else:
 	print B.bc.WARNING + userconfig + " not found, no user overrides" + B.bc.ENDC
 
-opts = btools.read_opts(optfiles, B.arguments)
+opts = btools.read_opts(env, optfiles, B.arguments)
 opts.Update(env)
 
 if not env['BF_FANCY']:

Modified: branches/soc-2010-moguri/config/darwin-config.py
===================================================================
--- branches/soc-2010-moguri/config/darwin-config.py	2010-05-30 01:42:04 UTC (rev 29072)

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list