Merge branch 'master' of git://github.com/LightDrake/SingularityViewer

indra/cmake/Boost.cmake

@@ -7,10 +7,8 @@ set(Boost_FIND_REQUIRED ON)
 if (STANDALONE)
   include(FindBoost)
 
-  set(BOOST_FILESYSTEM_LIBRARY boost_filesystem-mt)
+  set(Boost_USE_MULTITHREADED ON)
-  set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt)
+  find_package(Boost 1.40.0 COMPONENTS date_time filesystem program_options regex system thread wave)
-  set(BOOST_REGEX_LIBRARY boost_regex-mt)
-  set(BOOST_SYSTEM_LIBRARY boost_system-mt)
 else (STANDALONE)
   use_prebuilt_binary(boost)
   set(Boost_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
@@ -32,22 +30,22 @@ else (STANDALONE)
       set(BOOST_DEBUG_SUFFIX mt-gd)
     endif (MSVC71)
 
-	set(BOOST_PROGRAM_OPTIONS_LIBRARY 
+    set(Boost_PROGRAM_OPTIONS_LIBRARY 
           optimized libboost_program_options-vc${MSVC_SUFFIX}-${BOOST_OPTIM_SUFFIX}-${BOOST_VERSION}
           debug libboost_program_options-vc${MSVC_SUFFIX}-${BOOST_DEBUG_SUFFIX}-${BOOST_VERSION})
-    set(BOOST_REGEX_LIBRARY
+    set(Boost_REGEX_LIBRARY
           optimized libboost_regex-vc${MSVC_SUFFIX}-${BOOST_OPTIM_SUFFIX}-${BOOST_VERSION}
           debug libboost_regex-vc${MSVC_SUFFIX}-${BOOST_DEBUG_SUFFIX}-${BOOST_VERSION})
 
   elseif (DARWIN)
-    set(BOOST_FILESYSTEM_LIBRARY boost_filesystem)
+    set(Boost_FILESYSTEM_LIBRARY boost_filesystem)
-    set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options)
+    set(Boost_PROGRAM_OPTIONS_LIBRARY boost_program_options)
-    set(BOOST_REGEX_LIBRARY boost_regex)
+    set(Boost_REGEX_LIBRARY boost_regex)
-    set(BOOST_SYSTEM_LIBRARY boost_system)  
+    set(Boost_SYSTEM_LIBRARY boost_system)  
   elseif (LINUX)
-    set(BOOST_FILESYSTEM_LIBRARY boost_filesystem-mt)
+    set(Boost_FILESYSTEM_LIBRARY boost_filesystem-mt)
-    set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt)
+    set(Boost_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt)
-    set(BOOST_REGEX_LIBRARY boost_regex-mt)
+    set(Boost_REGEX_LIBRARY boost_regex-mt)
-    set(BOOST_SYSTEM_LIBRARY boost_system-mt)  
+    set(Boost_SYSTEM_LIBRARY boost_system-mt)  
   endif (WINDOWS)
 endif (STANDALONE)

indra/cmake/FMODEX.cmake

@@ -8,7 +8,7 @@ if(INSTALL_PROPRIETARY)
 endif(INSTALL_PROPRIETARY)
 
 find_library(FMODEX_LIBRARY
-             NAMES fmodex fmodex_vc fmodexL_vc
+             NAMES fmodex fmodexL fmodex_vc fmodexL_vc
              PATHS
              optimized ${ARCH_PREBUILT_DIRS_RELEASE}
              debug ${ARCH_PREBUILT_DIRS_DEBUG}
@@ -26,7 +26,6 @@ if (NOT FMODEX_LIBRARY)
                  ${FMODEX_SDK_DIR}
                  )
 
-				 
   endif(FMODEX_SDK_DIR)
   if(WINDOWS AND NOT FMODEX_LIBRARY)
     set(FMODEX_PROG_DIR "$ENV{PROGRAMFILES}/FMOD SoundSystem/FMOD Programmers API Windows")
@@ -45,7 +44,7 @@ if (NOT FMODEX_LIBRARY)
   endif(WINDOWS AND NOT FMODEX_LIBRARY)
 endif (NOT FMODEX_LIBRARY)
 
-find_path(FMODEX_INCLUDE_DIR fmod.h
+find_path(FMODEX_INCLUDE_DIR fmod.hpp
           ${LIBS_PREBUILT_DIR}/include/fmodex
           ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/fmodex
           ${FMODEX_SDK_DIR}/api/inc

indra/cmake/FindHunSpell.cmake

@@ -5,7 +5,7 @@ FIND_PATH(HUNSPELL_INCLUDE_DIR hunspell.hxx
   /usr/include
   )
 
-SET(HUNSPELL_NAMES ${HUNSPELL_NAMES} hunspell hunspell-1.2)
+SET(HUNSPELL_NAMES ${HUNSPELL_NAMES} hunspell hunspell-1.2 hunspell-1.3)
 FIND_LIBRARY(HUNSPELL_LIBRARY
   NAMES ${HUNSPELL_NAMES}
   PATHS /usr/lib /usr/local/lib

indra/cmake/LLVFS.cmake

@@ -8,5 +8,5 @@ set(LLVFS_INCLUDE_DIRS
 
 set(LLVFS_LIBRARIES
     llvfs
-    ${BOOST_REGEX_LIBRARY}
+    ${Boost_REGEX_LIBRARY}
     )

indra/llcommon/CMakeLists.txt

@@ -265,7 +265,7 @@ target_link_libraries(
     ${EXPAT_LIBRARIES}
     ${ZLIB_LIBRARIES}
     ${WINDOWS_LIBRARIES}
-    ${BOOST_REGEX_LIBRARY}
+    ${Boost_REGEX_LIBRARY}
     ${CWDEBUG_LIBRARIES}
     ${CORESERVICES_LIBRARY}
     )

indra/llvfs/CMakeLists.txt

@@ -63,8 +63,8 @@ add_library (llvfs ${llvfs_SOURCE_FILES})
 add_dependencies(llvfs prepare)
 
 target_link_libraries(llvfs
-    ${BOOST_FILESYSTEM_LIBRARY}
+    ${Boost_FILESYSTEM_LIBRARY}
-    ${BOOST_SYSTEM_LIBRARY}
+    ${Boost_SYSTEM_LIBRARY}
     )
 
 if (DARWIN)

indra/lscript/lscript_compile/indra.l

@@ -56,12 +56,6 @@ void parse_string();
 
 #define ECHO do { } while (0)
 
-#if defined(__cplusplus)
-extern "C" { int yylex( void ); }
-extern "C" { int yyparse( void ); }
-extern "C" { int yyerror(const char *fmt, ...); }
-#endif
-
 %}
 
 %%

indra/lscript/lscript_compile/indra.y

@@ -2,10 +2,6 @@
 	#include "linden_common.h"
 	#include "lscript_tree.h"
 
-    #ifdef __cplusplus
-    extern "C" {
-    #endif
-
 	int yylex(void);
 	int yyparse( void );
 	int yyerror(const char *fmt, ...);
@@ -19,10 +15,6 @@
 	#pragma warning (disable : 4702) // warning C4702: unreachable code
 	#pragma warning( disable : 4065 )	// warning: switch statement contains 'default' but no 'case' labels
 	#endif
-
-    #ifdef __cplusplus
-    }
-    #endif
 %}
 
 %union

indra/newview/CMakeLists.txt

@@ -1560,10 +1560,10 @@ target_link_libraries(${VIEWER_BINARY_NAME}
     ${LLCOMMON_LIBRARIES}
     ${NDOF_LIBRARY}
     ${viewer_LIBRARIES}
-    ${BOOST_FILESYSTEM_LIBRARY}
+    ${Boost_FILESYSTEM_LIBRARY}
-    ${BOOST_PROGRAM_OPTIONS_LIBRARY}
+    ${Boost_PROGRAM_OPTIONS_LIBRARY}
-    ${BOOST_REGEX_LIBRARY}
+    ${Boost_REGEX_LIBRARY}
-    ${BOOST_SYSTEM_LIBRARY}
+    ${Boost_SYSTEM_LIBRARY}
     ${DBUSGLIB_LIBRARIES}
     ${OPENGL_LIBRARIES}
     ${FMODWRAPPER_LIBRARY} # must come after LLAudio