synched with trunk at revision 34793
authorNick Samarin <nicks1987@bigmir.net>
Wed, 16 Feb 2011 16:47:48 +0000 (16:47 +0000)
committerNick Samarin <nicks1987@bigmir.net>
Wed, 16 Feb 2011 16:47:48 +0000 (16:47 +0000)
1  2 
extern/CMakeLists.txt
extern/libredcode/CMakeLists.txt
extern/recastnavigation/CMakeLists.txt

  #
  # ***** END GPL LICENSE BLOCK *****
  
- IF(WITH_BULLET)
-       ADD_SUBDIRECTORY(bullet2)
- ENDIF(WITH_BULLET)
+ # Otherwise we get warnings here that we cant fix in external projects
+ remove_strict_flags()
  
IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
-       ADD_SUBDIRECTORY(binreloc)
ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
if(WITH_BULLET)
+       add_subdirectory(bullet2)
endif()
  
- ADD_SUBDIRECTORY(glew)
- ADD_SUBDIRECTORY(recastnavigation)
+ if(CMAKE_SYSTEM_NAME MATCHES "Linux")
+       add_subdirectory(binreloc)
+ endif()
  
- IF(WITH_IMAGE_OPENJPEG)
-       ADD_SUBDIRECTORY(libopenjpeg)
- ENDIF(WITH_IMAGE_OPENJPEG)
+ add_subdirectory(glew)
++add_subdirectory(recastnavigation)
 +
- IF(WITH_LZO)
-       ADD_SUBDIRECTORY(lzo)
- ENDIF(WITH_LZO)
  
- IF(WITH_LZMA)
-       ADD_SUBDIRECTORY(lzma)
- ENDIF(WITH_LZMA)
+ if(WITH_IMAGE_OPENJPEG)
+       add_subdirectory(libopenjpeg)
+ endif()
+ if(WITH_IMAGE_REDCODE)
+       add_subdirectory(libredcode)
+ endif()
+ if(WITH_LZO)
+       add_subdirectory(lzo)
+ endif()
+ if(WITH_LZMA)
+       add_subdirectory(lzma)
+ endif()
@@@ -1,6 -1,4 +1,4 @@@
- #
- # $Id: Makefile 14444 2008-04-16 22:40:48Z hos $
- #
 -# $Id$
++# $Id: CMakeLists.txt 33864 2010-12-22 23:09:30Z campbellbarton $
  # ***** BEGIN GPL LICENSE BLOCK *****
  #
  # This program is free software; you can redistribute it and/or
index d36de44,0000000..d03022a
mode 100644,000000..100644
--- /dev/null
@@@ -1,32 -1,0 +1,63 @@@
- SET(INC Recast/Include Detour/Include)
 +# $Id$
 +# ***** BEGIN GPL LICENSE BLOCK *****
 +#
 +# This program is free software; you can redistribute it and/or
 +# modify it under the terms of the GNU General Public License
 +# as published by the Free Software Foundation; either version 2
 +# of the License, or (at your option) any later version.
 +#
 +# This program is distributed in the hope that it will be useful,
 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 +# GNU General Public License for more details.
 +#
 +# You should have received a copy of the GNU General Public License
 +# along with this program; if not, write to the Free Software Foundation,
 +# Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 +#
 +# The Original Code is Copyright (C) 2006, Blender Foundation
 +# All rights reserved.
 +#
 +# The Original Code is: all of this file.
 +#
 +# Contributor(s): Daniel Genrich
 +#
 +# ***** END GPL LICENSE BLOCK *****
 +
- FILE(GLOB SRC Recast/Source/*.cpp Detour/Source/*.cpp)
++set(INC 
++              Recast/Include 
++              Detour/Include
++)
 +
- BLENDERLIB(extern_recastnavigation "${SRC}" "${INC}")
- #, libtype='blender', priority = 0 )
++set(SRC 
++              Detour/Source/DetourCommon.cpp
++              Detour/Source/DetourNode.cpp
++              Detour/Source/DetourStatNavMesh.cpp
++              Detour/Source/DetourStatNavMeshBuilder.cpp
++              Detour/Source/DetourTileNavMesh.cpp
++              Detour/Source/DetourTileNavMeshBuilder.cpp
++
++              Detour/Include/DetourCommon.h
++              Detour/Include/DetourNode.h
++              Detour/Include/DetourStatNavMesh.h
++              Detour/Include/DetourStatNavMeshBuilder.h
++              Detour/Include/DetourTileNavMesh.h
++              Detour/Include/DetourTileNavMeshBuilder.h
++                      
++              Recast/Source/Recast.cpp
++              Recast/Source/RecastContour.cpp
++              Recast/Source/RecastFilter.cpp
++              Recast/Source/RecastLog.cpp
++              Recast/Source/RecastMesh.cpp
++              Recast/Source/RecastMeshDetail.cpp
++              Recast/Source/RecastRasterization.cpp
++              Recast/Source/RecastRegion.cpp
++              Recast/Source/RecastTimer.cpp
++              
++              Recast/Include/Recast.h
++              Recast/Include/RecastLog.h
++              Recast/Include/RecastTimer.h    
++)
++
++blender_add_lib(extern_recastnavigation "${SRC}" "${INC}")
 +