forked from bartvdbraak/blender
Code Cleanup: whitespace
This commit is contained in:
parent
45df9f4141
commit
536800392a
@ -372,14 +372,14 @@ if(APPLE)
|
||||
message(STATUS "OSX_SYSROOT_PREFIX: " ${OSX_SYSROOT_PREFIX})
|
||||
set(OSX_DEVELOPER_PREFIX /Developer/SDKs/MacOSX${OSX_SYSTEM}.sdk) # use guaranteed existing sdk
|
||||
set(CMAKE_OSX_SYSROOT ${OSX_SYSROOT_PREFIX}/${OSX_DEVELOPER_PREFIX} CACHE PATH "" FORCE)
|
||||
if(${CMAKE_GENERATOR} MATCHES "Xcode")
|
||||
set(CMAKE_XCODE_ATTRIBUTE_SDKROOT macosx${OSX_SYSTEM}) # to silence sdk not found warning, just overrides CMAKE_OSX_SYSROOT
|
||||
endif()
|
||||
if(${CMAKE_GENERATOR} MATCHES "Xcode")
|
||||
set(CMAKE_XCODE_ATTRIBUTE_SDKROOT macosx${OSX_SYSTEM}) # to silence sdk not found warning, just overrides CMAKE_OSX_SYSROOT
|
||||
endif()
|
||||
endif()
|
||||
|
||||
if(OSX_SYSTEM MATCHES 10.9)
|
||||
set(CMAKE_FIND_ROOT_PATH ${CMAKE_OSX_SYSROOT}) # make sure syslibs and headers are looked up in sdk ( expecially for 10.9 openGL atm. )
|
||||
endif()
|
||||
if(OSX_SYSTEM MATCHES 10.9)
|
||||
set(CMAKE_FIND_ROOT_PATH ${CMAKE_OSX_SYSROOT}) # make sure syslibs and headers are looked up in sdk ( expecially for 10.9 openGL atm. )
|
||||
endif()
|
||||
|
||||
if(NOT CMAKE_OSX_DEPLOYMENT_TARGET)
|
||||
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.6" CACHE STRING "" FORCE) # 10.6 is our min. target, if you use higher sdk, weak linking happens
|
||||
@ -1503,12 +1503,12 @@ elseif(WIN32)
|
||||
if(WITH_OPENAL)
|
||||
set(OPENAL ${LIBDIR}/openal)
|
||||
set(OPENALDIR ${LIBDIR}/openal)
|
||||
set(OPENAL_INCLUDE_DIR ${OPENAL}/include)
|
||||
if(MSVC11 OR MSVC12)
|
||||
set(OPENAL_LIBRARY openal32)
|
||||
else()
|
||||
set(OPENAL_LIBRARY wrap_oal)
|
||||
endif()
|
||||
set(OPENAL_INCLUDE_DIR ${OPENAL}/include)
|
||||
if(MSVC11 OR MSVC12)
|
||||
set(OPENAL_LIBRARY openal32)
|
||||
else()
|
||||
set(OPENAL_LIBRARY wrap_oal)
|
||||
endif()
|
||||
set(OPENAL_LIBPATH ${OPENAL}/lib)
|
||||
endif()
|
||||
|
||||
|
@ -115,7 +115,7 @@ set(SRC
|
||||
intern/mball.c
|
||||
intern/mesh.c
|
||||
intern/mesh_evaluate.c
|
||||
intern/mesh_mapping.c
|
||||
intern/mesh_mapping.c
|
||||
intern/mesh_validate.c
|
||||
intern/modifier.c
|
||||
intern/modifiers_bmesh.c
|
||||
@ -220,7 +220,7 @@ set(SRC
|
||||
BKE_material.h
|
||||
BKE_mball.h
|
||||
BKE_mesh.h
|
||||
BKE_mesh_mapping.h
|
||||
BKE_mesh_mapping.h
|
||||
BKE_modifier.h
|
||||
BKE_movieclip.h
|
||||
BKE_multires.h
|
||||
|
Loading…
Reference in New Issue
Block a user