white space commit. (2 spaces -> tab).
authorCampbell Barton <ideasman42@gmail.com>
Sun, 6 Sep 2009 01:51:23 +0000 (01:51 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 6 Sep 2009 01:51:23 +0000 (01:51 +0000)
Was annoying to use a different editor for cmake only.
theeth says this should be ok with gsoc and merges from branches.

58 files changed:
CMakeLists.txt
extern/CMakeLists.txt
extern/bullet2/CMakeLists.txt
extern/bullet2/src/BulletCollision/CMakeLists.txt
extern/bullet2/src/BulletSoftBody/CMakeLists.txt
extern/glew/CMakeLists.txt
intern/CMakeLists.txt
intern/audaspace/CMakeLists.txt
intern/elbeem/CMakeLists.txt
intern/ghost/CMakeLists.txt
intern/guardedalloc/CMakeLists.txt
intern/smoke/CMakeLists.txt
source/CMakeLists.txt
source/blender/CMakeLists.txt
source/blender/avi/CMakeLists.txt
source/blender/blenfont/CMakeLists.txt
source/blender/blenkernel/CMakeLists.txt
source/blender/blenlib/CMakeLists.txt
source/blender/blenloader/CMakeLists.txt
source/blender/blenpluginapi/CMakeLists.txt
source/blender/editors/CMakeLists.txt
source/blender/editors/screen/CMakeLists.txt
source/blender/gpu/CMakeLists.txt
source/blender/imbuf/CMakeLists.txt
source/blender/imbuf/intern/cineon/CMakeLists.txt
source/blender/imbuf/intern/dds/CMakeLists.txt
source/blender/imbuf/intern/openexr/CMakeLists.txt
source/blender/makesdna/intern/CMakeLists.txt
source/blender/makesrna/intern/CMakeLists.txt
source/blender/nodes/CMakeLists.txt
source/blender/python/CMakeLists.txt
source/blender/quicktime/CMakeLists.txt
source/blender/readblenfile/CMakeLists.txt
source/blender/render/CMakeLists.txt
source/blender/windowmanager/CMakeLists.txt
source/blenderplayer/CMakeLists.txt
source/blenderplayer/bad_level_call_stubs/CMakeLists.txt
source/creator/CMakeLists.txt
source/gameengine/BlenderRoutines/CMakeLists.txt
source/gameengine/CMakeLists.txt
source/gameengine/Converter/CMakeLists.txt
source/gameengine/Expressions/CMakeLists.txt
source/gameengine/GameLogic/CMakeLists.txt
source/gameengine/GamePlayer/CMakeLists.txt
source/gameengine/GamePlayer/common/CMakeLists.txt
source/gameengine/GamePlayer/ghost/CMakeLists.txt
source/gameengine/Ketsji/CMakeLists.txt
source/gameengine/Ketsji/KXNetwork/CMakeLists.txt
source/gameengine/Network/CMakeLists.txt
source/gameengine/Network/LoopBackNetwork/CMakeLists.txt
source/gameengine/Physics/Bullet/CMakeLists.txt
source/gameengine/Physics/Dummy/CMakeLists.txt
source/gameengine/Physics/common/CMakeLists.txt
source/gameengine/Rasterizer/CMakeLists.txt
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
source/gameengine/SceneGraph/CMakeLists.txt
source/gameengine/VideoTexture/CMakeLists.txt
source/kernel/CMakeLists.txt

index 5000ecf..7196049 100644 (file)
@@ -34,11 +34,11 @@ IF(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
 MESSAGE(FATAL_ERROR "CMake generation for blender is not allowed within the source directory! 
 Remove the CMakeCache.txt file and try again from another folder, e.g.: 
 
-   rm CMakeCache.txt 
-   cd ..
-   mkdir cmake-make 
-   cd cmake-make
-   cmake -G \"Unix Makefiles\" ../blender
+       rm CMakeCache.txt 
+       cd ..
+       mkdir cmake-make 
+       cd cmake-make
+       cmake -G \"Unix Makefiles\" ../blender
 ")
 ENDIF(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
 
@@ -76,7 +76,7 @@ OPTION(WITH_CXX_GUARDEDALLOC "Enable GuardedAlloc for C++ memory allocation" OFF
 OPTION(WITH_INSTALL       "Install accompanying scripts and language files needed to run blender" ON)
 
 IF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
-  MESSAGE("WARNING: WITH_PLAYER needs WITH_GAMEENGINE")
+       MESSAGE("WARNING: WITH_PLAYER needs WITH_GAMEENGINE")
 ENDIF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
 
 # For alternate Python locations the commandline can be used to override detected/default cache settings, e.g:
@@ -95,421 +95,421 @@ INCLUDE(CMake/macros.cmake)
 #Platform specifics
 
 IF(UNIX AND NOT APPLE)
-  IF(WITH_OPENAL)
-    FIND_PACKAGE(OpenAL)
-    IF(OPENAL_FOUND)
-      SET(WITH_OPENAL ON)
-    ELSE(OPENAL_FOUND)
-      SET(WITH_OPENAL OFF)
-    ENDIF(OPENAL_FOUND)
-  ENDIF(WITH_OPENAL)
-
-  IF(WITH_JACK)
-    SET(JACK /usr)
-    SET(JACK_INC ${JACK}/include/jack)
-    SET(JACK_LIB jack)
-    SET(JACK_LIBPATH ${JACK}/lib)
-  ENDIF(WITH_JACK)
-
-  IF(WITH_SNDFILE)
+       IF(WITH_OPENAL)
+               FIND_PACKAGE(OpenAL)
+               IF(OPENAL_FOUND)
+                       SET(WITH_OPENAL ON)
+               ELSE(OPENAL_FOUND)
+                       SET(WITH_OPENAL OFF)
+               ENDIF(OPENAL_FOUND)
+       ENDIF(WITH_OPENAL)
+
+       IF(WITH_JACK)
+               SET(JACK /usr)
+               SET(JACK_INC ${JACK}/include/jack)
+               SET(JACK_LIB jack)
+               SET(JACK_LIBPATH ${JACK}/lib)
+       ENDIF(WITH_JACK)
+
+       IF(WITH_SNDFILE)
        SET(SNDFILE /usr)
        SET(SNDFILE_INC ${SNDFILE}/include)
        SET(SNDFILE_LIB sndfile)
        SET(SNDFILE_LIBPATH ${SNDFILE}/lib)
-  ENDIF(WITH_SNDFILE)
-
-  FIND_LIBRARY(INTL_LIBRARY
-    NAMES intl
-    PATHS
-    /sw/lib
-  )
-  FIND_LIBRARY(ICONV_LIBRARY
-    NAMES iconv
-    PATHS
-    /sw/lib
-  )
+       ENDIF(WITH_SNDFILE)
+
+       FIND_LIBRARY(INTL_LIBRARY
+               NAMES intl
+               PATHS
+               /sw/lib
+       )
+       FIND_LIBRARY(ICONV_LIBRARY
+               NAMES iconv
+               PATHS
+               /sw/lib
+       )
   
-  IF(INTL_LIBRARY AND ICONV_LIBRARY)
-    SET(GETTEXT_LIB ${INTL_LIBRARY} ${ICONV_LIBRARY})
-  ENDIF(INTL_LIBRARY AND ICONV_LIBRARY)
-
-  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 "")
+       IF(INTL_LIBRARY AND ICONV_LIBRARY)
+               SET(GETTEXT_LIB ${INTL_LIBRARY} ${ICONV_LIBRARY})
+       ENDIF(INTL_LIBRARY AND ICONV_LIBRARY)
+
+       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 "")
+       # FIND_PACKAGE(PythonInterp) # not used yet
+       # SET(PYTHON_BINARY ${PYTHON_EXECUTABLE} CACHE STRING "")
   
-  SET(PYTHON_LINKFLAGS "-Xlinker -export-dynamic")
-
-  IF(WITH_SDL)
-    FIND_PACKAGE(SDL)
-    # UNSET(SDLMAIN_LIBRARY CACHE)
-    IF(NOT SDL_FOUND)
-      SET(WITH_SDL OFF)
-    ENDIF(NOT SDL_FOUND)
-  ENDIF(WITH_SDL)
-
-  FIND_PATH(OPENEXR_INC
-    ImfXdr.h
-    PATHS
-    /usr/local/include/OpenEXR
-    /usr/include/OpenEXR
-    /sw/include/OpenEXR
-    /opt/local/include/OpenEXR
-    /opt/csw/include/OpenEXR
-    /opt/include/OpenEXR
-  )
-  SET(OPENEXR_LIB Half IlmImf Iex Imath)
-
-  SET(FFMPEG /usr)
-  SET(FFMPEG_INC ${FFMPEG}/include)
-  SET(FFMPEG_LIB avformat avcodec avutil avdevice swscale)
-  SET(FFMPEG_LIBPATH ${FFMPEG}/lib)
+       SET(PYTHON_LINKFLAGS "-Xlinker -export-dynamic")
+
+       IF(WITH_SDL)
+               FIND_PACKAGE(SDL)
+               # UNSET(SDLMAIN_LIBRARY CACHE)
+               IF(NOT SDL_FOUND)
+                       SET(WITH_SDL OFF)
+               ENDIF(NOT SDL_FOUND)
+       ENDIF(WITH_SDL)
+
+       FIND_PATH(OPENEXR_INC
+               ImfXdr.h
+               PATHS
+               /usr/local/include/OpenEXR
+               /usr/include/OpenEXR
+               /sw/include/OpenEXR
+               /opt/local/include/OpenEXR
+               /opt/csw/include/OpenEXR
+               /opt/include/OpenEXR
+       )
+       SET(OPENEXR_LIB Half IlmImf Iex Imath)
+
+       SET(FFMPEG /usr)
+       SET(FFMPEG_INC ${FFMPEG}/include)
+       SET(FFMPEG_LIB avformat avcodec avutil avdevice swscale)
+       SET(FFMPEG_LIBPATH ${FFMPEG}/lib)
   
-  IF(WITH_FFTW3)
-    SET(FFTW3 /usr)
-    SET(FFTW3_INC ${FFTW3}/include)
-    SET(FFTW3_LIB fftw3)
-    SET(FFTW3_LIBPATH ${FFTW3}/lib)
-  ENDIF(WITH_FFTW3)
+       IF(WITH_FFTW3)
+               SET(FFTW3 /usr)
+               SET(FFTW3_INC ${FFTW3}/include)
+               SET(FFTW3_LIB fftw3)
+               SET(FFTW3_LIBPATH ${FFTW3}/lib)
+       ENDIF(WITH_FFTW3)
 
-  SET(LIBSAMPLERATE /usr)
-  SET(LIBSAMPLERATE_INC ${LIBSAMPLERATE}/include)
-  SET(LIBSAMPLERATE_LIB samplerate)
-  SET(LIBSAMPLERATE_LIBPATH ${LIBSAMPLERATE}/lib)
+       SET(LIBSAMPLERATE /usr)
+       SET(LIBSAMPLERATE_INC ${LIBSAMPLERATE}/include)
+       SET(LIBSAMPLERATE_LIB samplerate)
+       SET(LIBSAMPLERATE_LIBPATH ${LIBSAMPLERATE}/lib)
 
-  FIND_PACKAGE(JPEG REQUIRED)
+       FIND_PACKAGE(JPEG REQUIRED)
 
-  FIND_PACKAGE(PNG REQUIRED)
+       FIND_PACKAGE(PNG REQUIRED)
 
-  FIND_PACKAGE(ZLIB REQUIRED)
+       FIND_PACKAGE(ZLIB REQUIRED)
 
-  # Could use ${X11_Xinput_LIB} ${X11_X11_LIB} too
-  SET(LLIBS "-lXi -lutil -lc -lm -lpthread -lstdc++ -lX11")
+       # Could use ${X11_Xinput_LIB} ${X11_X11_LIB} too
+       SET(LLIBS "-lXi -lutil -lc -lm -lpthread -lstdc++ -lX11")
 
-  IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
-    # BSD's dont use libdl.so
-    SET(LLIBS "${LLIBS} -ldl")
-  ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+       IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+               # BSD's dont use libdl.so
+               SET(LLIBS "${LLIBS} -ldl")
+       ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
 
-  IF(WITH_OPENMP)
-    SET(LLIBS "${LLIBS} -lgomp")
-    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fopenmp")
-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp")
-  ENDIF(WITH_OPENMP)
+       IF(WITH_OPENMP)
+               SET(LLIBS "${LLIBS} -lgomp")
+               SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fopenmp")
+               SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp")
+       ENDIF(WITH_OPENMP)
 
 
-  SET(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing -DXP_UNIX -Wno-char-subscripts")
+       SET(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing -DXP_UNIX -Wno-char-subscripts")
 
-  SET(PLATFORM_LINKFLAGS "-pthread")
+       SET(PLATFORM_LINKFLAGS "-pthread")
 
-  # Better warnings
-  SET(C_WARNINGS "-Wall -Wno-char-subscripts -Wpointer-arith -Wcast-align -Wdeclaration-after-statement")
-  SET(CXX_WARNINGS "-Wall -Wno-invalid-offsetof -Wno-sign-compare")
+       # Better warnings
+       SET(C_WARNINGS "-Wall -Wno-char-subscripts -Wpointer-arith -Wcast-align -Wdeclaration-after-statement")
+       SET(CXX_WARNINGS "-Wall -Wno-invalid-offsetof -Wno-sign-compare")
 
-  INCLUDE_DIRECTORIES(${JPEG_INCLUDE_DIR} ${PNG_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} )
+       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
-  #  INCLUDE(${CMAKE_ROOT}/Modules/Platform/Windows-cl.cmake)
+       # this file is included anyway when building under Windows with cl.exe
+       #  INCLUDE(${CMAKE_ROOT}/Modules/Platform/Windows-cl.cmake)
   
-  SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/windows)
-
-  # Setup 64bit and 64bit windows systems
-  IF(CMAKE_CL_64)
-    message("64 bit compiler detected.")
-    SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/win64)
-  ENDIF(CMAKE_CL_64)
-
-  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(CMAKE_CL_64)
-    SET(WITH_OPENAL OFF)
-  ELSE(CMAKE_CL_64)
-    #SET(WITH_OPENAL ON)
-    SET(OPENAL ${LIBDIR}/openal)
-    SET(OPENAL_INCLUDE_DIR ${OPENAL}/include)
-    SET(OPENAL_LIBRARY wrap_oal)
-    SET(OPENAL_LIBPATH ${OPENAL}/lib)
-  ENDIF(CMAKE_CL_64)
-
-  IF(WITH_JACK)
-    SET(JACK ${LIBDIR}/jack)
-    SET(JACK_INC ${JACK}/include/jack ${JACK}/include)
-    SET(JACK_LIB libjack)
-    SET(JACK_LIBPATH ${JACK}/lib)
-  ENDIF(WITH_JACK)
-
-  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(CMAKE_CL_64)
-    SET(PNG_LIBRARIES libpng)
-  ELSE(CMAKE_CL_64)
-    SET(PNG_LIBRARIES libpng_st)
-  ENDIF(CMAKE_CL_64)
-  SET(JPEG_LIBRARY libjpeg)
-
-  SET(ZLIB ${LIBDIR}/zlib)
-  SET(ZLIB_INC ${ZLIB}/include)
-  IF(CMAKE_CL_64)
-    SET(ZLIB_LIBRARIES libz)
-  ELSE(CMAKE_CL_64)
-    SET(ZLIB_LIBRARIES zlib)
-  ENDIF(CMAKE_CL_64)
-  SET(ZLIB_LIBPATH ${ZLIB}/lib)
+       SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/windows)
+
+       # Setup 64bit and 64bit windows systems
+       IF(CMAKE_CL_64)
+               message("64 bit compiler detected.")
+               SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/win64)
+       ENDIF(CMAKE_CL_64)
+
+       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(CMAKE_CL_64)
+               SET(WITH_OPENAL OFF)
+       ELSE(CMAKE_CL_64)
+               #SET(WITH_OPENAL ON)
+               SET(OPENAL ${LIBDIR}/openal)
+               SET(OPENAL_INCLUDE_DIR ${OPENAL}/include)
+               SET(OPENAL_LIBRARY wrap_oal)
+               SET(OPENAL_LIBPATH ${OPENAL}/lib)
+       ENDIF(CMAKE_CL_64)
+
+       IF(WITH_JACK)
+               SET(JACK ${LIBDIR}/jack)
+               SET(JACK_INC ${JACK}/include/jack ${JACK}/include)
+               SET(JACK_LIB libjack)
+               SET(JACK_LIBPATH ${JACK}/lib)
+       ENDIF(WITH_JACK)
+
+       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(CMAKE_CL_64)
+               SET(PNG_LIBRARIES libpng)
+       ELSE(CMAKE_CL_64)
+               SET(PNG_LIBRARIES libpng_st)
+       ENDIF(CMAKE_CL_64)
+       SET(JPEG_LIBRARY libjpeg)
+
+       SET(ZLIB ${LIBDIR}/zlib)
+       SET(ZLIB_INC ${ZLIB}/include)
+       IF(CMAKE_CL_64)
+               SET(ZLIB_LIBRARIES libz)
+       ELSE(CMAKE_CL_64)
+               SET(ZLIB_LIBRARIES zlib)
+       ENDIF(CMAKE_CL_64)
+       SET(ZLIB_LIBPATH ${ZLIB}/lib)
   
-  SET(PTHREADS ${LIBDIR}/pthreads)
-  SET(PTHREADS_INC ${PTHREADS}/include)
-  SET(PTHREADS_LIB pthreadVC2)
-  SET(PTHREADS_LIBPATH ${PTHREADS}/lib)
+       SET(PTHREADS ${LIBDIR}/pthreads)
+       SET(PTHREADS_INC ${PTHREADS}/include)
+       SET(PTHREADS_LIB pthreadVC2)
+       SET(PTHREADS_LIBPATH ${PTHREADS}/lib)
   
-  SET(ICONV ${LIBDIR}/iconv)
-  SET(ICONV_INC ${ICONV}/include)
-  SET(ICONV_LIB iconv)
-  SET(ICONV_LIBPATH ${ICONV}/lib)
+       SET(ICONV ${LIBDIR}/iconv)
+       SET(ICONV_INC ${ICONV}/include)
+       SET(ICONV_LIB iconv)
+       SET(ICONV_LIBPATH ${ICONV}/lib)
   
-  IF(WITH_FFTW3)
-    SET(FFTW3 ${LIBDIR}/fftw3)
-    SET(FFTW3_INC ${FFTW3}/include)
-    SET(FFTW3_LIB libfftw)
-    SET(FFTW3_LIBPATH ${FFTW3}/lib)
-  ENDIF(WITH_FFTW3)
+       IF(WITH_FFTW3)
+               SET(FFTW3 ${LIBDIR}/fftw3)
+               SET(FFTW3_INC ${FFTW3}/include)
+               SET(FFTW3_LIB libfftw)
+               SET(FFTW3_LIBPATH ${FFTW3}/lib)
+       ENDIF(WITH_FFTW3)
   
-  SET(GETTEXT ${LIBDIR}/gettext)
-  SET(GETTEXT_INC ${GETTEXT}/include)
-  IF(CMAKE_CL_64)
-    SET(GETTEXT_LIB gettext)
-  ELSE(CMAKE_CL_64)
-    SET(GETTEXT_LIB gnu_gettext)
-  ENDIF(CMAKE_CL_64)
-  SET(GETTEXT_LIBPATH ${GETTEXT}/lib)
-
-  SET(FREETYPE ${LIBDIR}/freetype)
-  SET(FREETYPE_INCLUDE_DIRS ${FREETYPE}/include ${FREETYPE}/include/freetype2)
-  SET(FREETYPE_LIBPATH ${FREETYPE}/lib)
-  SET(FREETYPE_LIBRARY freetype2ST)
+       SET(GETTEXT ${LIBDIR}/gettext)
+       SET(GETTEXT_INC ${GETTEXT}/include)
+       IF(CMAKE_CL_64)
+               SET(GETTEXT_LIB gettext)
+       ELSE(CMAKE_CL_64)
+               SET(GETTEXT_LIB gnu_gettext)
+       ENDIF(CMAKE_CL_64)
+       SET(GETTEXT_LIBPATH ${GETTEXT}/lib)
+
+       SET(FREETYPE ${LIBDIR}/freetype)
+       SET(FREETYPE_INCLUDE_DIRS ${FREETYPE}/include ${FREETYPE}/include/freetype2)
+       SET(FREETYPE_LIBPATH ${FREETYPE}/lib)
+       SET(FREETYPE_LIBRARY freetype2ST)
   
-  SET(OPENEXR ${LIBDIR}/openexr)
-  SET(OPENEXR_INC ${OPENEXR}/include ${OPENEXR}/include/IlmImf ${OPENEXR}/include/Iex ${OPENEXR}/include/Imath)
-  SET(OPENEXR_LIB Iex Half IlmImf Imath IlmThread)
-  IF (MSVC80)
-    SET(OPENEXR_LIBPATH ${OPENEXR}/lib_vs2005)
-  ELSE (MSVC80)
-    SET(OPENEXR_LIBPATH ${OPENEXR}/lib_msvc)
-  ENDIF(MSVC80)
-  IF (MSVC90)
-    SET(OPENEXR_LIBPATH ${OPENEXR}/lib_vs2008)
-  ENDIF(MSVC90)
+       SET(OPENEXR ${LIBDIR}/openexr)
+       SET(OPENEXR_INC ${OPENEXR}/include ${OPENEXR}/include/IlmImf ${OPENEXR}/include/Iex ${OPENEXR}/include/Imath)
+       SET(OPENEXR_LIB Iex Half IlmImf Imath IlmThread)
+       IF (MSVC80)
+               SET(OPENEXR_LIBPATH ${OPENEXR}/lib_vs2005)
+       ELSE (MSVC80)
+               SET(OPENEXR_LIBPATH ${OPENEXR}/lib_msvc)
+       ENDIF(MSVC80)
+       IF (MSVC90)
+               SET(OPENEXR_LIBPATH ${OPENEXR}/lib_vs2008)
+       ENDIF(MSVC90)
 
   
-  SET(QUICKTIME ${LIBDIR}/QTDevWin)
-  SET(QUICKTIME_INC ${QUICKTIME}/CIncludes)
-  SET(QUICKTIME_LIB qtmlClient)
-  SET(QUICKTIME_LIBPATH ${QUICKTIME}/Libraries)
-
-  SET(FFMPEG ${LIBDIR}/ffmpeg)
-  SET(FFMPEG_INC ${FFMPEG}/include ${FFMPEG}/include/msvc)
-  SET(FFMPEG_LIB avcodec-52 avformat-52 avdevice-52 avutil-50 swscale-0)
-  SET(FFMPEG_LIBPATH ${FFMPEG}/lib)
-
-  SET(LIBSAMPLERATE ${LIBDIR}/samplerate)
-  SET(LIBSAMPLERATE_INC ${LIBSAMPLERATE}/include)
-  SET(LIBSAMPLERATE_LIB libsamplerate)
-  SET(LIBSAMPLERATE_LIBPATH ${LIBSAMPLERATE}/lib)
-
-  IF(CMAKE_CL_64)
-    SET(LLIBS kernel32 user32 vfw32 winmm ws2_32 )
-  ELSE(CMAKE_CL_64)
-    SET(LLIBS kernel32 user32 gdi32 comdlg32 advapi32 shell32 ole32 oleaut32 uuid ws2_32 vfw32 winmm)
-  ENDIF(CMAKE_CL_64)
-
-  SET(CMAKE_CXX_FLAGS_DEBUG "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305 /D_DEBUG /Od /Gm /EHsc /RTC1 /MTd /W3 /nologo /ZI /J" CACHE STRING "MSVC MT flags " FORCE)
-  SET(CMAKE_CXX_FLAGS_RELEASE "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305 /O2 /Ob2 /DNDEBUG /EHsc /MT /W3 /nologo /J" CACHE STRING "MSVC MT flags " FORCE)
-  SET(CMAKE_CXX_FLAGS_MINSIZEREL "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305 /O1 /Ob1 /DNDEBUG /EHsc /MT /W3 /nologo /J" CACHE STRING "MSVC MT flags " FORCE)
-  SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305 /O2 /Ob1 /DNDEBUG /EHsc /MT /W3 /nologo /Zi /J" CACHE STRING "MSVC MT flags " FORCE)
-  SET(CMAKE_C_FLAGS_DEBUG "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305 /D_DEBUG /Od /Gm /EHsc /RTC1 /MTd /W3 /nologo /ZI /J" CACHE STRING "MSVC MT flags " FORCE)
-  SET(CMAKE_C_FLAGS_RELEASE "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305 /O2 /Ob2 /DNDEBUG /EHsc /MT /W3 /nologo /J" CACHE STRING "MSVC MT flags " FORCE)
-  SET(CMAKE_C_FLAGS_MINSIZEREL "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305 /O1 /Ob1 /DNDEBUG /EHsc /MT /W3 /nologo /J" CACHE STRING "MSVC MT flags " FORCE)
-  SET(CMAKE_C_FLAGS_RELWITHDEBINFO "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305 /O2 /Ob1 /DNDEBUG /EHsc /MT /W3 /nologo /Zi /J" CACHE STRING "MSVC MT flags " FORCE)
-
-  IF(WITH_OPENMP)
-    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /openmp ")
-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /openmp ")
-  ENDIF(WITH_OPENMP)
-
-  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)
-
-  SET(JPEG "${LIBDIR}/jpeg")
-  SET(JPEG_INC "${JPEG}/include")
-  SET(JPEG_LIBPATH ${JPEG}/lib)
-
-  SET(TIFF ${LIBDIR}/tiff)
-  SET(TIFF_INC ${TIFF}/include)
+       SET(QUICKTIME ${LIBDIR}/QTDevWin)
+       SET(QUICKTIME_INC ${QUICKTIME}/CIncludes)
+       SET(QUICKTIME_LIB qtmlClient)
+       SET(QUICKTIME_LIBPATH ${QUICKTIME}/Libraries)
+
+       SET(FFMPEG ${LIBDIR}/ffmpeg)
+       SET(FFMPEG_INC ${FFMPEG}/include ${FFMPEG}/include/msvc)
+       SET(FFMPEG_LIB avcodec-52 avformat-52 avdevice-52 avutil-50 swscale-0)
+       SET(FFMPEG_LIBPATH ${FFMPEG}/lib)
+
+       SET(LIBSAMPLERATE ${LIBDIR}/samplerate)
+       SET(LIBSAMPLERATE_INC ${LIBSAMPLERATE}/include)
+       SET(LIBSAMPLERATE_LIB libsamplerate)
+       SET(LIBSAMPLERATE_LIBPATH ${LIBSAMPLERATE}/lib)
+
+       IF(CMAKE_CL_64)
+               SET(LLIBS kernel32 user32 vfw32 winmm ws2_32 )
+       ELSE(CMAKE_CL_64)
+               SET(LLIBS kernel32 user32 gdi32 comdlg32 advapi32 shell32 ole32 oleaut32 uuid ws2_32 vfw32 winmm)
+       ENDIF(CMAKE_CL_64)
+
+       SET(CMAKE_CXX_FLAGS_DEBUG "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305 /D_DEBUG /Od /Gm /EHsc /RTC1 /MTd /W3 /nologo /ZI /J" CACHE STRING "MSVC MT flags " FORCE)
+       SET(CMAKE_CXX_FLAGS_RELEASE "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305 /O2 /Ob2 /DNDEBUG /EHsc /MT /W3 /nologo /J" CACHE STRING "MSVC MT flags " FORCE)
+       SET(CMAKE_CXX_FLAGS_MINSIZEREL "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305 /O1 /Ob1 /DNDEBUG /EHsc /MT /W3 /nologo /J" CACHE STRING "MSVC MT flags " FORCE)
+       SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305 /O2 /Ob1 /DNDEBUG /EHsc /MT /W3 /nologo /Zi /J" CACHE STRING "MSVC MT flags " FORCE)
+       SET(CMAKE_C_FLAGS_DEBUG "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305 /D_DEBUG /Od /Gm /EHsc /RTC1 /MTd /W3 /nologo /ZI /J" CACHE STRING "MSVC MT flags " FORCE)
+       SET(CMAKE_C_FLAGS_RELEASE "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305 /O2 /Ob2 /DNDEBUG /EHsc /MT /W3 /nologo /J" CACHE STRING "MSVC MT flags " FORCE)
+       SET(CMAKE_C_FLAGS_MINSIZEREL "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305 /O1 /Ob1 /DNDEBUG /EHsc /MT /W3 /nologo /J" CACHE STRING "MSVC MT flags " FORCE)
+       SET(CMAKE_C_FLAGS_RELWITHDEBINFO "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305 /O2 /Ob1 /DNDEBUG /EHsc /MT /W3 /nologo /Zi /J" CACHE STRING "MSVC MT flags " FORCE)
+
+       IF(WITH_OPENMP)
+               SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /openmp ")
+               SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /openmp ")
+       ENDIF(WITH_OPENMP)
+
+       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)
+
+       SET(JPEG "${LIBDIR}/jpeg")
+       SET(JPEG_INC "${JPEG}/include")
+       SET(JPEG_LIBPATH ${JPEG}/lib)
+
+       SET(TIFF ${LIBDIR}/tiff)
+       SET(TIFF_INC ${TIFF}/include)
   
-  SET(WINTAB_INC ${LIBDIR}/wintab/include) 
+       SET(WINTAB_INC ${LIBDIR}/wintab/include) 
 
-  IF(CMAKE_CL_64)
-    SET(PLATFORM_LINKFLAGS "/MACHINE:X64 /NODEFAULTLIB:libc.lib;MSVCRT.lib ")
-  ELSE(CMAKE_CL_64)
-    SET(PLATFORM_LINKFLAGS "/NODEFAULTLIB:libc.lib ")
-  ENDIF(CMAKE_CL_64)
+       IF(CMAKE_CL_64)
+               SET(PLATFORM_LINKFLAGS "/MACHINE:X64 /NODEFAULTLIB:libc.lib;MSVCRT.lib ")
+       ELSE(CMAKE_CL_64)
+               SET(PLATFORM_LINKFLAGS "/NODEFAULTLIB:libc.lib ")
+       ENDIF(CMAKE_CL_64)
   
-  SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:libcmt.lib;libc.lib ")
+       SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:libcmt.lib;libc.lib ")
 ENDIF(WIN32)
 
 IF(APPLE)
-  IF(CMAKE_OSX_ARCHITECTURES MATCHES i386)
-    SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/darwin-8.x.i386)
-  ELSE(CMAKE_OSX_ARCHITECTURES MATCHES i386)
-    SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/darwin-6.1-powerpc)
-  ENDIF(CMAKE_OSX_ARCHITECTURES MATCHES i386)
-
-  IF(WITH_OPENAL)
-    FIND_PACKAGE(OpenAL)
-    IF(OPENAL_FOUND)
-      SET(WITH_OPENAL ON)
-    ELSE(OPENAL_FOUND)
-      SET(WITH_OPENAL OFF)
-    ENDIF(OPENAL_FOUND)
-  ENDIF(WITH_OPENAL)
-
-  IF(WITH_JACK)
-    SET(JACK /usr)
-    SET(JACK_INC ${JACK}/include/jack)
-    SET(JACK_LIB jack)
-    SET(JACK_LIBPATH ${JACK}/lib)
-  ENDIF(WITH_JACK)
-
-  IF(WITH_SNDFILE)
-       SET(SNDFILE /usr)
-       SET(SNDFILE_INC ${SNDFILE}/include)
-       SET(SNDFILE_LIB sndfile)
-       SET(SNDFILE_LIBPATH ${SNDFILE}/lib)
-  ENDIF(WITH_SNDFILE)
-
-  SET(PYTHON_VERSION 3.1)
-
-  IF(PYTHON_VERSION MATCHES 3.1)
-    # we use precompiled libraries for py 3.1 and up by default
-
-    SET(PYTHON ${LIBDIR}/python)
-    SET(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}" CACHE STRING "")
-    # SET(PYTHON_BINARY "${PYTHON}/bin/python${PYTHON_VERSION}" CACHE STRING "") # not used yet
-    SET(PYTHON_LIB python${PYTHON_VERSION})
-    SET(PYTHON_LIBPATH "${PYTHON}/lib/python${PYTHON_VERSION}" CACHE STRING "")
-    #    SET(PYTHON_LINKFLAGS "-u _PyMac_Error")  # won't  build with this enabled
-  ELSE(PYTHON_VERSION MATCHES 3.1)
-    # otherwise, use custom system framework
-
-    SET(PYTHON /System/Library/Frameworks/Python.framework/Versions/)
-    SET(PYTHON_VERSION 2.5)
-    SET(PYTHON_INC "${PYTHON}${PYTHON_VERSION}/include/python${PYTHON_VERSION}" CACHE STRING "")
-    # SET(PYTHON_BINARY ${PYTHON}${PYTHON_VERSION}/bin/python${PYTHON_VERSION} CACHE STRING "") # not used yet
-    SET(PYTHON_LIB "")
-    SET(PYTHON_LIBPATH ${PYTHON}${PYTHON_VERSION}/lib/python${PYTHON_VERSION}/config CACHE STRING "")
-    SET(PYTHON_LINKFLAGS "-u _PyMac_Error -framework System -framework Python")
-  ENDIF(PYTHON_VERSION MATCHES 3.1)
-
-  SET(GETTEXT ${LIBDIR}/gettext)
-  SET(GETTEXT_INC "${GETTEXT}/include")
-  SET(GETTEXT_LIB intl iconv)
-  SET(GETTEXT_LIBPATH ${GETTEXT}/lib)
+       IF(CMAKE_OSX_ARCHITECTURES MATCHES i386)
+               SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/darwin-8.x.i386)
+       ELSE(CMAKE_OSX_ARCHITECTURES MATCHES i386)
+               SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/darwin-6.1-powerpc)
+       ENDIF(CMAKE_OSX_ARCHITECTURES MATCHES i386)
+
+       IF(WITH_OPENAL)
+               FIND_PACKAGE(OpenAL)
+               IF(OPENAL_FOUND)
+                       SET(WITH_OPENAL ON)
+               ELSE(OPENAL_FOUND)
+                       SET(WITH_OPENAL OFF)
+               ENDIF(OPENAL_FOUND)
+       ENDIF(WITH_OPENAL)
+
+       IF(WITH_JACK)
+               SET(JACK /usr)
+               SET(JACK_INC ${JACK}/include/jack)
+               SET(JACK_LIB jack)
+               SET(JACK_LIBPATH ${JACK}/lib)
+       ENDIF(WITH_JACK)
+
+       IF(WITH_SNDFILE)
+               SET(SNDFILE /usr)
+               SET(SNDFILE_INC ${SNDFILE}/include)
+               SET(SNDFILE_LIB sndfile)
+               SET(SNDFILE_LIBPATH ${SNDFILE}/lib)
+       ENDIF(WITH_SNDFILE)
+
+       SET(PYTHON_VERSION 3.1)
+
+       IF(PYTHON_VERSION MATCHES 3.1)
+               # we use precompiled libraries for py 3.1 and up by default
+
+               SET(PYTHON ${LIBDIR}/python)
+               SET(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}" CACHE STRING "")
+               # SET(PYTHON_BINARY "${PYTHON}/bin/python${PYTHON_VERSION}" CACHE STRING "") # not used yet
+               SET(PYTHON_LIB python${PYTHON_VERSION})
+               SET(PYTHON_LIBPATH "${PYTHON}/lib/python${PYTHON_VERSION}" CACHE STRING "")
+               #    SET(PYTHON_LINKFLAGS "-u _PyMac_Error")  # won't  build with this enabled
+       ELSE(PYTHON_VERSION MATCHES 3.1)
+               # otherwise, use custom system framework
+
+               SET(PYTHON /System/Library/Frameworks/Python.framework/Versions/)
+               SET(PYTHON_VERSION 2.5)
+               SET(PYTHON_INC "${PYTHON}${PYTHON_VERSION}/include/python${PYTHON_VERSION}" CACHE STRING "")
+               # SET(PYTHON_BINARY ${PYTHON}${PYTHON_VERSION}/bin/python${PYTHON_VERSION} CACHE STRING "") # not used yet
+               SET(PYTHON_LIB "")
+               SET(PYTHON_LIBPATH ${PYTHON}${PYTHON_VERSION}/lib/python${PYTHON_VERSION}/config CACHE STRING "")
+               SET(PYTHON_LINKFLAGS "-u _PyMac_Error -framework System -framework Python")
+       ENDIF(PYTHON_VERSION MATCHES 3.1)
+
+       SET(GETTEXT ${LIBDIR}/gettext)
+       SET(GETTEXT_INC "${GETTEXT}/include")
+       SET(GETTEXT_LIB intl iconv)
+       SET(GETTEXT_LIBPATH ${GETTEXT}/lib)
   
-  IF(WITH_FFTW3)
-    SET(FFTW3 ${LIBDIR}/fftw3)
-    SET(FFTW3_INC ${FFTW3}/include)
-    SET(FFTW3_LIB libfftw)
-    SET(FFTW3_LIBPATH ${FFTW3}/lib)
-  ENDIF(WITH_FFTW3)
-
-  SET(PNG_LIBRARIES png)
-  SET(JPEG_LIBRARY jpeg)
-
-  SET(ZLIB /usr)
-  SET(ZLIB_INC "${ZLIB}/include")
-  SET(ZLIB_LIBRARIES z)
-
-  SET(FREETYPE ${LIBDIR}/freetype)
-  SET(FREETYPE_INCLUDE_DIRS ${FREETYPE}/include ${FREETYPE}/include/freetype2)
-  SET(FREETYPE_LIBPATH ${FREETYPE}/lib)
-  SET(FREETYPE_LIBRARY freetype)
-
-  SET(OPENEXR ${LIBDIR}/openexr)
-  SET(OPENEXR_INC ${OPENEXR}/include/OpenEXR ${OPENEXR}/include)
-  SET(OPENEXR_LIB Iex Half IlmImf Imath IlmThread)
-  SET(OPENEXR_LIBPATH ${OPENEXR}/lib)
-
-  SET(FFMPEG ${LIBDIR}/ffmpeg)
-  SET(FFMPEG_INC ${CMAKE_SOURCE_DIR}/extern/ffmpeg)
-  SET(FFMPEG_LIB avcodec avdevice avformat avutil mp3lame swscale x264 xvidcore)
-  SET(FFMPEG_LIBPATH ${FFMPEG}/lib)
-
-  SET(LIBSAMPLERATE ${LIBDIR}/samplerate)
-  SET(LIBSAMPLERATE_INC ${LIBSAMPLERATE}/include)
-  SET(LIBSAMPLERATE_LIB samplerate)
-  SET(LIBSAMPLERATE_LIBPATH ${LIBSAMPLERATE}/lib)
-
-  SET(LLIBS stdc++ SystemStubs)
-
-  SET(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing")
-  SET(PLATFORM_LINKFLAGS "-fexceptions -framework CoreServices -framework Foundation -framework IOKit -framework AppKit -framework Carbon -framework AGL -framework AudioUnit -framework AudioToolbox -framework CoreAudio -framework QuickTime")
-
-  IF(WITH_OPENMP)
-    SET(LLIBS "${LLIBS} -lgomp ")
-    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fopenmp ")
-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp ")
-  ENDIF(WITH_OPENMP)
-
-  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)
-
-  SET(JPEG "${LIBDIR}/jpeg")
-  SET(JPEG_INC "${JPEG}/include")
-  SET(JPEG_LIBPATH ${JPEG}/lib)
-
-  SET(TIFF ${LIBDIR}/tiff)
-  SET(TIFF_INC ${TIFF}/include)
-
-  SET(EXETYPE MACOSX_BUNDLE)
+       IF(WITH_FFTW3)
+               SET(FFTW3 ${LIBDIR}/fftw3)
+               SET(FFTW3_INC ${FFTW3}/include)
+               SET(FFTW3_LIB libfftw)
+               SET(FFTW3_LIBPATH ${FFTW3}/lib)
+       ENDIF(WITH_FFTW3)
+
+       SET(PNG_LIBRARIES png)
+       SET(JPEG_LIBRARY jpeg)
+
+       SET(ZLIB /usr)
+       SET(ZLIB_INC "${ZLIB}/include")
+       SET(ZLIB_LIBRARIES z)
+
+       SET(FREETYPE ${LIBDIR}/freetype)
+       SET(FREETYPE_INCLUDE_DIRS ${FREETYPE}/include ${FREETYPE}/include/freetype2)
+       SET(FREETYPE_LIBPATH ${FREETYPE}/lib)
+       SET(FREETYPE_LIBRARY freetype)
+
+       SET(OPENEXR ${LIBDIR}/openexr)
+       SET(OPENEXR_INC ${OPENEXR}/include/OpenEXR ${OPENEXR}/include)
+       SET(OPENEXR_LIB Iex Half IlmImf Imath IlmThread)
+       SET(OPENEXR_LIBPATH ${OPENEXR}/lib)
+
+       SET(FFMPEG ${LIBDIR}/ffmpeg)
+       SET(FFMPEG_INC ${CMAKE_SOURCE_DIR}/extern/ffmpeg)
+       SET(FFMPEG_LIB avcodec avdevice avformat avutil mp3lame swscale x264 xvidcore)
+       SET(FFMPEG_LIBPATH ${FFMPEG}/lib)
+
+       SET(LIBSAMPLERATE ${LIBDIR}/samplerate)
+       SET(LIBSAMPLERATE_INC ${LIBSAMPLERATE}/include)
+       SET(LIBSAMPLERATE_LIB samplerate)
+       SET(LIBSAMPLERATE_LIBPATH ${LIBSAMPLERATE}/lib)
+
+       SET(LLIBS stdc++ SystemStubs)
+
+       SET(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing")
+       SET(PLATFORM_LINKFLAGS "-fexceptions -framework CoreServices -framework Foundation -framework IOKit -framework AppKit -framework Carbon -framework AGL -framework AudioUnit -framework AudioToolbox -framework CoreAudio -framework QuickTime")
+
+       IF(WITH_OPENMP)
+               SET(LLIBS "${LLIBS} -lgomp ")
+               SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fopenmp ")
+               SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp ")
+       ENDIF(WITH_OPENMP)
+
+       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)
+
+       SET(JPEG "${LIBDIR}/jpeg")
+       SET(JPEG_INC "${JPEG}/include")
+       SET(JPEG_LIBPATH ${JPEG}/lib)
+
+       SET(TIFF ${LIBDIR}/tiff)
+       SET(TIFF_INC ${TIFF}/include)
+
+       SET(EXETYPE MACOSX_BUNDLE)
 ENDIF(APPLE)
 
 IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
-  SET(BINRELOC ${CMAKE_SOURCE_DIR}/extern/binreloc)
-  SET(BINRELOC_INC ${BINRELOC}/include)
+       SET(BINRELOC ${CMAKE_SOURCE_DIR}/extern/binreloc)
+       SET(BINRELOC_INC ${BINRELOC}/include)
 ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
 
 
@@ -534,10 +534,10 @@ set(OPENJPEG_LIb extern_libopenjpeg)
 # Blender WebPlugin
 
 IF(WITH_WEBPLUGIN) 
-  SET(GECKO_DIR "${CMAKE_SOURCE_DIR}/../gecko-sdk/" CACHE PATH "Gecko SDK path")
-  SET(WEBPLUGIN_SANDBOX_MODE "apparmor" CACHE STRING "WEB Plugin sandbox mode, can be apparmor, privsep, none")
+       SET(GECKO_DIR "${CMAKE_SOURCE_DIR}/../gecko-sdk/" CACHE PATH "Gecko SDK path")
+       SET(WEBPLUGIN_SANDBOX_MODE "apparmor" CACHE STRING "WEB Plugin sandbox mode, can be apparmor, privsep, none")
 
-  SET(WITH_PLAYER ON)
+       SET(WITH_PLAYER ON)
 ENDIF(WITH_WEBPLUGIN)
 
 
@@ -555,7 +555,7 @@ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${PLATFORM_CFLAGS} ${CXX_WARNINGS}")
 
 # better not define flags here but this is a debugging option thats off by default.
 IF(WITH_CXX_GUARDEDALLOC)
-  SET(CMAKE_CXX_FLAGS " -DWITH_CXX_GUARDEDALLOC -I${CMAKE_SOURCE_DIR}/intern/guardedalloc ${CMAKE_CXX_FLAGS}")
+       SET(CMAKE_CXX_FLAGS " -DWITH_CXX_GUARDEDALLOC -I${CMAKE_SOURCE_DIR}/intern/guardedalloc ${CMAKE_CXX_FLAGS}")
 ENDIF(WITH_CXX_GUARDEDALLOC)
 
 #-----------------------------------------------------------------------------
@@ -574,6 +574,6 @@ ADD_SUBDIRECTORY(source/creator)
 #-----------------------------------------------------------------------------
 # Blender Player
 IF(WITH_PLAYER)
-  ADD_SUBDIRECTORY(source/blenderplayer)
+       ADD_SUBDIRECTORY(source/blenderplayer)
 ENDIF(WITH_PLAYER)
 
index 019cd9d..44e47aa 100644 (file)
 # ***** END GPL LICENSE BLOCK *****
 
 IF(WITH_BULLET)
-  ADD_SUBDIRECTORY(bullet2)
+       ADD_SUBDIRECTORY(bullet2)
 ENDIF(WITH_BULLET)
 
 IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
-  ADD_SUBDIRECTORY(binreloc)
+       ADD_SUBDIRECTORY(binreloc)
 ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
 
 ADD_SUBDIRECTORY(glew)
 
 IF(WITH_OPENJPEG)
-  ADD_SUBDIRECTORY(libopenjpeg)
+       ADD_SUBDIRECTORY(libopenjpeg)
 ENDIF(WITH_OPENJPEG)
 
 ADD_SUBDIRECTORY(lzo)
index edb6b9c..2e2d892 100644 (file)
 SET(INC . src)
 
 FILE(GLOB SRC   
-  src/LinearMath/*.cpp
-  src/BulletCollision/BroadphaseCollision/*.cpp
-  src/BulletCollision/CollisionShapes/*.cpp
-  src/BulletCollision/NarrowPhaseCollision/*.cpp
-  src/BulletCollision/Gimpact/*.cpp
-  src/BulletCollision//CollisionDispatch/*.cpp
-  src/BulletDynamics/ConstraintSolver/*.cpp
-  src/BulletDynamics/Vehicle/*.cpp
-  src/BulletDynamics/Dynamics/*.cpp
-  src/BulletSoftBody/*.cpp
+       src/LinearMath/*.cpp
+       src/BulletCollision/BroadphaseCollision/*.cpp
+       src/BulletCollision/CollisionShapes/*.cpp
+       src/BulletCollision/NarrowPhaseCollision/*.cpp
+       src/BulletCollision/Gimpact/*.cpp
+       src/BulletCollision//CollisionDispatch/*.cpp
+       src/BulletDynamics/ConstraintSolver/*.cpp
+       src/BulletDynamics/Vehicle/*.cpp
+       src/BulletDynamics/Dynamics/*.cpp
+       src/BulletSoftBody/*.cpp
 )
 
 ADD_DEFINITIONS(-D_LIB)
index 4b4304f..ddc806a 100644 (file)
@@ -211,13 +211,13 @@ ADD_LIBRARY(BulletCollision ${BulletCollision_SRCS} ${BulletCollision_HDRS})
 SET_TARGET_PROPERTIES(BulletCollision PROPERTIES VERSION ${BULLET_VERSION})
 SET_TARGET_PROPERTIES(BulletCollision PROPERTIES SOVERSION ${BULLET_VERSION})
 IF (BUILD_SHARED_LIBS)
-  TARGET_LINK_LIBRARIES(BulletCollision LinearMath)
+       TARGET_LINK_LIBRARIES(BulletCollision LinearMath)
 ENDIF (BUILD_SHARED_LIBS)
 
 #INSTALL of other files requires CMake 2.6
 IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
        INSTALL(TARGETS BulletCollision DESTINATION lib)
-        INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.h")
+                               INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.h")
 ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
 
 IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
index dbd87af..fe31d2b 100644 (file)
@@ -34,7 +34,7 @@ ENDIF (BUILD_SHARED_LIBS)
 
 IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
        INSTALL(TARGETS BulletSoftBody DESTINATION lib)
-        INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.h")
+                               INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.h")
 ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
 
 IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
index eea3448..26d10a6 100644 (file)
 SET(INC include src)
 
 IF(UNIX)
-  SET(INC ${INC} ${X11_X11_INCLUDE_PATH})
+       SET(INC ${INC} ${X11_X11_INCLUDE_PATH})
 ENDIF(UNIX)
 
 SET(SRC
-  src/glew.c
+       src/glew.c
 )
 
 BLENDERLIB(extern_glew "${SRC}" "${INC}")
index f33ce6a..9efd1a6 100644 (file)
@@ -38,7 +38,7 @@ ADD_SUBDIRECTORY(opennl)
 ADD_SUBDIRECTORY(smoke)
 
 IF(WITH_ELBEEM)
-  ADD_SUBDIRECTORY(elbeem)
+       ADD_SUBDIRECTORY(elbeem)
 ENDIF(WITH_ELBEEM)
 
 ADD_SUBDIRECTORY(bsp)
index 1b48de3..587ef30 100644 (file)
@@ -25,38 +25,38 @@ SET(INC . intern FX SRC ${PTHREADS_INC} ${LIBSAMPLERATE_INC})
 FILE(GLOB SRC intern/*.cpp intern/*.h FX/*.cpp SRC/*.cpp)
 
 IF(WITH_FFMPEG)
-  SET(INC ${INC} ffmpeg ${FFMPEG_INC})
-  FILE(GLOB FFMPEGSRC ffmpeg/*.cpp)
-  ADD_DEFINITIONS(-DWITH_FFMPEG)
+       SET(INC ${INC} ffmpeg ${FFMPEG_INC})
+       FILE(GLOB FFMPEGSRC ffmpeg/*.cpp)
+       ADD_DEFINITIONS(-DWITH_FFMPEG)
 ENDIF(WITH_FFMPEG)
 
 IF(WITH_SDL)
-  SET(INC ${INC} SDL ${SDL_INCLUDE_DIR})
-  FILE(GLOB SDLSRC SDL/*.cpp)
-  ADD_DEFINITIONS(-DWITH_SDL)
+       SET(INC ${INC} SDL ${SDL_INCLUDE_DIR})
+       FILE(GLOB SDLSRC SDL/*.cpp)
+       ADD_DEFINITIONS(-DWITH_SDL)
 ENDIF(WITH_SDL)
 
 IF(WITH_OPENAL)
-  SET(INC ${INC} OpenAL ${OPENAL_INCLUDE_DIR})
-  FILE(GLOB OPENALSRC OpenAL/*.cpp)
-  ADD_DEFINITIONS(-DWITH_OPENAL)
+       SET(INC ${INC} OpenAL ${OPENAL_INCLUDE_DIR})
+       FILE(GLOB OPENALSRC OpenAL/*.cpp)
+       ADD_DEFINITIONS(-DWITH_OPENAL)
 
-  STRING(REGEX MATCH ".*ramework.*" FRAMEWORK ${OPENAL_INCLUDE_DIR})
-  IF(FRAMEWORK)
-    ADD_DEFINITIONS(-DAPPLE_FRAMEWORK_FIX)
-  ENDIF(FRAMEWORK)
+       STRING(REGEX MATCH ".*ramework.*" FRAMEWORK ${OPENAL_INCLUDE_DIR})
+       IF(FRAMEWORK)
+               ADD_DEFINITIONS(-DAPPLE_FRAMEWORK_FIX)
+       ENDIF(FRAMEWORK)
 ENDIF(WITH_OPENAL)
 
 IF(WITH_JACK)
-  SET(INC ${INC} jack ${JACK_INC})
-  FILE(GLOB JACKSRC jack/*.cpp)
-  ADD_DEFINITIONS(-DWITH_JACK)
+       SET(INC ${INC} jack ${JACK_INC})
+       FILE(GLOB JACKSRC jack/*.cpp)
+       ADD_DEFINITIONS(-DWITH_JACK)
 ENDIF(WITH_JACK)
 
 IF(WITH_SNDFILE)
-  SET(INC ${INC} sndfile ${SNDFILE_INC})
-  FILE(GLOB SNDFILESRC sndfile/*.cpp)
-  ADD_DEFINITIONS(-DWITH_SNDFILE)
+       SET(INC ${INC} sndfile ${SNDFILE_INC})
+       FILE(GLOB SNDFILESRC sndfile/*.cpp)
+       ADD_DEFINITIONS(-DWITH_SNDFILE)
 ENDIF(WITH_SNDFILE)
 
 SET(SRC ${SRC} ${FFMPEGSRC} ${SNDFILESRC} ${SDLSRC} ${OPENALSRC} ${JACKSRC})
index 8b8a300..e541d33 100644 (file)
@@ -30,11 +30,11 @@ FILE(GLOB SRC intern/*.cpp)
 
 ADD_DEFINITIONS(-DNOGUI -DELBEEM_BLENDER=1)
 IF(WINDOWS)
-    ADD_DEFINITIONS(-DUSE_MSVC6FIXES)
+               ADD_DEFINITIONS(-DUSE_MSVC6FIXES)
 ENDIF(WINDOWS)
 
 IF(WITH_OPENMP)
-    ADD_DEFINITIONS(-DPARALLEL=1)
+               ADD_DEFINITIONS(-DPARALLEL=1)
 ENDIF(WITH_OPENMP)
 
 BLENDERLIB_NOLIST(bf_elbeem "${SRC}" "${INC}")
index 3d588ec..9128e92 100644 (file)
@@ -29,30 +29,30 @@ SET(INC . ../string)
 FILE(GLOB SRC intern/*.cpp)
 
 IF(APPLE)
-  LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_DisplayManagerWin32.cpp")
-  LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_SystemWin32.cpp")
-  LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_WindowWin32.cpp")
-  LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_DisplayManagerX11.cpp")
-  LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_SystemX11.cpp")
-  LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_WindowX11.cpp")
+       LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_DisplayManagerWin32.cpp")
+       LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_SystemWin32.cpp")
+       LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_WindowWin32.cpp")
+       LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_DisplayManagerX11.cpp")
+       LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_SystemX11.cpp")
+       LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_WindowX11.cpp")
 ELSE(APPLE)
-  IF(WIN32)
-    SET(INC ${INC} ${WINTAB_INC})
-    LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_DisplayManagerCarbon.cpp")
-    LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_SystemCarbon.cpp")
-    LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_WindowCarbon.cpp")
-    LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_DisplayManagerX11.cpp")
-    LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_SystemX11.cpp")
-    LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_WindowX11.cpp")
-  ELSE(WIN32)
-    SET(INC ${INC} ${X11_X11_INCLUDE_PATH})
-    LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_DisplayManagerWin32.cpp")
-    LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_SystemWin32.cpp")
-    LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_WindowWin32.cpp")
-    LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_DisplayManagerCarbon.cpp")
-    LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_SystemCarbon.cpp")
-    LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_WindowCarbon.cpp")
-  ENDIF(WIN32)
+       IF(WIN32)
+               SET(INC ${INC} ${WINTAB_INC})
+               LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_DisplayManagerCarbon.cpp")
+               LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_SystemCarbon.cpp")
+               LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_WindowCarbon.cpp")
+               LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_DisplayManagerX11.cpp")
+               LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_SystemX11.cpp")
+               LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_WindowX11.cpp")
+       ELSE(WIN32)
+               SET(INC ${INC} ${X11_X11_INCLUDE_PATH})
+               LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_DisplayManagerWin32.cpp")
+               LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_SystemWin32.cpp")
+               LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_WindowWin32.cpp")
+               LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_DisplayManagerCarbon.cpp")
+               LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_SystemCarbon.cpp")
+               LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_WindowCarbon.cpp")
+       ENDIF(WIN32)
 ENDIF(APPLE)
 
 BLENDERLIB(bf_ghost "${SRC}" "${INC}")
index b29837f..40ca356 100644 (file)
@@ -32,6 +32,6 @@ BLENDERLIB(bf_guardedalloc "${SRC}" "${INC}")
 
 # Override C++ alloc optional
 IF(WITH_CXX_GUARDEDALLOC)
-  FILE(GLOB SRC cpp/*.cpp)
-  BLENDERLIB(bf_guardedalloc_cpp "${SRC}" "${INC}")
+       FILE(GLOB SRC cpp/*.cpp)
+       BLENDERLIB(bf_guardedalloc_cpp "${SRC}" "${INC}")
 ENDIF(WITH_CXX_GUARDEDALLOC)
index 0db6acb..8ed7a7c 100644 (file)
@@ -29,12 +29,12 @@ SET(INC ${PNG_INC} ${ZLIB_INC} intern ../../extern/bullet2/src ../memutil ../gua
 FILE(GLOB SRC intern/*.cpp)
 
 IF(WITH_OPENMP)
-    ADD_DEFINITIONS(-DPARALLEL=1)
+               ADD_DEFINITIONS(-DPARALLEL=1)
 ENDIF(WITH_OPENMP)
 
 IF(WITH_FFTW3)
-  ADD_DEFINITIONS(-DFFTW3=1)
-  SET(INC ${INC} ${FFTW3_INC})
+       ADD_DEFINITIONS(-DFFTW3=1)
+       SET(INC ${INC} ${FFTW3_INC})
 ENDIF(WITH_FFTW3)
 
 
index 4764cad..4adc51b 100644 (file)
@@ -28,9 +28,9 @@ ADD_SUBDIRECTORY(blender)
 ADD_SUBDIRECTORY(kernel)
 
 IF(WITH_GAMEENGINE)
-   ADD_SUBDIRECTORY(gameengine)
+       ADD_SUBDIRECTORY(gameengine)
 ENDIF(WITH_GAMEENGINE)
        
 IF(WINDOWS)
-   ADD_SUBDIRECTORY(icons)
+       ADD_SUBDIRECTORY(icons)
 ENDIF(WINDOWS)
index a9e3d50..703c5ac 100644 (file)
@@ -42,18 +42,18 @@ ADD_SUBDIRECTORY(render)
 ADD_SUBDIRECTORY(blenfont)
 
 IF(WITH_OPENEXR)
-  ADD_SUBDIRECTORY(imbuf/intern/openexr)
+       ADD_SUBDIRECTORY(imbuf/intern/openexr)
 ENDIF(WITH_OPENEXR)
 
 IF(WITH_DDS)
-  ADD_SUBDIRECTORY(imbuf/intern/dds)
+       ADD_SUBDIRECTORY(imbuf/intern/dds)
 ENDIF(WITH_DDS)
 
 IF(WITH_QUICKTIME)
-  ADD_SUBDIRECTORY(quicktime)
+       ADD_SUBDIRECTORY(quicktime)
 ENDIF(WITH_QUICKTIME)
 
 IF(WITH_PYTHON)
-  ADD_SUBDIRECTORY(python)
+       ADD_SUBDIRECTORY(python)
 ENDIF(WITH_PYTHON)
 
index 4738ea1..4e48b68 100644 (file)
@@ -27,8 +27,8 @@
 FILE(GLOB SRC intern/*.c)
 
 SET(INC 
-  . ../../../intern/guardedalloc
-  ${JPEG_INC}
+       . ../../../intern/guardedalloc
+       ${JPEG_INC}
 )
 
 BLENDERLIB(bf_avi "${SRC}" "${INC}")
index bc03e69..844a689 100644 (file)
 FILE(GLOB SRC intern/*.c)
 
 SET(INC 
-  ../../../intern/guardedalloc ../blenlib ../makesdna ../editors/include
-  ../blenkernel ../../../extern/glew/include .
-  ${FREETYPE_INCLUDE_DIRS}
+       ../../../intern/guardedalloc ../blenlib ../makesdna ../editors/include
+       ../blenkernel ../../../extern/glew/include .
+       ${FREETYPE_INCLUDE_DIRS}
 )
 
 IF(WITH_INTERNATIONAL)
-  SET(INC ${INC} ${GETTEXT_INC})
+       SET(INC ${INC} ${GETTEXT_INC})
 ENDIF(WITH_INTERNATIONAL)
 
 IF(WIN32)
-  ADD_DEFINITIONS(-D_WIN32 -DUSE_GETTEXT_DLL)
+       ADD_DEFINITIONS(-D_WIN32 -DUSE_GETTEXT_DLL)
 ENDIF(WIN32)
 
 BLENDERLIB(bf_blenfont "${SRC}" "${INC}")
index 1707920..68aed2b 100644 (file)
 FILE(GLOB SRC intern/*.c)
 
 SET(INC 
-  . ../../../intern/guardedalloc ../../../intern/memutil ../editors/include ../blenlib ../makesdna
-  ../render/extern/include ../../../intern/decimation/extern
-  ../imbuf ../avi ../../../intern/elbeem/extern ../../../intern/opennl/extern
-  ../../../intern/iksolver/extern ../blenloader
-  ../nodes ../../../extern/glew/include ../gpu ../makesrna ../../../intern/smoke/extern
-  ../../../intern/bsp/extern ../blenfont
-  ../../../intern/audaspace/intern
-  ../../../extern/lzo/minilzo
-  ../../../extern/lzma
-  ${ZLIB_INC}
+       . ../../../intern/guardedalloc ../../../intern/memutil ../editors/include ../blenlib ../makesdna
+       ../render/extern/include ../../../intern/decimation/extern
+       ../imbuf ../avi ../../../intern/elbeem/extern ../../../intern/opennl/extern
+       ../../../intern/iksolver/extern ../blenloader
+       ../nodes ../../../extern/glew/include ../gpu ../makesrna ../../../intern/smoke/extern
+       ../../../intern/bsp/extern ../blenfont
+       ../../../intern/audaspace/intern
+       ../../../extern/lzo/minilzo
+       ../../../extern/lzma
+       ${ZLIB_INC}
 )
 
 IF(WITH_BULLET)
-  SET(INC ${INC} ../../../extern/bullet2/src)
-  ADD_DEFINITIONS(-DUSE_BULLET)
+       SET(INC ${INC} ../../../extern/bullet2/src)
+       ADD_DEFINITIONS(-DUSE_BULLET)
 ENDIF(WITH_BULLET)
 
 IF(WITH_OPENEXR)
-  ADD_DEFINITIONS(-DWITH_OPENEXR)
+       ADD_DEFINITIONS(-DWITH_OPENEXR)
 ENDIF(WITH_OPENEXR)
 
 IF(WITH_OPENJPEG)
-  ADD_DEFINITIONS(-DWITH_OPENJPEG)
+       ADD_DEFINITIONS(-DWITH_OPENJPEG)
 ENDIF(WITH_OPENJPEG)
 
 IF(WITH_DDS)
-  ADD_DEFINITIONS(-DWITH_DDS)
+       ADD_DEFINITIONS(-DWITH_DDS)
 ENDIF(WITH_DDS)
 
 IF(WITH_QUICKTIME)
-  SET(INC ${INC} ../quicktime ${QUICKTIME_INC})
-  ADD_DEFINITIONS(-DWITH_QUICKTIME)
+       SET(INC ${INC} ../quicktime ${QUICKTIME_INC})
+       ADD_DEFINITIONS(-DWITH_QUICKTIME)
 ENDIF(WITH_QUICKTIME)
 
 IF(WITH_FFMPEG)
-  SET(INC ${INC} ${FFMPEG_INC})
-  ADD_DEFINITIONS(-DWITH_FFMPEG)
+       SET(INC ${INC} ${FFMPEG_INC})
+       ADD_DEFINITIONS(-DWITH_FFMPEG)
 ENDIF(WITH_FFMPEG)
 
 IF(WITH_PYTHON)
-  SET(INC ${INC} ../python ${PYTHON_INC})
+       SET(INC ${INC} ../python ${PYTHON_INC})
 ELSE(WITH_PYTHON)
-  ADD_DEFINITIONS(-DDISABLE_PYTHON)
+       ADD_DEFINITIONS(-DDISABLE_PYTHON)
 ENDIF(WITH_PYTHON)
 
 IF(NOT WITH_ELBEEM)
-  ADD_DEFINITIONS(-DDISABLE_ELBEEM)
+       ADD_DEFINITIONS(-DDISABLE_ELBEEM)
 ENDIF(NOT WITH_ELBEEM)
 
 IF(WIN32)
-  SET(INC ${INC} ${PTHREADS_INC})
+       SET(INC ${INC} ${PTHREADS_INC})
 ENDIF(WIN32)
 
 BLENDERLIB(bf_blenkernel "${SRC}" "${INC}")
index a0bf236..4ed9eb4 100644 (file)
 FILE(GLOB SRC intern/*.c)
 
 SET(INC 
-  . ../makesdna ../blenkernel ../../../intern/guardedalloc ../include
-  ${FREETYPE_INCLUDE_DIRS}
-  ${ZLIB_INC}
+       . ../makesdna ../blenkernel ../../../intern/guardedalloc ../include
+       ${FREETYPE_INCLUDE_DIRS}
+       ${ZLIB_INC}
 )
 
 IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
 SET(INC
-  ${INC}
-  ${BINRELOC_INC}
+       ${INC}
+       ${BINRELOC_INC}
 )
 ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
 
 IF(WIN32)
-  SET(INC ${INC} ${PTHREADS_INC})
+       SET(INC ${INC} ${PTHREADS_INC})
 ENDIF(WIN32)
 
 BLENDERLIB(bf_blenlib "${SRC}" "${INC}")
index 7bdffde..d31a85a 100644 (file)
 FILE(GLOB SRC intern/*.c)
 
 SET(INC 
-  . ../../../intern/guardedalloc ../blenlib ../blenkernel
-  ../makesdna ../readblenfile ../include ../makesrna
-  ../python ../../kernel/gen_messaging
-  ../render/extern/include
-  ${ZLIB_INC}
+       . ../../../intern/guardedalloc ../blenlib ../blenkernel
+       ../makesdna ../readblenfile ../include ../makesrna
+       ../python ../../kernel/gen_messaging
+       ../render/extern/include
+       ${ZLIB_INC}
 )
 
 BLENDERLIB(bf_blenloader "${SRC}" "${INC}")
index 856fb93..1c5e269 100644 (file)
 FILE(GLOB SRC intern/*.c)
 
 SET(INC 
-  . .. ../../../intern/guardedalloc ../blenlib ../imbuf ../makesdna
+       . .. ../../../intern/guardedalloc ../blenlib ../imbuf ../makesdna
 )
 
 IF(WITH_QUICKTIME)
-  SET(INC ${INC} ${QUICKTIME_INC})
-  ADD_DEFINITIONS(-DWITH_QUICKTIME)
+       SET(INC ${INC} ${QUICKTIME_INC})
+       ADD_DEFINITIONS(-DWITH_QUICKTIME)
 ENDIF(WITH_QUICKTIME)
 
 BLENDERLIB(bf_blenpluginapi "${SRC}" "${INC}")
index c40b18e..066d42e 100644 (file)
 FILE(GLOB SRC */*.c)
 
 SET(INC ../windowmanager
-  ../editors/include
-  ../../../intern/guardedalloc ../../../intern/memutil
-  ../blenlib ../makesdna ../makesrna ../blenkernel
-  ../include ../imbuf ../render/extern/include
-  ../../../intern/bsp/extern
-  ../../../intern/decimation/extern ../blenloader ../python
-  ../../kernel/gen_system ../readstreamglue
-  ../../../intern/elbeem/extern
-  ../../../intern/ghost ../../../intern/opennl/extern ../../../extern/glew/include ../../../intern/smoke/extern
-  ../../../intern/audaspace/intern
-  ../nodes
-  ../gpu
-  ../blenfont
+       ../editors/include
+       ../../../intern/guardedalloc ../../../intern/memutil
+       ../blenlib ../makesdna ../makesrna ../blenkernel
+       ../include ../imbuf ../render/extern/include
+       ../../../intern/bsp/extern
+       ../../../intern/decimation/extern ../blenloader ../python
+       ../../kernel/gen_system ../readstreamglue
+       ../../../intern/elbeem/extern
+       ../../../intern/ghost ../../../intern/opennl/extern ../../../extern/glew/include ../../../intern/smoke/extern
+       ../../../intern/audaspace/intern
+       ../nodes
+       ../gpu
+       ../blenfont
 )
 
 IF(WITH_GAMEENGINE)
-  ADD_DEFINITIONS(-DGAMEBLENDER)
+       ADD_DEFINITIONS(-DGAMEBLENDER)
 ENDIF(WITH_GAMEENGINE)
 
 IF(WITH_INTERNATIONAL)
-  ADD_DEFINITIONS(-DINTERNATIONAL)
+       ADD_DEFINITIONS(-DINTERNATIONAL)
 ENDIF(WITH_INTERNATIONAL)
 
 IF(WITH_OPENEXR)
-  ADD_DEFINITIONS(-DWITH_OPENEXR)
+       ADD_DEFINITIONS(-DWITH_OPENEXR)
 ENDIF(WITH_OPENEXR)
 
 IF(WITH_OPENJPEG)
-  ADD_DEFINITIONS(-DWITH_OPENJPEG)
+       ADD_DEFINITIONS(-DWITH_OPENJPEG)
 ENDIF(WITH_OPENJPEG)
 
 IF(WITH_QUICKTIME)
-  SET(INC ${INC} ../quicktime ${QUICKTIME_INC})
-  ADD_DEFINITIONS(-DWITH_QUICKTIME)
+       SET(INC ${INC} ../quicktime ${QUICKTIME_INC})
+       ADD_DEFINITIONS(-DWITH_QUICKTIME)
 ENDIF(WITH_QUICKTIME)
 
 IF(WITH_FFMPEG)
-  SET(INC ${INC} ${FFMPEG_INC})
-  ADD_DEFINITIONS(-DWITH_FFMPEG)
+       SET(INC ${INC} ${FFMPEG_INC})
+       ADD_DEFINITIONS(-DWITH_FFMPEG)
 ENDIF(WITH_FFMPEG)
 
 IF(NOT WITH_ELBEEM)
-  ADD_DEFINITIONS(-DDISABLE_ELBEEM)
+       ADD_DEFINITIONS(-DDISABLE_ELBEEM)
 ENDIF(NOT WITH_ELBEEM)
 
 IF(WITH_PYTHON)
-  SET(INC ${INC} ${PYTHON_INC})
+       SET(INC ${INC} ${PYTHON_INC})
 ELSE(WITH_PYTHON)
-  ADD_DEFINITIONS(-DDISABLE_PYTHON)
+       ADD_DEFINITIONS(-DDISABLE_PYTHON)
 ENDIF(WITH_PYTHON)
 
 IF(WIN32)
-  SET(INC ${INC} ${PTHREADS_INC})
+       SET(INC ${INC} ${PTHREADS_INC})
 ENDIF(WIN32)
 
 # TODO buildinfo
 IF(BF_BUILDINFO)
-  ADD_DEFINITIONS(-DNAN_BUILDINFO)
+       ADD_DEFINITIONS(-DNAN_BUILDINFO)
 ENDIF(BF_BUILDINFO)
 
 BLENDERLIB_NOLIST(bf_editors "${SRC}" "${INC}")
index 7429f45..ad7770e 100644 (file)
 FILE(GLOB SRC */*.c)
 
 SET(INC ../../windowmanager
-  ../../editors/include
-  ../../../../intern/guardedalloc ../../../../intern/memutil
-  ../../blenlib ../../makesdna ../../makesrna ../../blenkernel
-  ../../include ../../imbuf 
-  ../../render/extern/include ../../../../intern/bsp/extern 
-  ../../../intern/decimation/extern ../../blenloader
-  ../../../kernel/gen_system ../../readstreamglue
-  ../../../../intern/elbeem/extern
-  ../../../../intern/ghost ../../../../intern/opennl/extern
-  ../../nodes
+       ../../editors/include
+       ../../../../intern/guardedalloc ../../../../intern/memutil
+       ../../blenlib ../../makesdna ../../makesrna ../../blenkernel
+       ../../include ../../imbuf 
+       ../../render/extern/include ../../../../intern/bsp/extern 
+       ../../../intern/decimation/extern ../../blenloader
+       ../../../kernel/gen_system ../../readstreamglue
+       ../../../../intern/elbeem/extern
+       ../../../../intern/ghost ../../../../intern/opennl/extern
+       ../../nodes
 )
 
 IF(WITH_INTERNATIONAL)
-  ADD_DEFINITIONS(-DINTERNATIONAL)
+       ADD_DEFINITIONS(-DINTERNATIONAL)
 ENDIF(WITH_INTERNATIONAL)
 
 IF(WITH_OPENEXR)
-  ADD_DEFINITIONS(-DWITH_OPENEXR)
+       ADD_DEFINITIONS(-DWITH_OPENEXR)
 ENDIF(WITH_OPENEXR)
 
 IF(WITH_QUICKTIME)
-  SET(INC ${INC} ../../quicktime ${QUICKTIME_INC})
-  ADD_DEFINITIONS(-DWITH_QUICKTIME)
+       SET(INC ${INC} ../../quicktime ${QUICKTIME_INC})
+       ADD_DEFINITIONS(-DWITH_QUICKTIME)
 ENDIF(WITH_QUICKTIME)
 
 IF(WITH_FFMPEG)
-  SET(INC ${INC} ${FFMPEG_INC})
-  ADD_DEFINITIONS(-DWITH_FFMPEG)
+       SET(INC ${INC} ${FFMPEG_INC})
+       ADD_DEFINITIONS(-DWITH_FFMPEG)
 ENDIF(WITH_FFMPEG)
 
 IF(WITH_PYTHON)
-  SET(INC ${INC} ../../python ${PYTHON_INC})
+       SET(INC ${INC} ../../python ${PYTHON_INC})
 ELSE(WITH_PYTHON)
-  ADD_DEFINITIONS(-DDISABLE_PYTHON)
+       ADD_DEFINITIONS(-DDISABLE_PYTHON)
 ENDIF(WITH_PYTHON)
 
 IF(WIN32)
-  SET(INC ${INC} ${PTHREADS_INC})
+       SET(INC ${INC} ${PTHREADS_INC})
 ENDIF(WIN32)
 
 # TODO buildinfo
 IF(BF_BUILDINFO)
-  ADD_DEFINITIONS(-DNAN_BUILDINFO)
+       ADD_DEFINITIONS(-DNAN_BUILDINFO)
 ENDIF(BF_BUILDINFO)
 
 BLENDERLIB_NOLIST(bf_editors "${SRC}" "${INC}")
index 4d376f4..85f4233 100644 (file)
@@ -27,8 +27,8 @@
 FILE(GLOB SRC intern/*.c)
 
 SET(INC 
-  . ../blenlib ../blenkernel ../makesdna ../include
-  ../../../extern/glew/include ../../../intern/guardedalloc ../imbuf)
+       . ../blenlib ../blenkernel ../makesdna ../include
+       ../../../extern/glew/include ../../../intern/guardedalloc ../imbuf)
 
 BLENDERLIB(bf_gpu "${SRC}" "${INC}")
 
index 76dd2af..5eb9815 100644 (file)
 FILE(GLOB SRC intern/*.c)
 
 SET(INC 
-  . ../makesdna ../../../intern/guardedalloc ../../../intern/memutil ../blenlib
-  ../avi ../blenkernel
-  ${JPEG_INC}
-  ${PNG_INC}
-  ${TIFF_INC}
-  ${ZLIB_INC}
-  ${OPENJPEG_INC}
+       . ../makesdna ../../../intern/guardedalloc ../../../intern/memutil ../blenlib
+       ../avi ../blenkernel
+       ${JPEG_INC}
+       ${PNG_INC}
+       ${TIFF_INC}
+       ${ZLIB_INC}
+       ${OPENJPEG_INC}
 )
 
 IF(WITH_OPENEXR)
-  ADD_DEFINITIONS(-DWITH_OPENEXR)
+       ADD_DEFINITIONS(-DWITH_OPENEXR)
 ENDIF(WITH_OPENEXR)
 
 IF(WITH_OPENJPEG)
-  ADD_DEFINITIONS(-DWITH_OPENJPEG)
+       ADD_DEFINITIONS(-DWITH_OPENJPEG)
 ENDIF(WITH_OPENJPEG)
 
 IF(WITH_QUICKTIME)
-  SET(INC ${INC} ../quicktime ${QUICKTIME_INC})
-  ADD_DEFINITIONS(-DWITH_QUICKTIME)
+       SET(INC ${INC} ../quicktime ${QUICKTIME_INC})
+       ADD_DEFINITIONS(-DWITH_QUICKTIME)
 ENDIF(WITH_QUICKTIME)
 
 IF(WITH_FFMPEG)
-  SET(INC ${INC} ${FFMPEG_INC})
-  ADD_DEFINITIONS(-DWITH_FFMPEG)
+       SET(INC ${INC} ${FFMPEG_INC})
+       ADD_DEFINITIONS(-DWITH_FFMPEG)
 ENDIF(WITH_FFMPEG)
 
 if(WITH_DDS)
-  ADD_DEFINITIONS(-DWITH_DDS)
+       ADD_DEFINITIONS(-DWITH_DDS)
 ENDIF(WITH_DDS)
 
 BLENDERLIB(bf_imbuf "${SRC}" "${INC}")
index 53cd161..8b28086 100644 (file)
 FILE(GLOB SRC *.c)
 
 SET(INC 
-    .
-    ../../../blenkernel
-    ../../
-    ..
-    ../../../blenlib
-    intern/include
-    ../../../../../intern/guardedalloc
-    ../../../makesdna
+               .
+               ../../../blenkernel
+               ../../
+               ..
+               ../../../blenlib
+               intern/include
+               ../../../../../intern/guardedalloc
+               ../../../makesdna
 )
 
 BLENDERLIB(bf_cineon "${SRC}" "${INC}")
index 842f53b..dc45afb 100644 (file)
 FILE (GLOB SRC *.cpp)
 
 SET(INC 
-  .
-  ../../../blenkernel
-  ../../../makesdna
-  ../../
-  ..
-  ../../../blenlib
-  intern/include
-  ../../../../../intern/guardedalloc
+       .
+       ../../../blenkernel
+       ../../../makesdna
+       ../../
+       ..
+       ../../../blenlib
+       intern/include
+       ../../../../../intern/guardedalloc
 )
 
 if(WITH_DDS)
-  ADD_DEFINITIONS(-DWITH_DDS)
+       ADD_DEFINITIONS(-DWITH_DDS)
 ENDIF(WITH_DDS)
 
 BLENDERLIB(bf_dds "${SRC}" "${INC}")                 
index 2179208..33681da 100644 (file)
 SET(SRC openexr_api.cpp)
 
 SET(INC 
-  .
-  ../../../blenkernel
-  ../../
-  ..
-  ../../../blenlib
-  intern/include
-  ../../../../../intern/guardedalloc
-  ../../../makesdna
-  ${OPENEXR_INC}
+       .
+       ../../../blenkernel
+       ../../
+       ..
+       ../../../blenlib
+       intern/include
+       ../../../../../intern/guardedalloc
+       ../../../makesdna
+       ${OPENEXR_INC}
 )
 
 IF(WITH_OPENEXR)
-  ADD_DEFINITIONS(-DWITH_OPENEXR)
+       ADD_DEFINITIONS(-DWITH_OPENEXR)
 ENDIF(WITH_OPENEXR)
 
 BLENDERLIB(bf_openexr "${SRC}" "${INC}")                 
index 6024799..1fb6315 100644 (file)
@@ -33,9 +33,9 @@ ADD_EXECUTABLE(makesdna ${SRC} ${INC_FILES})
 
 # Output dna.c
 ADD_CUSTOM_COMMAND(
-  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/dna.c
-  COMMAND ${CMAKE_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/makesdna ${CMAKE_CURRENT_BINARY_DIR}/dna.c ${CMAKE_SOURCE_DIR}/source/blender/makesdna/
-  DEPENDS makesdna
+       OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/dna.c
+       COMMAND ${CMAKE_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/makesdna ${CMAKE_CURRENT_BINARY_DIR}/dna.c ${CMAKE_SOURCE_DIR}/source/blender/makesdna/
+       DEPENDS makesdna
 )
 
 # Build bf_dna library
index a1f42fb..709c5d0 100644 (file)
@@ -32,59 +32,59 @@ LIST(REMOVE_ITEM DEFSRC ${APISRC})
 STRING(REGEX REPLACE "rna_([a-zA-Z0-9_-]*).c" "${CMAKE_CURRENT_BINARY_DIR}/rna_\\1_gen.c" GENSRC "${DEFSRC}")
 
 SET(SRC
-     makesrna.c
-     rna_define.c
-     ${DEFSRC}
-     ${APISRC}
-     ../../../../intern/guardedalloc/intern/mallocn.c
-     ../../../../intern/guardedalloc/intern/mmap_win.c)
+               makesrna.c
+               rna_define.c
+               ${DEFSRC}
+               ${APISRC}
+               ../../../../intern/guardedalloc/intern/mallocn.c
+               ../../../../intern/guardedalloc/intern/mmap_win.c)
 
 INCLUDE_DIRECTORIES(../../../../intern/guardedalloc .. ../../makesdna ../../blenkernel ../../blenlib ../../windowmanager ../../editors/include ../../imbuf ../../render/extern/include .)
 FILE(GLOB INC_FILES ../*.h ../../makesdna/*.h)
 
 IF(WITH_GAMEENGINE)
-  ADD_DEFINITIONS(-DGAMEBLENDER)
+       ADD_DEFINITIONS(-DGAMEBLENDER)
 ENDIF(WITH_GAMEENGINE)
 
 IF(WITH_OPENEXR)
-  ADD_DEFINITIONS(-DWITH_OPENEXR)
+       ADD_DEFINITIONS(-DWITH_OPENEXR)
 ENDIF(WITH_OPENEXR)
 
 IF(WITH_OPENJPEG)
-  ADD_DEFINITIONS(-DWITH_OPENJPEG)
+       ADD_DEFINITIONS(-DWITH_OPENJPEG)
 ENDIF(WITH_OPENJPEG)
 
 IF(WITH_DDS)
-  ADD_DEFINITIONS(-DWITH_DDS)
+       ADD_DEFINITIONS(-DWITH_DDS)
 ENDIF(WITH_DDS)
 
 IF(WITH_QUICKTIME)
-  ADD_DEFINITIONS(-DWITH_QUICKTIME)
+       ADD_DEFINITIONS(-DWITH_QUICKTIME)
 ENDIF(WITH_QUICKTIME)
 
 IF(WITH_FFMPEG)
-  SET(INC ${INC} ${FFMPEG_INC})
-  ADD_DEFINITIONS(-DWITH_FFMPEG)
+       SET(INC ${INC} ${FFMPEG_INC})
+       ADD_DEFINITIONS(-DWITH_FFMPEG)
 ENDIF(WITH_FFMPEG)
 
 IF(NOT WITH_ELBEEM)
-  ADD_DEFINITIONS(-DDISABLE_ELBEEM)
+       ADD_DEFINITIONS(-DDISABLE_ELBEEM)
 ENDIF(NOT WITH_ELBEEM)
 
 IF(WITH_FFTW3)
-  ADD_DEFINITIONS(-DFFTW3=1)
+       ADD_DEFINITIONS(-DFFTW3=1)
 ENDIF(WITH_FFTW3)
 
 IF(WITH_SDL)
-  ADD_DEFINITIONS(-DWITH_SDL)
+       ADD_DEFINITIONS(-DWITH_SDL)
 ENDIF(WITH_SDL)
 
 IF(WITH_OPENAL)
-  ADD_DEFINITIONS(-DWITH_OPENAL)
+       ADD_DEFINITIONS(-DWITH_OPENAL)
 ENDIF(WITH_OPENAL)
 
 IF(WITH_JACK)
-  ADD_DEFINITIONS(-DWITH_JACK)
+       ADD_DEFINITIONS(-DWITH_JACK)
 ENDIF(WITH_JACK)
 
 # Build makesrna executable
@@ -93,9 +93,9 @@ TARGET_LINK_LIBRARIES(makesrna bf_dna)
 
 # Output rna_*_gen.c
 ADD_CUSTOM_COMMAND(
-  OUTPUT ${GENSRC}
-  COMMAND ${CMAKE_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/makesrna ${CMAKE_CURRENT_BINARY_DIR}/
-  DEPENDS makesrna
+       OUTPUT ${GENSRC}
+       COMMAND ${CMAKE_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/makesrna ${CMAKE_CURRENT_BINARY_DIR}/
+       DEPENDS makesrna
 )
 
 # Build bf_rna
index bba96ad..df25671 100644 (file)
 FILE(GLOB SRC intern/*.c intern/CMP_nodes/*.c intern/SHD_nodes/*.c intern/TEX_nodes/*.c)
 
 SET(INC 
-  . ../../../intern/guardedalloc ../editors/include ../blenlib ../makesdna
-  ../render/extern/include ../../../intern/decimation/extern ../makesrna
-  ../imbuf ../avi ../../../intern/elbeem/extern
-  ../../../intern/iksolver/extern ../blenloader
-  ../blenkernel ../../../extern/glew/include ../gpu
-  ${ZLIB_INC}
+       . ../../../intern/guardedalloc ../editors/include ../blenlib ../makesdna
+       ../render/extern/include ../../../intern/decimation/extern ../makesrna
+       ../imbuf ../avi ../../../intern/elbeem/extern
+       ../../../intern/iksolver/extern ../blenloader
+       ../blenkernel ../../../extern/glew/include ../gpu
+       ${ZLIB_INC}
 )
 
 IF(WITH_OPENEXR)
-  ADD_DEFINITIONS(-DWITH_OPENEXR)
+       ADD_DEFINITIONS(-DWITH_OPENEXR)
 ENDIF(WITH_OPENEXR)
 
 IF(WITH_QUICKTIME)
-  SET(INC ${INC} ../quicktime ${QUICKTIME_INC})
-  ADD_DEFINITIONS(-DWITH_QUICKTIME)
+       SET(INC ${INC} ../quicktime ${QUICKTIME_INC})
+       ADD_DEFINITIONS(-DWITH_QUICKTIME)
 ENDIF(WITH_QUICKTIME)
 
 IF(WITH_FFMPEG)
-  SET(INC ${INC} ${FFMPEG_INC})
-  ADD_DEFINITIONS(-DWITH_FFMPEG)
+       SET(INC ${INC} ${FFMPEG_INC})
+       ADD_DEFINITIONS(-DWITH_FFMPEG)
 ENDIF(WITH_FFMPEG)
 
 IF(WITH_PYTHON)
-  SET(INC ${INC} ../python ${PYTHON_INC})
+       SET(INC ${INC} ../python ${PYTHON_INC})
 ELSE(WITH_PYTHON)
-  ADD_DEFINITIONS(-DDISABLE_PYTHON)
+       ADD_DEFINITIONS(-DDISABLE_PYTHON)
 ENDIF(WITH_PYTHON)
 
 BLENDERLIB(bf_nodes "${SRC}" "${INC}")
index 7700e6b..7abec56 100644 (file)
@@ -27,23 +27,23 @@ FILE(GLOB SRC intern/*.c)
 FILE(GLOB GENSRC generic/*.c)
 
 SET(INC 
-  . ../../../intern/guardedalloc ../blenlib ../makesdna ../makesrna
-  ../blenkernel ../editors/include ../windowmanager ${PYTHON_INC}
-  ../../../extern/glew/include
+       . ../../../intern/guardedalloc ../blenlib ../makesdna ../makesrna
+       ../blenkernel ../editors/include ../windowmanager ${PYTHON_INC}
+       ../../../extern/glew/include
 )
 
 IF(WITH_OPENEXR)
-  ADD_DEFINITIONS(-DWITH_OPENEXR)
+       ADD_DEFINITIONS(-DWITH_OPENEXR)
 ENDIF(WITH_OPENEXR)
 
 IF(WITH_QUICKTIME)
-  SET(INC ${INC} ${QUICKTIME_INC})
-  ADD_DEFINITIONS(-DWITH_QUICKTIME)
+       SET(INC ${INC} ${QUICKTIME_INC})
+       ADD_DEFINITIONS(-DWITH_QUICKTIME)
 ENDIF(WITH_QUICKTIME)
 
 IF(WITH_FFMPEG)
-  SET(INC ${INC} ${FFMPEG_INC})
-  ADD_DEFINITIONS(-DWITH_FFMPEG)
+       SET(INC ${INC} ${FFMPEG_INC})
+       ADD_DEFINITIONS(-DWITH_FFMPEG)
 ENDIF(WITH_FFMPEG)
 
 ADD_DEFINITIONS(-DWITH_CCGSUBSURF)
index 9596987..ac503bb 100644 (file)
 SET(SRC apple/quicktime_import.c apple/quicktime_export.c)
 
 SET(INC 
-  .
-  ../quicktime
-  ../makesdna
-  ../../../intern/guardedalloc
-  ../blenlib
-  ../blenkernel
-  ../avi
-  ../imbuf
-  ../imbuf/intern
-  ../blenloader
-  ../render/extern/include
-  ../include
+       .
+       ../quicktime
+       ../makesdna
+       ../../../intern/guardedalloc
+       ../blenlib
+       ../blenkernel
+       ../avi
+       ../imbuf
+       ../imbuf/intern
+       ../blenloader
+       ../render/extern/include
+       ../include
 )
 
 SET(INC ${INC} ${QUICKTIME_INC})
index dc4a8f5..ded4a1e 100644 (file)
@@ -27,7 +27,7 @@
 FILE(GLOB SRC intern/*.c)
 
 SET(INC 
-  .  ../blenloader ../blenloader/intern ../blenkernel ../blenlib ../makesdna ../../kernel/gen_messaging
+       .  ../blenloader ../blenloader/intern ../blenkernel ../blenlib ../makesdna ../../kernel/gen_messaging
 )
 
 BLENDERLIB(bf_readblenfile "${SRC}" "${INC}")
index ad96b9d..3284f7e 100644 (file)
 FILE(GLOB SRC intern/source/*.c)
 
 SET(INC 
-  intern/include ../../../intern/guardedalloc ../blenlib ../makesdna
-  extern/include ../blenkernel ../imbuf
-  ../include ../../kernel/gen_messaging ../blenloader
-  ../../../intern/smoke/extern
-  ../makesrna
+       intern/include ../../../intern/guardedalloc ../blenlib ../makesdna
+       extern/include ../blenkernel ../imbuf
+       ../include ../../kernel/gen_messaging ../blenloader
+       ../../../intern/smoke/extern
+       ../makesrna
 )
 
 IF(WITH_OPENEXR)
-  ADD_DEFINITIONS(-DWITH_OPENEXR)
+       ADD_DEFINITIONS(-DWITH_OPENEXR)
 ENDIF(WITH_OPENEXR)
 
 IF(WITH_QUICKTIME)
-  SET(INC ${INC} ../quicktime ${QUICKTIME_INC})
-  ADD_DEFINITIONS(-DWITH_QUICKTIME)
+       SET(INC ${INC} ../quicktime ${QUICKTIME_INC})
+       ADD_DEFINITIONS(-DWITH_QUICKTIME)
 ENDIF(WITH_QUICKTIME)
 
 IF(WITH_FFMPEG)
-  ADD_DEFINITIONS(-DWITH_FFMPEG)
+       ADD_DEFINITIONS(-DWITH_FFMPEG)
 ENDIF(WITH_FFMPEG)
 
 #TODO
index 26d4ab2..cb2fc92 100644 (file)
 FILE(GLOB SRC intern/*.c)
 
 SET(INC .
-  ../editors/include
-  ../../../intern/guardedalloc ../../../intern/memutil
-  ../blenlib ../makesdna ../makesrna ../blenkernel
-  ../include ../imbuf ../render/extern/include
-  ../../../intern/bsp/extern
-  ../../../intern/decimation/extern ../blenloader
-  ../../kernel/gen_system ../readstreamglue
-  ../../../intern/elbeem/extern
-  ../../../intern/ghost ../../../intern/opennl/extern ../../../extern/glew/include
-  ../nodes
-  ../gpu
-  ../blenfont
-  ${OPENGL_INCLUDE_DIR}
+       ../editors/include
+       ../../../intern/guardedalloc ../../../intern/memutil
+       ../blenlib ../makesdna ../makesrna ../blenkernel
+       ../include ../imbuf ../render/extern/include
+       ../../../intern/bsp/extern
+       ../../../intern/decimation/extern ../blenloader
+       ../../kernel/gen_system ../readstreamglue
+       ../../../intern/elbeem/extern
+       ../../../intern/ghost ../../../intern/opennl/extern ../../../extern/glew/include
+       ../nodes
+       ../gpu
+       ../blenfont
+       ${OPENGL_INCLUDE_DIR}
 )
 
 IF(WITH_INTERNATIONAL)
-  ADD_DEFINITIONS(-DINTERNATIONAL)
+       ADD_DEFINITIONS(-DINTERNATIONAL)
 ENDIF(WITH_INTERNATIONAL)
 
 IF(WITH_OPENEXR)
-  ADD_DEFINITIONS(-DWITH_OPENEXR)
+       ADD_DEFINITIONS(-DWITH_OPENEXR)
 ENDIF(WITH_OPENEXR)
 
 IF(WITH_QUICKTIME)
-  SET(INC ${INC} ../quicktime ${QUICKTIME_INC})
-  ADD_DEFINITIONS(-DWITH_QUICKTIME)
+       SET(INC ${INC} ../quicktime ${QUICKTIME_INC})
+       ADD_DEFINITIONS(-DWITH_QUICKTIME)
 ENDIF(WITH_QUICKTIME)
 
 IF(WITH_FFMPEG)
-  SET(INC ${INC} ${FFMPEG_INC})
-  ADD_DEFINITIONS(-DWITH_FFMPEG)
+       SET(INC ${INC} ${FFMPEG_INC})
+       ADD_DEFINITIONS(-DWITH_FFMPEG)
 ENDIF(WITH_FFMPEG)
 
 IF(WITH_PYTHON)
-  SET(INC ${INC} ../python ${PYTHON_INC})
+       SET(INC ${INC} ../python ${PYTHON_INC})
 ELSE(WITH_PYTHON)
-  ADD_DEFINITIONS(-DDISABLE_PYTHON)
+       ADD_DEFINITIONS(-DDISABLE_PYTHON)
 ENDIF(WITH_PYTHON)
 
 IF(WIN32)
-  SET(INC ${INC} ${PTHREADS_INC})
+       SET(INC ${INC} ${PTHREADS_INC})
 ENDIF(WIN32)
 
 # TODO buildinfo
 IF(BF_BUILDINFO)
-  ADD_DEFINITIONS(-DNAN_BUILDINFO)
+       ADD_DEFINITIONS(-DNAN_BUILDINFO)
 ENDIF(BF_BUILDINFO)
 
 BLENDERLIB_NOLIST(bf_windowmanager "${SRC}" "${INC}")
index 76a1a40..62064e3 100644 (file)
@@ -29,24 +29,24 @@ MESSAGE(STATUS "Configuring blenderplayer")
 SETUP_LIBDIRS()
 
 IF(WITH_QUICKTIME)
-  ADD_DEFINITIONS(-DWITH_QUICKTIME)
+       ADD_DEFINITIONS(-DWITH_QUICKTIME)
 ENDIF(WITH_QUICKTIME)
 
 IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
-  ADD_DEFINITIONS(-DWITH_BINRELOC)
-  INCLUDE_DIRECTORIES(${BINRELOC_INC})
+       ADD_DEFINITIONS(-DWITH_BINRELOC)
+       INCLUDE_DIRECTORIES(${BINRELOC_INC})
 ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
 
 ADD_CUSTOM_COMMAND(
-  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/dna.c
-  COMMAND ${CMAKE_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/makesdna ${CMAKE_CURRENT_BINARY_DIR}/dna.c ${CMAKE_SOURCE_DIR}/source/blender/makesdna/
-  DEPENDS ${CMAKE_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/makesdna
+       OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/dna.c
+       COMMAND ${CMAKE_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/makesdna ${CMAKE_CURRENT_BINARY_DIR}/dna.c ${CMAKE_SOURCE_DIR}/source/blender/makesdna/
+       DEPENDS ${CMAKE_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/makesdna
 )
 
 IF(WIN32)
-  ADD_EXECUTABLE(blenderplayer ${EXETYPE} ${CMAKE_CURRENT_BINARY_DIR}/dna.c ../icons/winblender.rc)
+       ADD_EXECUTABLE(blenderplayer ${EXETYPE} ${CMAKE_CURRENT_BINARY_DIR}/dna.c ../icons/winblender.rc)
 ELSE(WIN32)
-  ADD_EXECUTABLE(blenderplayer ${CMAKE_CURRENT_BINARY_DIR}/dna.c)
+       ADD_EXECUTABLE(blenderplayer ${CMAKE_CURRENT_BINARY_DIR}/dna.c)
 ENDIF(WIN32)
 
 ADD_DEPENDENCIES(blenderplayer makesdna)
@@ -56,89 +56,89 @@ FILE(READ ${CMAKE_BINARY_DIR}/cmake_blender_libs.txt BLENDER_LINK_LIBS)
 SET(BLENDER_LINK_LIBS ${BLENDER_LINK_LIBS} gp_common gp_ghost blenkernel_blc)
 
 IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
-  SET(BLENDER_LINK_LIBS ${BLENDER_LINK_LIBS} extern_binreloc)
+       SET(BLENDER_LINK_LIBS ${BLENDER_LINK_LIBS} extern_binreloc)
 ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
 
 IF(UNIX)
-  # Sort libraries
-  SET(BLENDER_SORTED_LIBS
-    gp_ghost 
-    gp_common 
-    bf_string 
-    bf_ghost 
-    bf_rna
-    bf_blenkernel
-    bf_blenloader 
-    bf_blenpluginapi 
-    bf_blroutines 
-    bf_converter 
-    bf_ketsji 
-    bf_bullet 
-    bf_common 
-    bf_dummy 
-    bf_logic 
-    bf_rasterizer 
-    bf_oglrasterizer 
-    bf_expressions 
-    bf_scenegraph 
-    bf_IK
-    bf_moto 
-    bf_kernel 
-    bf_nodes
-    bf_gpu
-    bf_imbuf
-    bf_avi 
-    kx_network 
-    bf_ngnetwork 
-    bf_loopbacknetwork 
-    extern_bullet 
-    bf_guardedalloc 
-    bf_memutil 
-    bf_python
-    bf_gen_python
-    bf_blenlib 
-    bf_cineon 
-    bf_openexr 
-    extern_libopenjpeg 
-    bf_dds
-    bf_readblenfile 
-    bf_dna
-    bf_videotex
-    bf_blenfont
-    bf_audaspace
-    blenkernel_blc
-    extern_binreloc
-    extern_glew
-  )
+       # Sort libraries
+       SET(BLENDER_SORTED_LIBS
+               gp_ghost 
+               gp_common 
+               bf_string 
+               bf_ghost 
+               bf_rna
+               bf_blenkernel
+               bf_blenloader 
+               bf_blenpluginapi 
+               bf_blroutines 
+               bf_converter 
+               bf_ketsji 
+               bf_bullet 
+               bf_common 
+               bf_dummy 
+               bf_logic 
+               bf_rasterizer 
+               bf_oglrasterizer 
+               bf_expressions 
+               bf_scenegraph 
+               bf_IK
+               bf_moto 
+               bf_kernel 
+               bf_nodes
+               bf_gpu
+               bf_imbuf
+               bf_avi 
+               kx_network 
+               bf_ngnetwork 
+               bf_loopbacknetwork 
+               extern_bullet 
+               bf_guardedalloc 
+               bf_memutil 
+               bf_python
+               bf_gen_python
+               bf_blenlib 
+               bf_cineon 
+               bf_openexr 
+               extern_libopenjpeg 
+               bf_dds
+               bf_readblenfile 
+               bf_dna
+               bf_videotex
+               bf_blenfont
+               bf_audaspace
+               blenkernel_blc
+               extern_binreloc
+               extern_glew
+       )
   
-  IF(WITH_QUICKTIME)
-    SET(BLENDER_SORTED_LIBS ${BLENDER_SORTED_LIBS} quicktime)
-  ENDIF(WITH_QUICKTIME)
-
-  IF(WITH_CXX_GUARDEDALLOC)
-    SET(BLENDER_SORTED_LIBS ${BLENDER_SORTED_LIBS} bf_guardedalloc_cpp)
-  ENDIF(WITH_CXX_GUARDEDALLOC)
-
-  FOREACH(SORTLIB ${BLENDER_SORTED_LIBS})
-    SET(REMLIB ${SORTLIB})
-    FOREACH(SEARCHLIB ${BLENDER_LINK_LIBS})
-      IF(${SEARCHLIB} STREQUAL ${SORTLIB})
-        SET(REMLIB "")
-      ENDIF(${SEARCHLIB} STREQUAL ${SORTLIB})
-    ENDFOREACH(SEARCHLIB)
-    IF(REMLIB)
-      MESSAGE(STATUS "Removing library ${REMLIB} from blenderplayer linking because: not configured")
-      LIST(REMOVE_ITEM BLENDER_SORTED_LIBS ${REMLIB})
-    ENDIF(REMLIB)
-  ENDFOREACH(SORTLIB)
-
-  TARGET_LINK_LIBRARIES(blenderplayer ${BLENDER_SORTED_LIBS})
+       IF(WITH_QUICKTIME)
+               SET(BLENDER_SORTED_LIBS ${BLENDER_SORTED_LIBS} quicktime)
+       ENDIF(WITH_QUICKTIME)
+
+       IF(WITH_CXX_GUARDEDALLOC)
+               SET(BLENDER_SORTED_LIBS ${BLENDER_SORTED_LIBS} bf_guardedalloc_cpp)
+       ENDIF(WITH_CXX_GUARDEDALLOC)
+
+       FOREACH(SORTLIB ${BLENDER_SORTED_LIBS})
+               SET(REMLIB ${SORTLIB})
+               FOREACH(SEARCHLIB ${BLENDER_LINK_LIBS})
+                       IF(${SEARCHLIB} STREQUAL ${SORTLIB})
+                               SET(REMLIB "")
+                       ENDIF(${SEARCHLIB} STREQUAL ${SORTLIB})
+               ENDFOREACH(SEARCHLIB)
+               IF(REMLIB)
+                       MESSAGE(STATUS "Removing library ${REMLIB} from blenderplayer linking because: not configured")
+                       LIST(REMOVE_ITEM BLENDER_SORTED_LIBS ${REMLIB})
+               ENDIF(REMLIB)
+       ENDFOREACH(SORTLIB)
+
+       TARGET_LINK_LIBRARIES(blenderplayer ${BLENDER_SORTED_LIBS})
 ELSE(UNIX)
-  TARGET_LINK_LIBRARIES(blenderplayer ${BLENDER_LINK_LIBS})
+       TARGET_LINK_LIBRARIES(blenderplayer ${BLENDER_LINK_LIBS})
 ENDIF(UNIX)
 
 IF(WITH_PLAYER)
-  ADD_SUBDIRECTORY(bad_level_call_stubs)
+       ADD_SUBDIRECTORY(bad_level_call_stubs)
 ENDIF(WITH_PLAYER)
 
 SETUP_LIBLINKS(blenderplayer)
index fea19d9..502b374 100644 (file)
 FILE(GLOB SRC stubs.c)
 
 SET(INC 
-  .
-  .. 
-  ../../../source/blender/makesdna
-  ../../../source/blender/makesrna  
+       .
+       .. 
+       ../../../source/blender/makesdna
+       ../../../source/blender/makesrna  
 )
 
 IF(WITH_INTERNATIONAL)
-  ADD_DEFINITIONS(-DWITH_FREETYPE2)
+       ADD_DEFINITIONS(-DWITH_FREETYPE2)
 ENDIF(WITH_INTERNATIONAL)
 
 BLENDERLIB_NOLIST(blenkernel_blc "${SRC}" "${INC}")
index f563dec..1256881 100644 (file)
 SETUP_LIBDIRS()
 
 INCLUDE_DIRECTORIES(../../intern/guardedalloc
-  ../blender/blenlib
-  ../blender/blenkernel
-  ../blender/editors/include
-  ../blender/makesrna
-  ../blender/makesrna/intern
-  ../blender/nodes
-  ../blender/include
-  ../blender/blenloader
-  ../blender/imbuf
-  ../blender/renderconverter
-  ../blender/render/extern/include
-  ../blender/makesdna
-  ../blender/gpu
-  ../blender/windowmanager
-  ../kernel/gen_messaging
-  ../kernel/gen_system
-  ../../extern/glew/include
+       ../blender/blenlib
+       ../blender/blenkernel
+       ../blender/editors/include
+       ../blender/makesrna
+       ../blender/makesrna/intern
+       ../blender/nodes
+       ../blender/include
+       ../blender/blenloader
+       ../blender/imbuf
+       ../blender/renderconverter
+       ../blender/render/extern/include
+       ../blender/makesdna
+       ../blender/gpu
+       ../blender/windowmanager
+       ../kernel/gen_messaging
+       ../kernel/gen_system
+       ../../extern/glew/include
 )
 
 
 
 IF(WITH_QUICKTIME)
-  ADD_DEFINITIONS(-DWITH_QUICKTIME)
+       ADD_DEFINITIONS(-DWITH_QUICKTIME)
 ENDIF(WITH_QUICKTIME)
 
 IF(WITH_OPENEXR)
-  ADD_DEFINITIONS(-DWITH_OPENEXR)
+       ADD_DEFINITIONS(-DWITH_OPENEXR)
 ENDIF(WITH_OPENEXR)
 
 IF(WITH_PYTHON)
-  INCLUDE_DIRECTORIES(../blender/python)
+       INCLUDE_DIRECTORIES(../blender/python)
 ELSE(WITH_PYTHON)
-  ADD_DEFINITIONS(-DDISABLE_PYTHON)
+       ADD_DEFINITIONS(-DDISABLE_PYTHON)
 ENDIF(WITH_PYTHON)
 
 IF(NOT WITH_SDL)
-  ADD_DEFINITIONS(-DDISABLE_SDL)
+       ADD_DEFINITIONS(-DDISABLE_SDL)
 ENDIF(NOT WITH_SDL)
 
 IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
-  ADD_DEFINITIONS(-DWITH_BINRELOC)
-  INCLUDE_DIRECTORIES(${BINRELOC_INC})
+       ADD_DEFINITIONS(-DWITH_BINRELOC)
+       INCLUDE_DIRECTORIES(${BINRELOC_INC})
 ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
 
 MESSAGE(STATUS "Configuring blender")
 
 IF(WIN32)
-  ADD_EXECUTABLE(blender ${EXETYPE} creator.c ../icons/winblender.rc)
+       ADD_EXECUTABLE(blender ${EXETYPE} creator.c ../icons/winblender.rc)
 ELSE(WIN32)
-  ADD_EXECUTABLE(blender ${EXETYPE} creator.c)
+       ADD_EXECUTABLE(blender ${EXETYPE} creator.c)
 ENDIF(WIN32)
 
 
@@ -86,210 +86,210 @@ SET(TARGETDIR ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR})
 
 IF(WITH_INSTALL)
 
-  IF(UNIX)
-    ADD_CUSTOM_COMMAND(TARGET blender
-      POST_BUILD
-      MAIN_DEPENDENCY blender
-      #COMMAND cp -R ${CMAKE_SOURCE_DIR}/release/plugins ${TARGETDIR}/
-      #COMMAND cp -R ${CMAKE_SOURCE_DIR}/release/text/* ${TARGETDIR}/
-    )
-  ENDIF(UNIX)
-
-  IF(UNIX AND NOT APPLE)
-    ADD_CUSTOM_COMMAND(
-      TARGET blender POST_BUILD MAIN_DEPENDENCY blender
-      COMMAND rm -Rf ${TARGETDIR}/.blender
-      COMMAND mkdir ${TARGETDIR}/.blender/
-      COMMAND cp ${CMAKE_SOURCE_DIR}/bin/.blender/.bfont.ttf ${TARGETDIR}/.blender/
-    )
+       IF(UNIX)
+               ADD_CUSTOM_COMMAND(TARGET blender
+                       POST_BUILD
+                       MAIN_DEPENDENCY blender
+                       #COMMAND cp -R ${CMAKE_SOURCE_DIR}/release/plugins ${TARGETDIR}/
+                       #COMMAND cp -R ${CMAKE_SOURCE_DIR}/release/text/* ${TARGETDIR}/
+               )
+       ENDIF(UNIX)
+
+       IF(UNIX AND NOT APPLE)
+               ADD_CUSTOM_COMMAND(
+                       TARGET blender POST_BUILD MAIN_DEPENDENCY blender
+                       COMMAND rm -Rf ${TARGETDIR}/.blender
+                       COMMAND mkdir ${TARGETDIR}/.blender/
+                       COMMAND cp ${CMAKE_SOURCE_DIR}/bin/.blender/.bfont.ttf ${TARGETDIR}/.blender/
+               )
     
-    IF(WITH_INTERNATIONAL)
-      ADD_CUSTOM_COMMAND(
-        TARGET blender POST_BUILD MAIN_DEPENDENCY blender
-        COMMAND cp ${CMAKE_SOURCE_DIR}/bin/.blender/.Blanguages ${TARGETDIR}/.blender/
-        COMMAND cp -R ${CMAKE_SOURCE_DIR}/bin/.blender/locale ${TARGETDIR}/.blender/
-      )
-    ENDIF(WITH_INTERNATIONAL)
+               IF(WITH_INTERNATIONAL)
+                       ADD_CUSTOM_COMMAND(
+                               TARGET blender POST_BUILD MAIN_DEPENDENCY blender
+                               COMMAND cp ${CMAKE_SOURCE_DIR}/bin/.blender/.Blanguages ${TARGETDIR}/.blender/
+                               COMMAND cp -R ${CMAKE_SOURCE_DIR}/bin/.blender/locale ${TARGETDIR}/.blender/
+                       )
+               ENDIF(WITH_INTERNATIONAL)
     
-    IF(WITH_PYTHON)
-      ADD_CUSTOM_COMMAND(
-        TARGET blender POST_BUILD MAIN_DEPENDENCY blender
-        COMMENT "copying blender scripts..."
-        COMMAND cp -R ${CMAKE_SOURCE_DIR}/release/ui ${TARGETDIR}/.blender/
-        COMMAND cp -R ${CMAKE_SOURCE_DIR}/release/io ${TARGETDIR}/.blender/
-        COMMAND find ${TARGETDIR} -name "*.py?" -prune -exec rm -rf {} "\;"
-      )
+               IF(WITH_PYTHON)
+                       ADD_CUSTOM_COMMAND(
+                               TARGET blender POST_BUILD MAIN_DEPENDENCY blender
+                               COMMENT "copying blender scripts..."
+                               COMMAND cp -R ${CMAKE_SOURCE_DIR}/release/ui ${TARGETDIR}/.blender/
+                               COMMAND cp -R ${CMAKE_SOURCE_DIR}/release/io ${TARGETDIR}/.blender/
+                               COMMAND find ${TARGETDIR} -name "*.py?" -prune -exec rm -rf {} "\;"
+                       )
       
-      # Copy the systems python into the install directory
-      # Scons copy in tools/Blender.py
-      ADD_CUSTOM_COMMAND(
-        TARGET blender POST_BUILD MAIN_DEPENDENCY blender
-        COMMENT "copying a subset of the systems python..."
+                       # Copy the systems python into the install directory
+                       # Scons copy in tools/Blender.py
+                       ADD_CUSTOM_COMMAND(
+                               TARGET blender POST_BUILD MAIN_DEPENDENCY blender
+                               COMMENT "copying a subset of the systems python..."
         
-        COMMAND mkdir ${TARGETDIR}/.blender/python # PYTHONPATH and PYTHONHOME is set here
-        COMMAND mkdir ${TARGETDIR}/.blender/python/lib/
-        COMMAND cp -R ${PYTHON_LIBPATH}/python${PYTHON_VERSION} ${TARGETDIR}/.blender/python/lib/
+                               COMMAND mkdir ${TARGETDIR}/.blender/python # PYTHONPATH and PYTHONHOME is set here
+                               COMMAND mkdir ${TARGETDIR}/.blender/python/lib/
+                               COMMAND cp -R ${PYTHON_LIBPATH}/python${PYTHON_VERSION} ${TARGETDIR}/.blender/python/lib/
         
-        COMMAND rm -rf ${TARGETDIR}/.blender/python/lib/python${PYTHON_VERSION}/distutils
-        COMMAND rm -rf ${TARGETDIR}/.blender/python/lib/python${PYTHON_VERSION}/lib2to3
-        COMMAND rm -rf ${TARGETDIR}/.blender/python/lib/python${PYTHON_VERSION}/idlelib
-        COMMAND rm -rf ${TARGETDIR}/.blender/python/lib/python${PYTHON_VERSION}/tkinter
-        COMMAND rm -rf ${TARGETDIR}/.blender/python/lib/python${PYTHON_VERSION}/config
+                               COMMAND rm -rf ${TARGETDIR}/.blender/python/lib/python${PYTHON_VERSION}/distutils
+                               COMMAND rm -rf ${TARGETDIR}/.blender/python/lib/python${PYTHON_VERSION}/lib2to3
+                               COMMAND rm -rf ${TARGETDIR}/.blender/python/lib/python${PYTHON_VERSION}/idlelib
+                               COMMAND rm -rf ${TARGETDIR}/.blender/python/lib/python${PYTHON_VERSION}/tkinter
+                               COMMAND rm -rf ${TARGETDIR}/.blender/python/lib/python${PYTHON_VERSION}/config
         
-        COMMAND rm -rf ${TARGETDIR}/.blender/python/lib/python${PYTHON_VERSION}/site-packages
-        COMMAND mkdir ${TARGETDIR}/.blender/python/lib/python${PYTHON_VERSION}/site-packages    # python needs it.
-
-        COMMAND rm -f ${TARGETDIR}/.blender/python/lib/python${PYTHON_VERSION}/lib-dynload/_tkinter.so
-        COMMAND find ${TARGETDIR}/.blender/python/lib/python${PYTHON_VERSION} -name "test" -prune -exec rm -rf {} "\;"
-        COMMAND find ${TARGETDIR}/.blender/python/lib/python${PYTHON_VERSION} -name "*.py?" -exec rm -rf {} "\;"
-        COMMAND find ${TARGETDIR}/.blender/python/lib/python${PYTHON_VERSION} -name "*.so"-exec strip -s {} "\;"
-      )
+                               COMMAND rm -rf ${TARGETDIR}/.blender/python/lib/python${PYTHON_VERSION}/site-packages
+                               COMMAND mkdir ${TARGETDIR}/.blender/python/lib/python${PYTHON_VERSION}/site-packages    # python needs it.
+
+                               COMMAND rm -f ${TARGETDIR}/.blender/python/lib/python${PYTHON_VERSION}/lib-dynload/_tkinter.so
+                               COMMAND find ${TARGETDIR}/.blender/python/lib/python${PYTHON_VERSION} -name "test" -prune -exec rm -rf {} "\;"
+                               COMMAND find ${TARGETDIR}/.blender/python/lib/python${PYTHON_VERSION} -name "*.py?" -exec rm -rf {} "\;"
+                               COMMAND find ${TARGETDIR}/.blender/python/lib/python${PYTHON_VERSION} -name "*.so"-exec strip -s {} "\;"
+                       )
      
-    ENDIF(WITH_PYTHON)
+               ENDIF(WITH_PYTHON)
       
-    ADD_CUSTOM_COMMAND(
-      TARGET blender POST_BUILD MAIN_DEPENDENCY blender
-      COMMAND find ${TARGETDIR} -name .svn -prune -exec rm -rf {} "\;"
-    )
+               ADD_CUSTOM_COMMAND(
+                       TARGET blender POST_BUILD MAIN_DEPENDENCY blender
+                       COMMAND find ${TARGETDIR} -name .svn -prune -exec rm -rf {} "\;"
+               )
     
-  ENDIF(UNIX AND NOT APPLE)
-
-  IF(APPLE)
-    SET(SOURCEDIR ${CMAKE_SOURCE_DIR}/source/darwin/blender.app)
-    SET(SOURCEINFO ${SOURCEDIR}/Contents/Info.plist)
-    SET(TARGETINFO ${TARGETDIR}/blender.app/Contents/Info.plist)
-
-    ADD_CUSTOM_COMMAND(
-      TARGET blender POST_BUILD MAIN_DEPENDENCY blender
-      COMMAND cp -R ${SOURCEINFO} ${TARGETDIR}/blender.app/Contents/
-      COMMAND cp -R ${SOURCEDIR}/Contents/PkgInfo ${TARGETDIR}/blender.app/Contents/
-      COMMAND cp -R ${SOURCEDIR}/Contents/Resources ${TARGETDIR}/blender.app/Contents/
-      COMMAND cat ${SOURCEINFO} | sed s/VERSION/`cat ${CMAKE_SOURCE_DIR}/release/VERSION`/ | sed s/DATE/`date +'%Y-%b-%d'`/ > ${TARGETINFO}
-      COMMAND rm -Rf ${TARGETDIR}/blender.app/Contents/MacOS/.blender
-      COMMAND mkdir ${TARGETDIR}/blender.app/Contents/MacOS/.blender/
-      COMMAND cp ${CMAKE_SOURCE_DIR}/bin/.blender/.bfont.ttf ${TARGETDIR}/blender.app/Contents/MacOS/.blender/
-    )
+       ENDIF(UNIX AND NOT APPLE)
+
+       IF(APPLE)
+               SET(SOURCEDIR ${CMAKE_SOURCE_DIR}/source/darwin/blender.app)
+               SET(SOURCEINFO ${SOURCEDIR}/Contents/Info.plist)
+               SET(TARGETINFO ${TARGETDIR}/blender.app/Contents/Info.plist)
+
+               ADD_CUSTOM_COMMAND(
+                       TARGET blender POST_BUILD MAIN_DEPENDENCY blender
+                       COMMAND cp -R ${SOURCEINFO} ${TARGETDIR}/blender.app/Contents/
+                       COMMAND cp -R ${SOURCEDIR}/Contents/PkgInfo ${TARGETDIR}/blender.app/Contents/
+                       COMMAND cp -R ${SOURCEDIR}/Contents/Resources ${TARGETDIR}/blender.app/Contents/
+                       COMMAND cat ${SOURCEINFO} | sed s/VERSION/`cat ${CMAKE_SOURCE_DIR}/release/VERSION`/ | sed s/DATE/`date +'%Y-%b-%d'`/ > ${TARGETINFO}
+                       COMMAND rm -Rf ${TARGETDIR}/blender.app/Contents/MacOS/.blender
+                       COMMAND mkdir ${TARGETDIR}/blender.app/Contents/MacOS/.blender/
+                       COMMAND cp ${CMAKE_SOURCE_DIR}/bin/.blender/.bfont.ttf ${TARGETDIR}/blender.app/Contents/MacOS/.blender/
+               )
       
-    IF(WITH_INTERNATIONAL)
-      ADD_CUSTOM_COMMAND(
-        TARGET blender POST_BUILD MAIN_DEPENDENCY blender
-        COMMAND cp ${CMAKE_SOURCE_DIR}/bin/.blender/.Blanguages ${TARGETDIR}/blender.app/Contents/MacOS/.blender/
-        COMMAND cp -R ${CMAKE_SOURCE_DIR}/bin/.blender/locale ${TARGETDIR}/blender.app/Contents/Resources/
-        COMMAND cp -R ${CMAKE_SOURCE_DIR}/bin/.blender/locale ${TARGETDIR}/blender.app/Contents/MacOS/.blender/
-        COMMAND cp ${CMAKE_SOURCE_DIR}/bin/.blender/.Blanguages ${TARGETDIR}/blender.app/Contents/Resources/
-      )
-    ENDIF(WITH_INTERNATIONAL)
+               IF(WITH_INTERNATIONAL)
+                       ADD_CUSTOM_COMMAND(
+                               TARGET blender POST_BUILD MAIN_DEPENDENCY blender
+                               COMMAND cp ${CMAKE_SOURCE_DIR}/bin/.blender/.Blanguages ${TARGETDIR}/blender.app/Contents/MacOS/.blender/
+                               COMMAND cp -R ${CMAKE_SOURCE_DIR}/bin/.blender/locale ${TARGETDIR}/blender.app/Contents/Resources/
+                               COMMAND cp -R ${CMAKE_SOURCE_DIR}/bin/.blender/locale ${TARGETDIR}/blender.app/Contents/MacOS/.blender/
+                               COMMAND cp ${CMAKE_SOURCE_DIR}/bin/.blender/.Blanguages ${TARGETDIR}/blender.app/Contents/Resources/
+                       )
+               ENDIF(WITH_INTERNATIONAL)
       
-    IF(WITH_PYTHON)
-      ADD_CUSTOM_COMMAND(
-        TARGET blender POST_BUILD MAIN_DEPENDENCY blender
-        COMMAND cp -Rf ${CMAKE_SOURCE_DIR}/release/ui ${TARGETDIR}/blender.app/Contents/MacOS/.blender/
-        COMMAND cp -Rf ${CMAKE_SOURCE_DIR}/release/io ${TARGETDIR}/blender.app/Contents/MacOS/.blender/
-        COMMAND mkdir ${TARGETDIR}/blender.app/Contents/MacOS/.blender/python/
-        COMMAND unzip -q ${LIBDIR}/release/python.zip -d ${TARGETDIR}/blender.app/Contents/MacOS/.blender/python/
-        COMMAND find ${TARGETDIR}/blender.app -name "*.py?" -prune -exec rm -rf {} "\;"
-      )
-    ENDIF(WITH_PYTHON)      
+               IF(WITH_PYTHON)
+                       ADD_CUSTOM_COMMAND(
+                               TARGET blender POST_BUILD MAIN_DEPENDENCY blender
+                               COMMAND cp -Rf ${CMAKE_SOURCE_DIR}/release/ui ${TARGETDIR}/blender.app/Contents/MacOS/.blender/
+                               COMMAND cp -Rf ${CMAKE_SOURCE_DIR}/release/io ${TARGETDIR}/blender.app/Contents/MacOS/.blender/
+                               COMMAND mkdir ${TARGETDIR}/blender.app/Contents/MacOS/.blender/python/
+                               COMMAND unzip -q ${LIBDIR}/release/python.zip -d ${TARGETDIR}/blender.app/Contents/MacOS/.blender/python/
+                               COMMAND find ${TARGETDIR}/blender.app -name "*.py?" -prune -exec rm -rf {} "\;"
+                       )
+               ENDIF(WITH_PYTHON)      
     
-    ADD_CUSTOM_COMMAND(
-      TARGET blender POST_BUILD MAIN_DEPENDENCY blender    
-      COMMAND find ${TARGETDIR}/blender.app -name .DS_Store -prune -exec rm -rf {} "\;"
-      COMMAND find ${TARGETDIR}/blender.app -name .svn -prune -exec rm -rf {} "\;"
-    )
-  ENDIF(APPLE)
-
-  IF(WIN32)
-    FILE(TO_NATIVE_PATH ${CMAKE_SOURCE_DIR} WIN_SOURCE_DIR)
+               ADD_CUSTOM_COMMAND(
+                       TARGET blender POST_BUILD MAIN_DEPENDENCY blender    
+                       COMMAND find ${TARGETDIR}/blender.app -name .DS_Store -prune -exec rm -rf {} "\;"
+                       COMMAND find ${TARGETDIR}/blender.app -name .svn -prune -exec rm -rf {} "\;"
+               )
+       ENDIF(APPLE)
+
+       IF(WIN32)
+               FILE(TO_NATIVE_PATH ${CMAKE_SOURCE_DIR} WIN_SOURCE_DIR)
     
-    ADD_CUSTOM_COMMAND(TARGET blender
-      POST_BUILD
-      MAIN_DEPENDENCY blender
-      COMMAND if not exist \"${TARGETDIR}\\.blender\" mkdir \"${TARGETDIR}\\.blender\"
-      COMMAND if not exist \"${TARGETDIR}\\.blender\\locale\" mkdir \"${TARGETDIR}\\.blender\\locale\"
-      COMMAND if not exist \"${TARGETDIR}\\.blender\\ui\" mkdir \"${TARGETDIR}\\.blender\\ui\"
-      COMMAND if not exist \"${TARGETDIR}\\.blender\\io\" mkdir \"${TARGETDIR}\\.blender\\io\"
-      COMMAND if not exist \"${TARGETDIR}\\plugins\" mkdir \"${TARGETDIR}\\plugins\"
-      COMMAND copy /Y \"${WIN_SOURCE_DIR}\\bin\\.blender\\.Blanguages\" \"${TARGETDIR}\\.blender\\\" 
-      COMMAND copy /Y \"${WIN_SOURCE_DIR}\\bin\\.blender\\.bfont.ttf\" \"${TARGETDIR}\\.blender\\\"
-      COMMAND xcopy /E /Y \"${WIN_SOURCE_DIR}\\bin\\.blender\\locale\\*.*\" \"${TARGETDIR}\\.blender\\locale\"
-      COMMAND xcopy /E /Y \"${WIN_SOURCE_DIR}\\release\\scripts\\*.*\" \"${TARGETDIR}\\.blender\\scripts\"
-      COMMAND xcopy /E /Y \"${WIN_SOURCE_DIR}\\release\\ui\\*.*\" \"${TARGETDIR}\\.blender\\ui\"
-      COMMAND xcopy /E /Y \"${WIN_SOURCE_DIR}\\release\\io\\*.*\" \"${TARGETDIR}\\.blender\\io\"
-      COMMAND xcopy /E /Y \"${WIN_SOURCE_DIR}\\release\\plugins\\*.*\" \"${TARGETDIR}\\plugins\"
-      COMMAND copy /Y \"${WIN_SOURCE_DIR}\\release\\text\\*.*\" \"${TARGETDIR}\"
-      COMMAND copy /Y \"${WIN_SOURCE_DIR}\\release\\windows\\extra\\python26.zip\" \"${TARGETDIR}\\\"
-    )
+               ADD_CUSTOM_COMMAND(TARGET blender
+                       POST_BUILD
+                       MAIN_DEPENDENCY blender
+                       COMMAND if not exist \"${TARGETDIR}\\.blender\" mkdir \"${TARGETDIR}\\.blender\"
+                       COMMAND if not exist \"${TARGETDIR}\\.blender\\locale\" mkdir \"${TARGETDIR}\\.blender\\locale\"
+                       COMMAND if not exist \"${TARGETDIR}\\.blender\\ui\" mkdir \"${TARGETDIR}\\.blender\\ui\"
+                       COMMAND if not exist \"${TARGETDIR}\\.blender\\io\" mkdir \"${TARGETDIR}\\.blender\\io\"
+                       COMMAND if not exist \"${TARGETDIR}\\plugins\" mkdir \"${TARGETDIR}\\plugins\"
+                       COMMAND copy /Y \"${WIN_SOURCE_DIR}\\bin\\.blender\\.Blanguages\" \"${TARGETDIR}\\.blender\\\" 
+                       COMMAND copy /Y \"${WIN_SOURCE_DIR}\\bin\\.blender\\.bfont.ttf\" \"${TARGETDIR}\\.blender\\\"
+                       COMMAND xcopy /E /Y \"${WIN_SOURCE_DIR}\\bin\\.blender\\locale\\*.*\" \"${TARGETDIR}\\.blender\\locale\"
+                       COMMAND xcopy /E /Y \"${WIN_SOURCE_DIR}\\release\\scripts\\*.*\" \"${TARGETDIR}\\.blender\\scripts\"
+                       COMMAND xcopy /E /Y \"${WIN_SOURCE_DIR}\\release\\ui\\*.*\" \"${TARGETDIR}\\.blender\\ui\"
+                       COMMAND xcopy /E /Y \"${WIN_SOURCE_DIR}\\release\\io\\*.*\" \"${TARGETDIR}\\.blender\\io\"
+                       COMMAND xcopy /E /Y \"${WIN_SOURCE_DIR}\\release\\plugins\\*.*\" \"${TARGETDIR}\\plugins\"
+                       COMMAND copy /Y \"${WIN_SOURCE_DIR}\\release\\text\\*.*\" \"${TARGETDIR}\"
+                       COMMAND copy /Y \"${WIN_SOURCE_DIR}\\release\\windows\\extra\\python26.zip\" \"${TARGETDIR}\\\"
+               )
     
-    FILE(TO_NATIVE_PATH "${LIBDIR}" WIN_LIBDIR)
+               FILE(TO_NATIVE_PATH "${LIBDIR}" WIN_LIBDIR)
     
-    ADD_CUSTOM_COMMAND(TARGET blender
-      POST_BUILD
-      MAIN_DEPENDENCY blender
-      COMMAND copy /Y \"${WIN_LIBDIR}\\release\\python31.zip\" \"${TARGETDIR}\\\"
-      COMMAND copy /Y \"${WIN_LIBDIR}\\gettext\\lib\\gnu_gettext.dll\" \"${TARGETDIR}\\\"
-      COMMAND copy /Y \"${WIN_LIBDIR}\\png\\lib\\libpng.dll\" \"${TARGETDIR}\\\"
-      COMMAND copy /Y \"${WIN_LIBDIR}\\sdl\\lib\\SDL.dll\" \"${TARGETDIR}\\\"
-      COMMAND copy /Y \"${WIN_LIBDIR}\\zlib\\lib\\zlib.dll\" \"${TARGETDIR}\\\"
-      COMMAND copy /Y \"${WIN_LIBDIR}\\tiff\\lib\\libtiff.dll\" \"${TARGETDIR}\\\"
-      COMMAND copy /Y \"${WIN_LIBDIR}\\python\\lib\\python31.dll\" \"${TARGETDIR}\\\"
-      COMMAND copy /Y \"${WIN_LIBDIR}\\python\\lib\\python31_d.dll\" \"${TARGETDIR}\\\"
-      COMMAND copy /Y \"${WIN_LIBDIR}\\pthreads\\lib\\pthreadVC2.dll\" \"${TARGETDIR}\\\"
-      COMMAND copy /Y \"${WIN_LIBDIR}\\samplerate\\lib\\libsamplerate-0.dll\" \"${TARGETDIR}\\\"
-    )
-
-    IF(WITH_INTERNATIONAL)
-      ADD_CUSTOM_COMMAND(TARGET blender
-        POST_BUILD
-        MAIN_DEPENDENCY blender
-        COMMAND copy /Y \"${WIN_LIBDIR}\\iconv\\lib\\iconv.dll\" \"${TARGETDIR}\\\"
-      )
-    ENDIF(WITH_INTERNATIONAL)
-
-    IF(WITH_FFMPEG)
-      ADD_CUSTOM_COMMAND(TARGET blender
-        POST_BUILD
-        MAIN_DEPENDENCY blender
-        COMMAND copy /Y \"${WIN_LIBDIR}\\ffmpeg\\lib\\avcodec-52.dll\" \"${TARGETDIR}\\\"
-        COMMAND copy /Y \"${WIN_LIBDIR}\\ffmpeg\\lib\\avformat-52.dll\" \"${TARGETDIR}\\\"
-        COMMAND copy /Y \"${WIN_LIBDIR}\\ffmpeg\\lib\\avdevice-52.dll\" \"${TARGETDIR}\\\"
-        COMMAND copy /Y \"${WIN_LIBDIR}\\ffmpeg\\lib\\avutil-50.dll\" \"${TARGETDIR}\\\"
-        COMMAND copy /Y \"${WIN_LIBDIR}\\ffmpeg\\lib\\libfaac-0.dll\" \"${TARGETDIR}\\\"
-        COMMAND copy /Y \"${WIN_LIBDIR}\\ffmpeg\\lib\\libfaad-2.dll\" \"${TARGETDIR}\\\"
-        COMMAND copy /Y \"${WIN_LIBDIR}\\ffmpeg\\lib\\libmp3lame-0.dll\" \"${TARGETDIR}\\\"
-        COMMAND copy /Y \"${WIN_LIBDIR}\\ffmpeg\\lib\\libx264-67.dll\" \"${TARGETDIR}\\\"
-        COMMAND copy /Y \"${WIN_LIBDIR}\\ffmpeg\\lib\\swscale-0.dll\" \"${TARGETDIR}\\\"
-        COMMAND copy /Y \"${WIN_LIBDIR}\\ffmpeg\\lib\\xvidcore.dll\" \"${TARGETDIR}\\\"
-      )
-    ENDIF(WITH_FFMPEG)
-
-    IF(WITH_SNDFILE)
-      ADD_CUSTOM_COMMAND(TARGET blender
-        POST_BUILD
-        MAIN_DEPENDENCY blender
-        COMMAND copy /Y \"${WIN_LIBDIR}\\sndfile\\lib\\libsndfile-1.dll\" \"${TARGETDIR}\\\"
-      )
-    ENDIF(WITH_SNDFILE)
-
-    IF(WITH_JACK)
-      ADD_CUSTOM_COMMAND(TARGET blender
-        POST_BUILD
-        MAIN_DEPENDENCY blender
-        COMMAND copy /Y \"${WIN_LIBDIR}\\jack\\lib\\libjack.dll\" \"${TARGETDIR}\\\"
-      )
-    ENDIF(WITH_JACK)
-
-    IF(WITH_OPENAL)
-      ADD_CUSTOM_COMMAND(TARGET blender
-        POST_BUILD
-        MAIN_DEPENDENCY blender
-        COMMAND copy /Y \"${WIN_LIBDIR}\\openal\\lib\\OpenAL32.dll\" \"${TARGETDIR}\\\"
-        COMMAND copy /Y \"${WIN_LIBDIR}\\openal\\lib\\wrap_oal.dll\" \"${TARGETDIR}\\\"
-
-      )
-    ENDIF(WITH_OPENAL)
-
-
-  ENDIF(WIN32)
+               ADD_CUSTOM_COMMAND(TARGET blender
+                       POST_BUILD
+                       MAIN_DEPENDENCY blender
+                       COMMAND copy /Y \"${WIN_LIBDIR}\\release\\python31.zip\" \"${TARGETDIR}\\\"
+                       COMMAND copy /Y \"${WIN_LIBDIR}\\gettext\\lib\\gnu_gettext.dll\" \"${TARGETDIR}\\\"
+                       COMMAND copy /Y \"${WIN_LIBDIR}\\png\\lib\\libpng.dll\" \"${TARGETDIR}\\\"
+                       COMMAND copy /Y \"${WIN_LIBDIR}\\sdl\\lib\\SDL.dll\" \"${TARGETDIR}\\\"
+                       COMMAND copy /Y \"${WIN_LIBDIR}\\zlib\\lib\\zlib.dll\" \"${TARGETDIR}\\\"
+                       COMMAND copy /Y \"${WIN_LIBDIR}\\tiff\\lib\\libtiff.dll\" \"${TARGETDIR}\\\"
+                       COMMAND copy /Y \"${WIN_LIBDIR}\\python\\lib\\python31.dll\" \"${TARGETDIR}\\\"
+                       COMMAND copy /Y \"${WIN_LIBDIR}\\python\\lib\\python31_d.dll\" \"${TARGETDIR}\\\"
+                       COMMAND copy /Y \"${WIN_LIBDIR}\\pthreads\\lib\\pthreadVC2.dll\" \"${TARGETDIR}\\\"
+                       COMMAND copy /Y \"${WIN_LIBDIR}\\samplerate\\lib\\libsamplerate-0.dll\" \"${TARGETDIR}\\\"
+               )
+
+               IF(WITH_INTERNATIONAL)
+                       ADD_CUSTOM_COMMAND(TARGET blender
+                               POST_BUILD
+                               MAIN_DEPENDENCY blender
+                               COMMAND copy /Y \"${WIN_LIBDIR}\\iconv\\lib\\iconv.dll\" \"${TARGETDIR}\\\"
+                       )
+               ENDIF(WITH_INTERNATIONAL)
+
+               IF(WITH_FFMPEG)
+                       ADD_CUSTOM_COMMAND(TARGET blender
+                               POST_BUILD
+                               MAIN_DEPENDENCY blender
+                               COMMAND copy /Y \"${WIN_LIBDIR}\\ffmpeg\\lib\\avcodec-52.dll\" \"${TARGETDIR}\\\"
+                               COMMAND copy /Y \"${WIN_LIBDIR}\\ffmpeg\\lib\\avformat-52.dll\" \"${TARGETDIR}\\\"
+                               COMMAND copy /Y \"${WIN_LIBDIR}\\ffmpeg\\lib\\avdevice-52.dll\" \"${TARGETDIR}\\\"
+                               COMMAND copy /Y \"${WIN_LIBDIR}\\ffmpeg\\lib\\avutil-50.dll\" \"${TARGETDIR}\\\"
+                               COMMAND copy /Y \"${WIN_LIBDIR}\\ffmpeg\\lib\\libfaac-0.dll\" \"${TARGETDIR}\\\"
+                               COMMAND copy /Y \"${WIN_LIBDIR}\\ffmpeg\\lib\\libfaad-2.dll\" \"${TARGETDIR}\\\"
+                               COMMAND copy /Y \"${WIN_LIBDIR}\\ffmpeg\\lib\\libmp3lame-0.dll\" \"${TARGETDIR}\\\"
+                               COMMAND copy /Y \"${WIN_LIBDIR}\\ffmpeg\\lib\\libx264-67.dll\" \"${TARGETDIR}\\\"
+                               COMMAND copy /Y \"${WIN_LIBDIR}\\ffmpeg\\lib\\swscale-0.dll\" \"${TARGETDIR}\\\"
+                               COMMAND copy /Y \"${WIN_LIBDIR}\\ffmpeg\\lib\\xvidcore.dll\" \"${TARGETDIR}\\\"
+                       )
+               ENDIF(WITH_FFMPEG)
+
+               IF(WITH_SNDFILE)
+                       ADD_CUSTOM_COMMAND(TARGET blender
+                               POST_BUILD
+                               MAIN_DEPENDENCY blender
+                               COMMAND copy /Y \"${WIN_LIBDIR}\\sndfile\\lib\\libsndfile-1.dll\" \"${TARGETDIR}\\\"
+                       )
+               ENDIF(WITH_SNDFILE)
+
+               IF(WITH_JACK)
+                       ADD_CUSTOM_COMMAND(TARGET blender
+                               POST_BUILD
+                               MAIN_DEPENDENCY blender
+                               COMMAND copy /Y \"${WIN_LIBDIR}\\jack\\lib\\libjack.dll\" \"${TARGETDIR}\\\"
+                       )
+               ENDIF(WITH_JACK)
+
+               IF(WITH_OPENAL)
+                       ADD_CUSTOM_COMMAND(TARGET blender
+                               POST_BUILD
+                               MAIN_DEPENDENCY blender
+                               COMMAND copy /Y \"${WIN_LIBDIR}\\openal\\lib\\OpenAL32.dll\" \"${TARGETDIR}\\\"
+                               COMMAND copy /Y \"${WIN_LIBDIR}\\openal\\lib\\wrap_oal.dll\" \"${TARGETDIR}\\\"
+
+                       )
+               ENDIF(WITH_OPENAL)
+
+
+       ENDIF(WIN32)
 ENDIF(WITH_INSTALL)
 
 ADD_DEPENDENCIES(blender makesdna)
@@ -299,108 +299,108 @@ FILE(READ ${CMAKE_BINARY_DIR}/cmake_blender_libs.txt BLENDER_LINK_LIBS)
 SET(BLENDER_LINK_LIBS bf_nodes ${BLENDER_LINK_LIBS} bf_windowmanager bf_editors blender_render)
 
 IF(WITH_ELBEEM)
-  SET(BLENDER_LINK_LIBS ${BLENDER_LINK_LIBS} bf_elbeem)
+       SET(BLENDER_LINK_LIBS ${BLENDER_LINK_LIBS} bf_elbeem)
 ENDIF(WITH_ELBEEM)
 
 IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
-  SET(BLENDER_LINK_LIBS ${BLENDER_LINK_LIBS} extern_binreloc)
+       SET(BLENDER_LINK_LIBS ${BLENDER_LINK_LIBS} extern_binreloc)
 ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
 
 IF(UNIX)
-  # Sort libraries
-  SET(BLENDER_SORTED_LIBS
-    bf_windowmanager
-    bf_editors
-    bf_decimation 
-    blender_BSP 
-    bf_ghost 
-    bf_string 
-    blender_render 
-    blender_ONL 
-    bf_python 
-    bf_gen_python 
-    bf_blenkernel 
-    bf_nodes
-    bf_gpu
-    bf_blenloader 
-    bf_blenpluginapi 
-    bf_imbuf 
-    bf_blenlib 
-    bf_avi 
-    bf_cineon 
-    bf_openexr 
-    bf_dds
-    bf_readblenfile 
-    blender_bop 
-    bf_kernel 
-    bf_decimation 
-    bf_elbeem 
-    bf_IK 
-    bf_memutil 
-    bf_guardedalloc 
-    blender_CTR 
-    bf_moto 
-    bf_windowmanager
-    bf_editors
-    bf_blroutines 
-    bf_converter 
-    bf_dummy 
-    bf_bullet 
-    bf_smoke
-    bf_minilzo
-    bf_lzma
-    bf_common 
-    bf_ketsji 
-    bf_logic 
-    bf_rasterizer 
-    bf_oglrasterizer 
-    bf_expressions 
-    bf_scenegraph 
-    bf_moto 
-    bf_blroutines 
-    kx_network 
-    bf_kernel 
-    bf_ngnetwork 
-    extern_bullet 
-    bf_loopbacknetwork 
-    bf_common 
-    bf_moto 
-    bf_python
-    bf_gen_python
-    extern_binreloc
-    extern_glew
-    extern_libopenjpeg
-    bf_videotex
-    bf_rna
-    bf_dna
-    bf_blenfont
-    bf_audaspace
-  )
-
-  IF(WITH_CXX_GUARDEDALLOC)
-    SET(BLENDER_SORTED_LIBS ${BLENDER_SORTED_LIBS} bf_guardedalloc_cpp)
-  ENDIF(WITH_CXX_GUARDEDALLOC)
-
-  IF(WITH_QUICKTIME)
-    SET(BLENDER_SORTED_LIBS ${BLENDER_SORTED_LIBS} bf_quicktime)
-  ENDIF(WITH_QUICKTIME)
-
-
-  FOREACH(SORTLIB ${BLENDER_SORTED_LIBS})
-    SET(REMLIB ${SORTLIB})
-    FOREACH(SEARCHLIB ${BLENDER_LINK_LIBS})
-      IF(${SEARCHLIB} STREQUAL ${SORTLIB})
-        SET(REMLIB "")
-      ENDIF(${SEARCHLIB} STREQUAL ${SORTLIB})
-    ENDFOREACH(SEARCHLIB)
-    IF(REMLIB)
-      MESSAGE(STATUS "Removing library ${REMLIB} from blender linking because: not configured")
-      LIST(REMOVE_ITEM BLENDER_SORTED_LIBS ${REMLIB})
-    ENDIF(REMLIB)
-  ENDFOREACH(SORTLIB)
-  TARGET_LINK_LIBRARIES(blender ${BLENDER_SORTED_LIBS})
+       # Sort libraries
+       SET(BLENDER_SORTED_LIBS
+               bf_windowmanager
+               bf_editors
+               bf_decimation 
+               blender_BSP 
+               bf_ghost 
+               bf_string 
+               blender_render 
+               blender_ONL 
+               bf_python 
+               bf_gen_python 
+               bf_blenkernel 
+               bf_nodes
+               bf_gpu
+               bf_blenloader 
+               bf_blenpluginapi 
+               bf_imbuf 
+               bf_blenlib 
+               bf_avi 
+               bf_cineon 
+               bf_openexr 
+               bf_dds
+               bf_readblenfile 
+               blender_bop 
+               bf_kernel 
+               bf_decimation 
+               bf_elbeem 
+               bf_IK 
+               bf_memutil 
+               bf_guardedalloc 
+               blender_CTR 
+               bf_moto 
+               bf_windowmanager
+               bf_editors
+               bf_blroutines 
+               bf_converter 
+               bf_dummy 
+               bf_bullet 
+               bf_smoke
+               bf_minilzo
+               bf_lzma
+               bf_common 
+               bf_ketsji 
+               bf_logic 
+               bf_rasterizer 
+               bf_oglrasterizer 
+               bf_expressions 
+               bf_scenegraph 
+               bf_moto 
+               bf_blroutines 
+               kx_network 
+               bf_kernel 
+               bf_ngnetwork 
+               extern_bullet 
+               bf_loopbacknetwork 
+               bf_common 
+               bf_moto 
+               bf_python
+               bf_gen_python
+               extern_binreloc
+               extern_glew
+               extern_libopenjpeg
+               bf_videotex
+               bf_rna
+               bf_dna
+               bf_blenfont
+               bf_audaspace
+       )
+
+       IF(WITH_CXX_GUARDEDALLOC)
+               SET(BLENDER_SORTED_LIBS ${BLENDER_SORTED_LIBS} bf_guardedalloc_cpp)
+       ENDIF(WITH_CXX_GUARDEDALLOC)
+
+       IF(WITH_QUICKTIME)
+               SET(BLENDER_SORTED_LIBS ${BLENDER_SORTED_LIBS} bf_quicktime)
+       ENDIF(WITH_QUICKTIME)
+
+
+       FOREACH(SORTLIB ${BLENDER_SORTED_LIBS})
+               SET(REMLIB ${SORTLIB})
+               FOREACH(SEARCHLIB ${BLENDER_LINK_LIBS})
+                       IF(${SEARCHLIB} STREQUAL ${SORTLIB})
+                               SET(REMLIB "")
+                       ENDIF(${SEARCHLIB} STREQUAL ${SORTLIB})
+               ENDFOREACH(SEARCHLIB)
+               IF(REMLIB)
+                       MESSAGE(STATUS "Removing library ${REMLIB} from blender linking because: not configured")
+                       LIST(REMOVE_ITEM BLENDER_SORTED_LIBS ${REMLIB})
+               ENDIF(REMLIB)
+       ENDFOREACH(SORTLIB)
+       TARGET_LINK_LIBRARIES(blender ${BLENDER_SORTED_LIBS})
 ELSE(UNIX)
-  TARGET_LINK_LIBRARIES(blender ${BLENDER_LINK_LIBS})
+       TARGET_LINK_LIBRARIES(blender ${BLENDER_LINK_LIBS})
 ENDIF(UNIX)
 
 SETUP_LIBLINKS(blender)
index 42e270d..ee15fd9 100644 (file)
@@ -2,43 +2,43 @@
 FILE(GLOB SRC *.cpp)
 
 SET(INC
-  .
-  ../../../source/kernel/gen_system
-  ../../../intern/string
-  ../../../intern/guardedalloc
-  ../../../source/gameengine/Rasterizer/RAS_OpenGLRasterizer 
-  ../../../source/gameengine/Converter
-  ../../../source/blender/imbuf
-  ../../../intern/ghost/include
-  ../../../intern/moto/include
-  ../../../source/gameengine/Ketsji 
-  ../../../source/blender/blenlib
-  ../../../source/blender/blenkernel 
-  ../../../source/blender/blenfont
-  ../../../source/blender/editors/include
-  ../../../source/blender/windowmanager
-  ../../../source/blender 
-  ../../../source/blender/include
-  ../../../source/blender/makesdna
-  ../../../source/blender/makesrna 
-  ../../../source/gameengine/Rasterizer 
-  ../../../source/gameengine/GameLogic
-  ../../../source/gameengine/Expressions 
-  ../../../source/gameengine/Network
-  ../../../source/gameengine/SceneGraph 
-  ../../../source/gameengine/Physics/common
-  ../../../source/gameengine/Physics/Bullet
-  ../../../source/gameengine/Network/LoopBackNetwork
-  ../../../source/blender/misc 
-  ../../../source/blender/blenloader
-  ../../../source/blender/gpu
-  ../../../extern/bullet2/src
-  ../../../extern/glew/include
-  ${PYTHON_INC}
+       .
+       ../../../source/kernel/gen_system
+       ../../../intern/string
+       ../../../intern/guardedalloc
+       ../../../source/gameengine/Rasterizer/RAS_OpenGLRasterizer 
+       ../../../source/gameengine/Converter
+       ../../../source/blender/imbuf
+       ../../../intern/ghost/include
+       ../../../intern/moto/include
+       ../../../source/gameengine/Ketsji 
+       ../../../source/blender/blenlib
+       ../../../source/blender/blenkernel 
+       ../../../source/blender/blenfont
+       ../../../source/blender/editors/include
+       ../../../source/blender/windowmanager
+       ../../../source/blender 
+       ../../../source/blender/include
+       ../../../source/blender/makesdna
+       ../../../source/blender/makesrna 
+       ../../../source/gameengine/Rasterizer 
+       ../../../source/gameengine/GameLogic
+       ../../../source/gameengine/Expressions 
+       ../../../source/gameengine/Network
+       ../../../source/gameengine/SceneGraph 
+       ../../../source/gameengine/Physics/common
+       ../../../source/gameengine/Physics/Bullet
+       ../../../source/gameengine/Network/LoopBackNetwork
+       ../../../source/blender/misc 
+       ../../../source/blender/blenloader
+       ../../../source/blender/gpu
+       ../../../extern/bullet2/src
+       ../../../extern/glew/include
+       ${PYTHON_INC}
 )
 
 IF(WITH_FFMPEG)
-  ADD_DEFINITIONS(-DWITH_FFMPEG)
+       ADD_DEFINITIONS(-DWITH_FFMPEG)
 ENDIF(WITH_FFMPEG)
 
 BLENDERLIB(bf_blroutines "${SRC}" "${INC}")
index f546a31..5a1887b 100644 (file)
@@ -41,5 +41,5 @@ ADD_SUBDIRECTORY(Physics/Bullet)
 ADD_SUBDIRECTORY(VideoTexture)
 
 IF(WITH_PLAYER)
-  ADD_SUBDIRECTORY(GamePlayer)
+       ADD_SUBDIRECTORY(GamePlayer)
 ENDIF(WITH_PLAYER)
index f16e9e1..257ca85 100644 (file)
 FILE(GLOB SRC *.cpp)
 
 SET(INC
-  .
-  ../../../source/kernel/gen_system
-  ../../../intern/string
-  ../../../intern/guardedalloc
-  ../../../source/gameengine/Rasterizer/RAS_OpenGLRasterizer
-  ../../../intern/audaspace/intern
-  ../../../source/gameengine/Converter
-  ../../../source/gameengine/BlenderRoutines
-  ../../../source/blender/imbuf
-  ../../../intern/moto/include
-  ../../../source/gameengine/Ketsji
-  ../../../source/gameengine/Ketsji/KXNetwork
-  ../../../source/blender/blenlib
-  ../../../source/blender/blenkernel
-  ../../../source/blender/windowmanager
-  ../../../source/blender
-  ../../../source/blender/include
-  ../../../source/blender/makesdna
-  ../../../source/blender/makesrna
-  ../../../source/gameengine/Rasterizer
-  ../../../source/gameengine/Rasterizer/RAS_OpenGLRasterizer
-  ../../../source/gameengine/GameLogic
-  ../../../source/gameengine/Expressions
-  ../../../source/gameengine/Network
-  ../../../source/gameengine/SceneGraph
-  ../../../source/gameengine/Physics/common
-  ../../../source/gameengine/Physics/Bullet
-  ../../../source/gameengine/Physics/Dummy
-  ../../../source/gameengine/Network/LoopBackNetwork
-  ../../../source/blender/misc
-  ../../../source/blender/blenloader
-  ../../../source/blender/gpu
-  ../../../extern/bullet2/src
-  ${PYTHON_INC}
+       .
+       ../../../source/kernel/gen_system
+       ../../../intern/string
+       ../../../intern/guardedalloc
+       ../../../source/gameengine/Rasterizer/RAS_OpenGLRasterizer
+       ../../../intern/audaspace/intern
+       ../../../source/gameengine/Converter
+       ../../../source/gameengine/BlenderRoutines
+       ../../../source/blender/imbuf
+       ../../../intern/moto/include
+       ../../../source/gameengine/Ketsji
+       ../../../source/gameengine/Ketsji/KXNetwork
+       ../../../source/blender/blenlib
+       ../../../source/blender/blenkernel
+       ../../../source/blender/windowmanager
+       ../../../source/blender
+       ../../../source/blender/include
+       ../../../source/blender/makesdna
+       ../../../source/blender/makesrna
+       ../../../source/gameengine/Rasterizer
+       ../../../source/gameengine/Rasterizer/RAS_OpenGLRasterizer
+       ../../../source/gameengine/GameLogic
+       ../../../source/gameengine/Expressions
+       ../../../source/gameengine/Network
+       ../../../source/gameengine/SceneGraph
+       ../../../source/gameengine/Physics/common
+       ../../../source/gameengine/Physics/Bullet
+       ../../../source/gameengine/Physics/Dummy
+       ../../../source/gameengine/Network/LoopBackNetwork
+       ../../../source/blender/misc
+       ../../../source/blender/blenloader
+       ../../../source/blender/gpu
+       ../../../extern/bullet2/src
+       ${PYTHON_INC}
 )
 
 BLENDERLIB(bf_converter "${SRC}" "${INC}")
index dffd13f..439a508 100644 (file)
 FILE(GLOB SRC *.cpp)
 
 SET(INC
-  .
-  ../../../source/kernel/gen_system
-  ../../../intern/string
-  ../../../intern/moto/include
-  ../../../source/gameengine/SceneGraph
-  ../../../source/blender/blenloader
-  ${PYTHON_INC}
+       .
+       ../../../source/kernel/gen_system
+       ../../../intern/string
+       ../../../intern/moto/include
+       ../../../source/gameengine/SceneGraph
+       ../../../source/blender/blenloader
+       ${PYTHON_INC}
 )
 
 BLENDERLIB(bf_expressions "${SRC}" "${INC}")
index a1dce49..601585f 100644 (file)
 FILE(GLOB SRC *.cpp Joystick/*.cpp)
 
 SET(INC
-  . 
-  ../../../source/kernel/gen_system 
-  ../../../intern/string
-  ../../../source/gameengine/Expressions 
-  ../../../source/gameengine/SceneGraph
-  ../../../intern/moto/include
-  ../../../source/gameengine/Rasterizer
-  ${PYTHON_INC}
+       
+       ../../../source/kernel/gen_system 
+       ../../../intern/string
+       ../../../source/gameengine/Expressions 
+       ../../../source/gameengine/SceneGraph
+       ../../../intern/moto/include
+       ../../../source/gameengine/Rasterizer
+       ${PYTHON_INC}
 )
 
 IF(WITH_SDL)
-  SET(INC ${INC} ${SDL_INCLUDE_DIR})
+       SET(INC ${INC} ${SDL_INCLUDE_DIR})
 ELSE(WITH_SDL)
-  ADD_DEFINITIONS(-DDISABLE_SDL)
+       ADD_DEFINITIONS(-DDISABLE_SDL)
 ENDIF(WITH_SDL)
 
 BLENDERLIB(bf_logic "${SRC}" "${INC}")
index 134f8fc..7b4fa48 100644 (file)
@@ -28,5 +28,5 @@ ADD_SUBDIRECTORY(common)
 ADD_SUBDIRECTORY(ghost)
 
 IF(WITH_WEBPLUGIN) 
-  ADD_SUBDIRECTORY(xembed)
+       ADD_SUBDIRECTORY(xembed)
 ENDIF(WITH_WEBPLUGIN)
index da99087..c865cf5 100644 (file)
 # ***** END GPL LICENSE BLOCK *****
 
 SET(SRC 
-  bmfont.cpp
-  GPC_Canvas.cpp
-  GPC_Engine.cpp
-  GPC_KeyboardDevice.cpp
-  GPC_MouseDevice.cpp
-  GPC_RawImage.cpp
-  GPC_RawLoadDotBlendArray.cpp
-  GPC_RawLogoArrays.cpp
-  GPC_RenderTools.cpp
-  GPC_System.cpp
+       bmfont.cpp
+       GPC_Canvas.cpp
+       GPC_Engine.cpp
+       GPC_KeyboardDevice.cpp
+       GPC_MouseDevice.cpp
+       GPC_RawImage.cpp
+       GPC_RawLoadDotBlendArray.cpp
+       GPC_RawLogoArrays.cpp
+       GPC_RenderTools.cpp
+       GPC_System.cpp
 )
 
 SET(INC
-  .
-  ../../../../intern/string
-  ../../../../intern/ghost
-  ../../../../intern/guardedalloc
-  ../../../../intern/moto/include
-  ../../../../source/gameengine/Rasterizer/RAS_OpenGLRasterizer
-  ../../../../source/kernel/gen_system
-  ../../../../source/kernel/gen_messaging
-  ../../../../source/gameengine/Converter
-  ../../../../source/blender/imbuf
-  ../../../../source/gameengine/Ketsji
-  ../../../../source/blender/blenlib
-  ../../../../source/blender/blenkernel
-  ../../../../source/blender
-  ../../../../source/blender/include
-  ../../../../source/blender/makesdna
-  ../../../../source/gameengine/Rasterizer
-  ../../../../source/gameengine/GameLogic
-  ../../../../source/gameengine/Expressions
-  ../../../../source/gameengine/Network
-  ../../../../source/gameengine/SceneGraph
-  ../../../../source/gameengine/Physics/common
-  ../../../../source/gameengine/Network/LoopBackNetwork
-  ../../../../source/gameengine/GamePlayer/ghost
-  ../../../../source/blender/misc
-  ../../../../source/blender/blenloader
-  ../../../../source/blender/gpu
-  ../../../../extern/glew/include
-  ${PYTHON_INC}
-  ${PNG_INC}
-  ${ZLIB_INC}
+       .
+       ../../../../intern/string
+       ../../../../intern/ghost
+       ../../../../intern/guardedalloc
+       ../../../../intern/moto/include
+       ../../../../source/gameengine/Rasterizer/RAS_OpenGLRasterizer
+       ../../../../source/kernel/gen_system
+       ../../../../source/kernel/gen_messaging
+       ../../../../source/gameengine/Converter
+       ../../../../source/blender/imbuf
+       ../../../../source/gameengine/Ketsji
+       ../../../../source/blender/blenlib
+       ../../../../source/blender/blenkernel
+       ../../../../source/blender
+       ../../../../source/blender/include
+       ../../../../source/blender/makesdna
+       ../../../../source/gameengine/Rasterizer
+       ../../../../source/gameengine/GameLogic
+       ../../../../source/gameengine/Expressions
+       ../../../../source/gameengine/Network
+       ../../../../source/gameengine/SceneGraph
+       ../../../../source/gameengine/Physics/common
+       ../../../../source/gameengine/Network/LoopBackNetwork
+       ../../../../source/gameengine/GamePlayer/ghost
+       ../../../../source/blender/misc
+       ../../../../source/blender/blenloader
+       ../../../../source/blender/gpu
+       ../../../../extern/glew/include
+       ${PYTHON_INC}
+       ${PNG_INC}
+       ${ZLIB_INC}
 )
 
 BLENDERLIB_NOLIST(gp_common "${SRC}" "${INC}")
index 377d765..d50784c 100644 (file)
 # ***** END GPL LICENSE BLOCK *****
 
 SET(SRC 
-  GPG_Application.cpp
-  GPG_Canvas.cpp
-  GPG_ghost.cpp
-  GPG_KeyboardDevice.cpp
-  GPG_System.cpp
+       GPG_Application.cpp
+       GPG_Canvas.cpp
+       GPG_ghost.cpp
+       GPG_KeyboardDevice.cpp
+       GPG_System.cpp
 )
 
 SET(INC
-  .
-  ../../../../intern/string
-  ../../../../intern/ghost
-  ../../../../intern/guardedalloc
-  ../../../../intern/moto/include
-  ../../../../source/gameengine/Rasterizer/RAS_OpenGLRasterizer
-  ../../../../source/kernel/gen_system
-  ../../../../source/kernel/gen_messaging
-  ../../../../source/gameengine/Converter
-  ../../../../source/blender/imbuf
-  ../../../../source/gameengine/Ketsji
-  ../../../../source/blender/blenlib
-  ../../../../source/blender/blenkernel
-  ../../../../source/blender/readblenfile
-  ../../../../source/blender
-  ../../../../source/blender/include
-  ../../../../source/blender/makesdna
-  ../../../../source/blender/makesrna
-  ../../../../source/gameengine/Rasterizer
-  ../../../../source/gameengine/GameLogic
-  ../../../../source/gameengine/Expressions
-  ../../../../source/gameengine/Network
-  ../../../../source/gameengine/SceneGraph
-  ../../../../source/gameengine/Physics/common
-  ../../../../source/gameengine/Network/LoopBackNetwork
-  ../../../../source/gameengine/GamePlayer/common
-  ../../../../source/blender/misc
-  ../../../../source/blender/blenloader
-  ../../../../source/blender/gpu
-  ../../../../extern/glew/include
-  ${PYTHON_INC}
+       .
+       ../../../../intern/string
+       ../../../../intern/ghost
+       ../../../../intern/guardedalloc
+       ../../../../intern/moto/include
+       ../../../../source/gameengine/Rasterizer/RAS_OpenGLRasterizer
+       ../../../../source/kernel/gen_system
+       ../../../../source/kernel/gen_messaging
+       ../../../../source/gameengine/Converter
+       ../../../../source/blender/imbuf
+       ../../../../source/gameengine/Ketsji
+       ../../../../source/blender/blenlib
+       ../../../../source/blender/blenkernel
+       ../../../../source/blender/readblenfile
+       ../../../../source/blender
+       ../../../../source/blender/include
+       ../../../../source/blender/makesdna
+       ../../../../source/blender/makesrna
+       ../../../../source/gameengine/Rasterizer
+       ../../../../source/gameengine/GameLogic
+       ../../../../source/gameengine/Expressions
+       ../../../../source/gameengine/Network
+       ../../../../source/gameengine/SceneGraph
+       ../../../../source/gameengine/Physics/common
+       ../../../../source/gameengine/Network/LoopBackNetwork
+       ../../../../source/gameengine/GamePlayer/common
+       ../../../../source/blender/misc
+       ../../../../source/blender/blenloader
+       ../../../../source/blender/gpu
+       ../../../../extern/glew/include
+       ${PYTHON_INC}
 )
 
 IF(WITH_FFMPEG)
-  ADD_DEFINITIONS(-DWITH_FFMPEG)
+       ADD_DEFINITIONS(-DWITH_FFMPEG)
 ENDIF(WITH_FFMPEG)
 
 BLENDERLIB_NOLIST(gp_ghost "${SRC}" "${INC}")
index c91a377..01d369b 100644 (file)
 FILE(GLOB SRC *.cpp)
 
 SET(INC
-  .
-  ../../../source/kernel/gen_system
-  ../../../intern/string
-  ../../../intern/guardedalloc
-  ../../../source/gameengine/Rasterizer/RAS_OpenGLRasterizer 
-  ../../../source/gameengine/Converter
-  ../../../source/blender/imbuf
-  ../../../intern/ghost/include
-  ../../../intern/moto/include
-  ../../../source/gameengine/Ketsji 
-  ../../../source/blender/blenlib
-  ../../../source/blender/blenkernel
-  ../../../source/blender/python
-  ../../../source/blender/python/generic
-  ../../../source/blender 
-  ../../../source/blender/include
-  ../../../source/blender/makesdna 
-  ../../../source/gameengine/Rasterizer 
-  ../../../source/gameengine/GameLogic
-  ../../../source/gameengine/Expressions 
-  ../../../source/gameengine/Ketsji/KXNetwork
-  ../../../source/gameengine/Network
-  ../../../source/gameengine/SceneGraph 
-  ../../../source/gameengine/Physics/common
-  ../../../source/gameengine/Physics/Bullet 
-  ../../../source/gameengine/Network/LoopBackNetwork
-  ../../../intern/audaspace/intern
-  ../../../source/blender/misc 
-  ../../../source/blender/blenloader
-  ../../../source/blender/gpu
-  ../../../extern/bullet2/src
-  ../../../extern/glew/include
-  ${PYTHON_INC}
+       .
+       ../../../source/kernel/gen_system
+       ../../../intern/string
+       ../../../intern/guardedalloc
+       ../../../source/gameengine/Rasterizer/RAS_OpenGLRasterizer 
+       ../../../source/gameengine/Converter
+       ../../../source/blender/imbuf
+       ../../../intern/ghost/include
+       ../../../intern/moto/include
+       ../../../source/gameengine/Ketsji 
+       ../../../source/blender/blenlib
+       ../../../source/blender/blenkernel
+       ../../../source/blender/python
+       ../../../source/blender/python/generic
+       ../../../source/blender 
+       ../../../source/blender/include
+       ../../../source/blender/makesdna 
+       ../../../source/gameengine/Rasterizer 
+       ../../../source/gameengine/GameLogic
+       ../../../source/gameengine/Expressions 
+       ../../../source/gameengine/Ketsji/KXNetwork
+       ../../../source/gameengine/Network
+       ../../../source/gameengine/SceneGraph 
+       ../../../source/gameengine/Physics/common
+       ../../../source/gameengine/Physics/Bullet 
+       ../../../source/gameengine/Network/LoopBackNetwork
+       ../../../intern/audaspace/intern
+       ../../../source/blender/misc 
+       ../../../source/blender/blenloader
+       ../../../source/blender/gpu
+       ../../../extern/bullet2/src
+       ../../../extern/glew/include
+       ${PYTHON_INC}
 )
 
 IF(WITH_SDL)
-  SET(INC ${INC} ${SDL_INCLUDE_DIR})  
+       SET(INC ${INC} ${SDL_INCLUDE_DIR})  
 ELSE(WITH_SDL)
-  ADD_DEFINITIONS(-DDISABLE_SDL)
+       ADD_DEFINITIONS(-DDISABLE_SDL)
 ENDIF(WITH_SDL)
 
 BLENDERLIB(bf_ketsji "${SRC}" "${INC}")
index d9a9fc5..b89b0dc 100644 (file)
 FILE(GLOB SRC *.cpp)
 
 SET(INC
-  .
-  ../../../../source/kernel/gen_system
-  ../../../../intern/string
-  ../../../../intern/moto/include
-  ../../../../source/gameengine/Ketsji
-  ../../../../source/gameengine/GameLogic
-  ../../../../source/gameengine/Expressions
-  ../../../../source/gameengine/SceneGraph
-  ../../../../source/gameengine/Network
-  ${PYTHON_INC}
+       .
+       ../../../../source/kernel/gen_system
+       ../../../../intern/string
+       ../../../../intern/moto/include
+       ../../../../source/gameengine/Ketsji
+       ../../../../source/gameengine/GameLogic
+       ../../../../source/gameengine/Expressions
+       ../../../../source/gameengine/SceneGraph
+       ../../../../source/gameengine/Network
+       ${PYTHON_INC}
 )
 
 BLENDERLIB(kx_network "${SRC}" "${INC}")
index 933f055..1e467a7 100644 (file)
 FILE(GLOB SRC *.cpp)
 
 SET(INC
-  .
-  ../../../source/kernel/gen_system
-  ../../../intern/string
-  ../../../intern/moto/include
+       .
+       ../../../source/kernel/gen_system
+       ../../../intern/string
+       ../../../intern/moto/include
 )
 
 BLENDERLIB(bf_ngnetwork "${SRC}" "${INC}")
index 0b95892..18e3d8e 100644 (file)
 SET(SRC NG_LoopBackNetworkDeviceInterface.cpp)
 
 SET(INC
-  .
-  ../../../../source/kernel/gen_system
-  ../../../../intern/string
-  ../../../../source/gameengine/Network
+       .
+       ../../../../source/kernel/gen_system
+       ../../../../intern/string
+       ../../../../source/gameengine/Network
 )
 
 BLENDERLIB(bf_loopbacknetwork "${SRC}" "${INC}")
index 7b7fb50..da88512 100644 (file)
 SET(SRC CcdPhysicsEnvironment.cpp CcdPhysicsController.cpp CcdGraphicController.cpp)
 
 SET(INC
-  .
-  ../common
-  ../../../../extern/bullet2/src
-  ../../../../extern/glew/include
-  ../../../../intern/moto/include
-  ../../../../intern/guardedalloc
-  ../../../kernel/gen_system
-  ../../../../intern/string
-  ../../Rasterizer
-  ../../Ketsji
-  ../../Expressions
-  ../../GameLogic
-  ../../SceneGraph
-  ../../../../source/blender/makesdna
-  ../../../../source/blender/blenlib
-  ../../../../source/blender/blenkernel
-  ${PYTHON_INC}
+       .
+       ../common
+       ../../../../extern/bullet2/src
+       ../../../../extern/glew/include
+       ../../../../intern/moto/include
+       ../../../../intern/guardedalloc
+       ../../../kernel/gen_system
+       ../../../../intern/string
+       ../../Rasterizer
+       ../../Ketsji
+       ../../Expressions
+       ../../GameLogic
+       ../../SceneGraph
+       ../../../../source/blender/makesdna
+       ../../../../source/blender/blenlib
+       ../../../../source/blender/blenkernel
+       ${PYTHON_INC}
 )
 
 BLENDERLIB(bf_bullet "${SRC}" "${INC}")
index 4bd29e7..d613bf8 100644 (file)
@@ -27,8 +27,8 @@
 SET(SRC DummyPhysicsEnvironment.cpp)
 
 SET(INC
-  .
-  ../common
+       .
+       ../common
 )
 
 BLENDERLIB(bf_dummy "${SRC}" "${INC}")
index 41b2687..a34bd19 100644 (file)
@@ -27,9 +27,9 @@
 SET(SRC PHY_IMotionState.cpp PHY_IController.cpp PHY_IPhysicsController.cpp PHY_IGraphicController.cpp PHY_IPhysicsEnvironment.cpp PHY_IVehicle.cpp)
 
 SET(INC
-  .
-  ../Dummy
-  ../../../intern/moto/include
+       .
+       ../Dummy
+       ../../../intern/moto/include
 )
 
 BLENDERLIB(bf_common "${SRC}" "${INC}")
index 143209f..51d1f50 100644 (file)
 FILE(GLOB SRC *.cpp)
 
 SET(INC
-  .
-  ../../../source/kernel/gen_system
-  ../../../source/blender/makesdna
-  ../../../source/gameengine/SceneGraph
-  ../../../intern/string
-  ../../../intern/moto/include
-  ../../../extern/glew/include
-  ../Expressions
-  ${PYTHON_INC}
+       .
+       ../../../source/kernel/gen_system
+       ../../../source/blender/makesdna
+       ../../../source/gameengine/SceneGraph
+       ../../../intern/string
+       ../../../intern/moto/include
+       ../../../extern/glew/include
+       ../Expressions
+       ${PYTHON_INC}
 )
 
 BLENDERLIB(bf_rasterizer "${SRC}" "${INC}")
index fe3d0f6..f2b97be 100644 (file)
 FILE(GLOB SRC *.cpp)
 
 SET(INC
-  ../../../../source/kernel/gen_system
-  ../../../../intern/string
-  ../../../../intern/moto/include
-  ../../../../source/gameengine/Rasterizer
-  ../../../../source/gameengine/Ketsji
-  ../../../../source/gameengine/SceneGraph
-  ../../../../extern/glew/include
-  ../../../../source/blender/gpu
-  ../../../../source/blender/makesdna
-  ../../../../source/blender/blenkernel
-  ../../../../source/blender/blenlib
-  ../../../../source/blender/blenloader
+       ../../../../source/kernel/gen_system
+       ../../../../intern/string
+       ../../../../intern/moto/include
+       ../../../../source/gameengine/Rasterizer
+       ../../../../source/gameengine/Ketsji
+       ../../../../source/gameengine/SceneGraph
+       ../../../../extern/glew/include
+       ../../../../source/blender/gpu
+       ../../../../source/blender/makesdna
+       ../../../../source/blender/blenkernel
+       ../../../../source/blender/blenlib
+       ../../../../source/blender/blenloader
 )
 
 BLENDERLIB(bf_oglrasterizer "${SRC}" "${INC}")
index 0409b8c..2ac52be 100644 (file)
@@ -27,8 +27,8 @@
 FILE(GLOB SRC *.cpp)
 
 SET(INC
-  .
-  ../../../intern/moto/include
+       .
+       ../../../intern/moto/include
 )
 
 BLENDERLIB(bf_scenegraph "${SRC}" "${INC}")
index 255d090..935c5a2 100644 (file)
 FILE(GLOB SRC *.cpp)
 
 SET(INC
-  .
-  ../../../source/gameengine/Ketsji
-  ../../../source/gameengine/Expressions
-  ../../../source/gameengine/GameLogic
-  ../../../source/gameengine/SceneGraph
-  ../../../source/gameengine/Rasterizer
-  ../../../source/gameengine/Rasterizer/RAS_OpenGLRasterizer
-  ../../../source/gameengine/BlenderRoutines
-  ../../../source/blender/include
-  ../../../source/blender/blenlib
-  ../../../source/blender/blenkernel
-  ../../../source/blender/makesdna
-  ../../../source/blender/editors/include
-  ../../../source/blender/imbuf
-  ../../../source/blender/python
-  ../../../source/blender/gpu
-  ../../../source/kernel/gen_system
-  ../../../intern/string
-  ../../../intern/moto/include
-  ../../../intern/guardedalloc
-  ../../../extern/glew/include
-  ${PYTHON_INC}
+       .
+       ../../../source/gameengine/Ketsji
+       ../../../source/gameengine/Expressions
+       ../../../source/gameengine/GameLogic
+       ../../../source/gameengine/SceneGraph
+       ../../../source/gameengine/Rasterizer
+       ../../../source/gameengine/Rasterizer/RAS_OpenGLRasterizer
+       ../../../source/gameengine/BlenderRoutines
+       ../../../source/blender/include
+       ../../../source/blender/blenlib
+       ../../../source/blender/blenkernel
+       ../../../source/blender/makesdna
+       ../../../source/blender/editors/include
+       ../../../source/blender/imbuf
+       ../../../source/blender/python
+       ../../../source/blender/gpu
+       ../../../source/kernel/gen_system
+       ../../../intern/string
+       ../../../intern/moto/include
+       ../../../intern/guardedalloc
+       ../../../extern/glew/include
+       ${PYTHON_INC}
 )
 
 IF(WITH_FFMPEG)
-  SET(INC ${INC} ${FFMPEG_INC} ${PTHREADS_INC})
-  ADD_DEFINITIONS(-DWITH_FFMPEG)
-  ADD_DEFINITIONS(-D__STDC_CONSTANT_MACROS)
+       SET(INC ${INC} ${FFMPEG_INC} ${PTHREADS_INC})
+       ADD_DEFINITIONS(-DWITH_FFMPEG)
+       ADD_DEFINITIONS(-D__STDC_CONSTANT_MACROS)
 ENDIF(WITH_FFMPEG)
 
 BLENDERLIB(bf_videotex "${SRC}" "${INC}")
index ac75939..3aea2b9 100644 (file)
 SET(INC gen_messaging gen_system ../../intern/string ../../intern/moto/include ../../source/blender/blenloader )
 
 FILE(GLOB SRC   
-  gen_messaging/intern/messaging.c
-  gen_system/GEN_HashedPtr.cpp
-  gen_system/GEN_Matrix4x4.cpp
-  gen_system/SYS_SingletonSystem.cpp
-  gen_system/SYS_System.cpp
+       gen_messaging/intern/messaging.c
+       gen_system/GEN_HashedPtr.cpp
+       gen_system/GEN_Matrix4x4.cpp
+       gen_system/SYS_SingletonSystem.cpp
+       gen_system/SYS_System.cpp
 )
 
 BLENDERLIB(bf_kernel "${SRC}" "${INC}")