svn merge -r38157:38474 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorCampbell Barton <ideasman42@gmail.com>
Mon, 18 Jul 2011 14:49:05 +0000 (14:49 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 18 Jul 2011 14:49:05 +0000 (14:49 +0000)
1  2 
CMakeLists.txt
release/scripts/startup/bl_ui/space_view3d_toolbar.py
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/editors/interface/interface_templates.c
source/blender/makesrna/intern/rna_object.c

diff --cc CMakeLists.txt
index 88a1c63adadb0c484a7b04526c6fd2bc03a07817,ebf7aa8a6c065bf7821955d8a192eaf68c1618ff..d1a6136382b2b1432c579a961806c7248f96ebae
@@@ -419,9 -452,9 +440,9 @@@ if(UNIX AND NOT APPLE
        endif()
  
        # OpenSuse needs lutil, ArchLinux not, for now keep, can avoid by using --as-needed
 -      set(PLATFORM_LINKLIBS "-lutil -lc -lm -lpthread -lstdc++")
 +      set(LLIBS "-lutil -lc -lm -lpthread -lstdc++")
  
-       if(NOT WITH_HEADLESS)
+       if((NOT WITH_HEADLESS) AND (NOT WITH_GHOST_SDL))
                find_package(X11 REQUIRED)
                find_path(X11_XF86keysym_INCLUDE_PATH X11/XF86keysym.h ${X11_INC_SEARCH_PATH})
                mark_as_advanced(X11_XF86keysym_INCLUDE_PATH)
@@@ -690,20 -729,26 +711,24 @@@ elseif(WIN32
                endif()
  
                if(WITH_PYTHON)
-                       set(PYTHON_VERSION 3.2)
-                       set(PYTHON_INCLUDE_DIRS "${LIBDIR}/python/include/python${PYTHON_VERSION}")
-                       # set(PYTHON_BINARY python) # not used yet
-                       set(PYTHON_LIBRARIES ${LIBDIR}/python/lib/python32.lib)
+                       # normally cached but not since we include them with blender
+                       set(PYTHON_VERSION 3.2) # CACHE STRING)
+                       set(PYTHON_INCLUDE_DIR "${LIBDIR}/python/include/python${PYTHON_VERSION}") # CACHE PATH)
+                       set(PYTHON_LIBRARY "${LIBDIR}/python/lib/python32.lib") #CACHE FILEPATH)
+                       # uncached vars
+                       set(PYTHON_INCLUDE_DIRS "${PYTHON_INCLUDE_DIR}")
+                       set(PYTHON_LIBRARIES  "${PYTHON_LIBRARY}")
                endif()
  
 -              set(PLATFORM_LINKFLAGS "/SUBSYSTEM:CONSOLE /STACK:2097152 /INCREMENTAL:NO /NODEFAULTLIB:msvcrt.lib /NODEFAULTLIB:msvcmrt.lib /NODEFAULTLIB:msvcurt.lib /NODEFAULTLIB:msvcrtd.lib")
 -
                # MSVC only, Mingw doesnt need
                if(CMAKE_CL_64)
 -                      set(PLATFORM_LINKFLAGS "/MACHINE:X64 /OPT:NOREF ${PLATFORM_LINKFLAGS}")
 +                      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 "/MACHINE:IX86 /LARGEADDRESSAWARE ${PLATFORM_LINKFLAGS}")
 +                      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(PLATFORM_LINKFLAGS_DEBUG "/NODEFAULTLIB:libcmt.lib /NODEFAULTLIB:libc.lib")
 +              set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:libcmt.lib;libc.lib ")
  
        else()
                # keep GCC spesific stuff here