- rna sequence sound was referencing unknown struct

- cmake was using libs that were disabled (whitespace changes too)
- unit conversion missing checks for % ~ & operators

1 files changed, 42 insertions, 41 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 029a65eb739..5e72227982d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -53,24 +53,24 @@ SET(LIBRARY_OUTPUT_PATH  ${CMAKE_BINARY_DIR}/lib)
 
 #-----------------------------------------------------------------------------
 # Set default config options
-OPTION(WITH_PLAYER		"Build Player"						OFF)
-OPTION(WITH_GAMEENGINE		"Enable Game Engine"					ON)
-OPTION(WITH_BULLET		"Enable Bullet (Physics Engine)"			ON)
-OPTION(WITH_INTERNATIONAL	"Enable I18N   (International fonts and text)"		ON)
-OPTION(WITH_ELBEEM		"Enable Elbeem (Fluid Simulation)"			ON)
-OPTION(WITH_QUICKTIME		"Enable Quicktime Support"				OFF)
-OPTION(WITH_OPENEXR		"Enable OpenEXR Support (http://www.openexr.com)"	ON)
-OPTION(WITH_DDS			"Enable DDS Support"                                   	ON)
-OPTION(WITH_FFMPEG		"Enable FFMPeg Support (http://ffmpeg.mplayerhq.hu/)"	OFF)
-OPTION(WITH_PYTHON		"Enable Embedded Python API"				ON)
-OPTION(WITH_SDL			"Enable SDL for sound and joystick support"				ON)
-OPTION(WITH_OPENJPEG		"Enable OpenJpeg Support (http://www.openjpeg.org/)"	OFF)
-OPTION(WITH_OPENAL		"Enable OpenAL Support (http://www.openal.org)"		ON)
-OPTION(WITH_OPENMP		"Enable OpenMP (has to be supported by the compiler)"	OFF)
-OPTION(WITH_WEBPLUGIN		"Enable Web Plugin (Unix only)"				OFF)
-OPTION(WITH_FFTW3		"Enable FFTW3 support"				OFF)
-OPTION(WITH_JACK		"Enable Jack Support (http://www.jackaudio.org)"		OFF)
-OPTION(WITH_INSTALL "Install accompanying scripts and language files needed to run blender" ON)
+OPTION(WITH_PLAYER        "Build Player" OFF)
+OPTION(WITH_GAMEENGINE    "Enable Game Engine" ON)
+OPTION(WITH_BULLET        "Enable Bullet (Physics Engine)" ON)
+OPTION(WITH_INTERNATIONAL "Enable I18N   (International fonts and text)" ON)
+OPTION(WITH_ELBEEM        "Enable Elbeem (Fluid Simulation)" ON)
+OPTION(WITH_QUICKTIME     "Enable Quicktime Support" OFF)
+OPTION(WITH_OPENEXR       "Enable OpenEXR Support (http://www.openexr.com)" ON)
+OPTION(WITH_DDS           "Enable DDS Support" ON)
+OPTION(WITH_FFMPEG        "Enable FFMPeg Support (http://ffmpeg.mplayerhq.hu/)" OFF)
+OPTION(WITH_PYTHON        "Enable Embedded Python API" ON)
+OPTION(WITH_SDL           "Enable SDL for sound and joystick support" ON)
+OPTION(WITH_OPENJPEG      "Enable OpenJpeg Support (http://www.openjpeg.org/)" OFF)
+OPTION(WITH_OPENAL        "Enable OpenAL Support (http://www.openal.org)" ON)
+OPTION(WITH_OPENMP        "Enable OpenMP (has to be supported by the compiler)" OFF)
+OPTION(WITH_WEBPLUGIN     "Enable Web Plugin (Unix only)" OFF)
+OPTION(WITH_FFTW3         "Enable FFTW3 support" OFF)
+OPTION(WITH_JACK          "Enable Jack Support (http://www.jackaudio.org)" 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")
@@ -102,10 +102,10 @@ IF(UNIX AND NOT APPLE)
   ENDIF(WITH_OPENAL)
 
   IF(WITH_JACK)
-	SET(JACK /usr)
-	SET(JACK_INC ${JACK}/include/jack)
-	SET(JACK_LIB jack)
-	SET(JACK_LIBPATH ${JACK}/lib)
+    SET(JACK /usr)
+    SET(JACK_INC ${JACK}/include/jack)
+    SET(JACK_LIB jack)
+    SET(JACK_LIBPATH ${JACK}/lib)
   ENDIF(WITH_JACK)
 
   FIND_LIBRARY(INTL_LIBRARY
@@ -239,10 +239,10 @@ IF(WIN32)
   ENDIF(CMAKE_CL_64)
 
   IF(WITH_JACK)
-	SET(JACK ${LIBDIR}/jack)
-	SET(JACK_INC ${JACK}/include/jack)
-	SET(JACK_LIB jack)
-	SET(JACK_LIBPATH ${JACK}/lib)
+    SET(JACK ${LIBDIR}/jack)
+    SET(JACK_INC ${JACK}/include/jack)
+    SET(JACK_LIB jack)
+    SET(JACK_LIBPATH ${JACK}/lib)
   ENDIF(WITH_JACK)
 
   IF(CMAKE_CL_64)
@@ -268,10 +268,10 @@ IF(WIN32)
   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)
+    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)
@@ -292,12 +292,12 @@ IF(WIN32)
   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)
+    SET(OPENEXR_LIBPATH ${OPENEXR}/lib_vs2005)
   ELSE (MSVC80)
-  SET(OPENEXR_LIBPATH ${OPENEXR}/lib_msvc)
+    SET(OPENEXR_LIBPATH ${OPENEXR}/lib_msvc)
   ENDIF(MSVC80)
   IF (MSVC90)
-  SET(OPENEXR_LIBPATH ${OPENEXR}/lib_vs2008)
+    SET(OPENEXR_LIBPATH ${OPENEXR}/lib_vs2008)
   ENDIF(MSVC90)
 
   
@@ -317,9 +317,9 @@ IF(WIN32)
   SET(LIBSAMPLERATE_LIBPATH ${LIBSAMPLERATE}/lib)
 
   IF(CMAKE_CL_64)
-  SET(LLIBS kernel32 user32 vfw32 winmm ws2_32 )
+    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)
+    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)
@@ -355,10 +355,11 @@ IF(WIN32)
   SET(WINTAB_INC ${LIBDIR}/wintab/include) 
 
   IF(CMAKE_CL_64)
-  SET(PLATFORM_LINKFLAGS "/MANIFEST:NO /MANIFESTUAC:NO /MACHINE:X64 /NODEFAULTLIB:libc.lib;MSVCRT.lib ")
+    SET(PLATFORM_LINKFLAGS "/MANIFEST:NO /MANIFESTUAC:NO /MACHINE:X64 /NODEFAULTLIB:libc.lib;MSVCRT.lib ")
   ELSE(CMAKE_CL_64)
-  SET(PLATFORM_LINKFLAGS "/NODEFAULTLIB:libc.lib ")
+    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 ")
 ENDIF(WIN32)
 
@@ -379,10 +380,10 @@ IF(APPLE)
   ENDIF(WITH_OPENAL)
 
   IF(WITH_JACK)
-	SET(JACK /usr)
-	SET(JACK_INC ${JACK}/include/jack)
-	SET(JACK_LIB jack)
-	SET(JACK_LIBPATH ${JACK}/lib)
+    SET(JACK /usr)
+    SET(JACK_INC ${JACK}/include/jack)
+    SET(JACK_LIB jack)
+    SET(JACK_LIBPATH ${JACK}/lib)
   ENDIF(WITH_JACK)
 
   SET(PYTHON_VERSION 3.1)