diff options
Diffstat (limited to 'source/blender/collada/CMakeLists.txt')
| -rw-r--r-- | source/blender/collada/CMakeLists.txt | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/source/blender/collada/CMakeLists.txt b/source/blender/collada/CMakeLists.txt index 5241bbc4ee9..fa7bfee8ee5 100644 --- a/source/blender/collada/CMakeLists.txt +++ b/source/blender/collada/CMakeLists.txt @@ -106,17 +106,9 @@ if(WITH_BUILDINFO) add_definitions(-DNAN_BUILDINFO) endif() -<<<<<<< .working -IF(WITH_BUILDINFO) - ADD_DEFINITIONS(-DNAN_BUILDINFO) -ENDIF(WITH_BUILDINFO) - -BLENDERLIB(bf_collada "${SRC}" "${INC}") -======= if(CMAKE_COMPILER_IS_GNUCXX) # COLLADAFWArray.h gives error with gcc 4.5 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive") endif() blender_add_lib(bf_collada "${SRC}" "${INC}") ->>>>>>> .merge-right.r35190 |