Windows now links to shared apr when LLCOMMON_LINK_SHARED is on.

2 files changed, 184 insertions, 169 deletions

diff --git a/indra/cmake/APR.cmake b/indra/cmake/APR.cmake
index 0755aeee03..efd47f756a 100644
--- a/indra/cmake/APR.cmake
+++ b/indra/cmake/APR.cmake
@@ -13,18 +13,33 @@ if (STANDALONE)
 else (STANDALONE)
   use_prebuilt_binary(apr_suite)
   if (WINDOWS)
-    set(APR_LIBRARIES 
-      debug ${ARCH_PREBUILT_DIRS_DEBUG}/apr-1.lib
-      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/apr-1.lib
-      )
-    set(APRICONV_LIBRARIES 
-      debug ${ARCH_PREBUILT_DIRS_DEBUG}/apriconv-1.lib
-      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/apriconv-1.lib
-      )
-    set(APRUTIL_LIBRARIES 
-      debug ${ARCH_PREBUILT_DIRS_DEBUG}/aprutil-1.lib ${APRICONV_LIBRARIES}
-      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/aprutil-1.lib ${APRICONV_LIBRARIES}
-      )
+    if (LLCOMMON_LINK_SHARED)
+      set(APR_LIBRARIES 
+        debug ${ARCH_PREBUILT_DIRS_DEBUG}/libapr-1.lib
+        optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libapr-1.lib
+        )
+      set(APRICONV_LIBRARIES 
+        debug ${ARCH_PREBUILT_DIRS_DEBUG}/libapriconv-1.lib
+        optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libapriconv-1.lib
+        )
+      set(APRUTIL_LIBRARIES 
+        debug ${ARCH_PREBUILT_DIRS_DEBUG}/libaprutil-1.lib ${APRICONV_LIBRARIES}
+        optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libaprutil-1.lib ${APRICONV_LIBRARIES}
+        )
+    else (LLCOMMON_LINK_SHARED)
+      set(APR_LIBRARIES 
+        debug ${ARCH_PREBUILT_DIRS_DEBUG}/apr-1.lib
+        optimized ${ARCH_PREBUILT_DIRS_RELEASE}/apr-1.lib
+        )
+      set(APRICONV_LIBRARIES 
+        debug ${ARCH_PREBUILT_DIRS_DEBUG}/apriconv-1.lib
+        optimized ${ARCH_PREBUILT_DIRS_RELEASE}/apriconv-1.lib
+        )
+      set(APRUTIL_LIBRARIES 
+        debug ${ARCH_PREBUILT_DIRS_DEBUG}/aprutil-1.lib ${APRICONV_LIBRARIES}
+        optimized ${ARCH_PREBUILT_DIRS_RELEASE}/aprutil-1.lib ${APRICONV_LIBRARIES}
+        )
+    endif (LLCOMMON_LINK_SHARED)
   elseif (DARWIN)
     set(APR_LIBRARIES 
       debug ${ARCH_PREBUILT_DIRS_DEBUG}/libapr-1.a
diff --git a/indra/llcommon/llpreprocessor.h b/indra/llcommon/llpreprocessor.h
index 5ff7814997..ed6ca9a25f 100644
--- a/indra/llcommon/llpreprocessor.h
+++ b/indra/llcommon/llpreprocessor.h
@@ -1,157 +1,157 @@
-/** 
- * @file llpreprocessor.h
- * @brief This file should be included in all Linden Lab files and
- * should only contain special preprocessor directives
- *
- * $LicenseInfo:firstyear=2001&license=viewergpl$
- * 
- * Copyright (c) 2001-2009, Linden Research, Inc.
- * 
- * Second Life Viewer Source Code
- * The source code in this file ("Source Code") is provided by Linden Lab
- * to you under the terms of the GNU General Public License, version 2.0
- * ("GPL"), unless you have obtained a separate licensing agreement
- * ("Other License"), formally executed by you and Linden Lab.  Terms of
- * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
- * 
- * There are special exceptions to the terms and conditions of the GPL as
- * it is applied to this Source Code. View the full text of the exception
- * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at
- * http://secondlifegrid.net/programs/open_source/licensing/flossexception
- * 
- * By copying, modifying or distributing this software, you acknowledge
- * that you have read and understood your obligations described above,
- * and agree to abide by those obligations.
- * 
- * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
- * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.
- * $/LicenseInfo$
- */
-
-#ifndef LLPREPROCESSOR_H
-#define LLPREPROCESSOR_H
-
-// Figure out endianness of platform
-#ifdef LL_LINUX
-#define __ENABLE_WSTRING
-#include <endian.h>
-#endif	//	LL_LINUX
-
-#if LL_SOLARIS
-#   ifdef  __sparc     // Since we're talking Solaris 10 and up, only 64 bit is supported.
-#      define LL_BIG_ENDIAN 1
-#      define LL_SOLARIS_ALIGNED_CPU 1     //  used to designate issues where SPARC alignment is addressed
-#      define LL_SOLARIS_NON_MESA_GL 1      //  The SPARC GL does not provide a MESA-based GL API
-#   endif
-#   include <sys/isa_defs.h> // ensure we know which end is up
-#endif // LL_SOLARIS
-
-#if (defined(LL_WINDOWS) || (defined(LL_LINUX) && (__BYTE_ORDER == __LITTLE_ENDIAN)) || (defined(LL_DARWIN) && defined(__LITTLE_ENDIAN__)) || (defined(LL_SOLARIS) && defined(__i386)))
-#define LL_LITTLE_ENDIAN 1
-#else
-#define LL_BIG_ENDIAN 1
-#endif
-
-// Per-compiler switches
-#ifdef __GNUC__
-#define LL_FORCE_INLINE inline __attribute__((always_inline))
-#else
-#define LL_FORCE_INLINE __forceinline
-#endif
-
-// Figure out differences between compilers
-#if defined(__GNUC__)
-	#define GCC_VERSION (__GNUC__ * 10000 \
-						+ __GNUC_MINOR__ * 100 \
-						+ __GNUC_PATCHLEVEL__)
-	#ifndef LL_GNUC
-		#define LL_GNUC 1
-	#endif
-#elif defined(__MSVC_VER__) || defined(_MSC_VER)
-	#ifndef LL_MSVC
-		#define LL_MSVC 1
-	#endif
-	#if _MSC_VER < 1400
-		#define LL_MSVC7 //Visual C++ 2003 or earlier
-	#endif
-#endif
-
-// Deal with minor differences on Unixy OSes.
-#if LL_DARWIN || LL_LINUX
-	// Different name, same functionality.
-	#define stricmp strcasecmp
-	#define strnicmp strncasecmp
-
-	// Not sure why this is different, but...
-	#ifndef MAX_PATH
-		#define MAX_PATH PATH_MAX
-	#endif	//	not MAX_PATH
-
-#endif
-
-
-// Static linking with apr on windows needs to be declared.
-#ifdef LL_WINDOWS
-#ifndef APR_DECLARE_STATIC
-#define APR_DECLARE_STATIC // For APR on Windows
-#endif
-#ifndef APU_DECLARE_STATIC
-#define APU_DECLARE_STATIC // For APR util on Windows
-#endif
-#endif
-
-#if defined(LL_WINDOWS)
-#define BOOST_REGEX_NO_LIB 1
-#define CURL_STATICLIB 1
-#define XML_STATIC
-#endif	//	LL_WINDOWS
-
-
-// Deal with VC6 problems
-#if LL_MSVC
-#pragma warning( 3	     : 4701 )	// "local variable used without being initialized"  Treat this as level 3, not level 4.
-#pragma warning( 3	     : 4702 )	// "unreachable code"  Treat this as level 3, not level 4.
-#pragma warning( 3	     : 4189 )	// "local variable initialized but not referenced"  Treat this as level 3, not level 4.
-//#pragma warning( 3	: 4018 )	// "signed/unsigned mismatch"  Treat this as level 3, not level 4.
-#pragma warning( 3       : 4265 )	// "class has virtual functions, but destructor is not virtual"
-#pragma warning( disable : 4786 )	// silly MS warning deep inside their <map> include file
-#pragma warning( disable : 4284 )	// silly MS warning deep inside their <map> include file
-#pragma warning( disable : 4503 )	// 'decorated name length exceeded, name was truncated'. Does not seem to affect compilation.
-#pragma warning( disable : 4800 )	// 'BOOL' : forcing value to bool 'true' or 'false' (performance warning)
-#pragma warning( disable : 4996 )	// warning: deprecated
-
-// level 4 warnings that we need to disable:
-#pragma warning (disable : 4100) // unreferenced formal parameter
-#pragma warning (disable : 4127) // conditional expression is constant (e.g. while(1) )
-#pragma warning (disable : 4244) // possible loss of data on conversions
-#pragma warning (disable : 4396) // the inline specifier cannot be used when a friend declaration refers to a specialization of a function template
-#pragma warning (disable : 4512) // assignment operator could not be generated
-#pragma warning (disable : 4706) // assignment within conditional (even if((x = y)) )
-
-#pragma warning (disable : 4251) // member needs to have dll-interface to be used by clients of class
-#pragma warning (disable : 4275) // non dll-interface class used as base for dll-interface class
-#endif	//	LL_MSVC
-
-#if LL_WINDOWS
-#define LL_DLLEXPORT __declspec(dllexport)
-#define LL_DLLIMPORT __declspec(dllimport)
-#else
-#define LL_DLLEXPORT
-#define LL_DLLIMPORT
-#endif // LL_WINDOWS
-
-
-#if LL_COMMON_LINK_SHARED
-# if LL_COMMON_BUILD
-#   define LL_COMMON_API LL_DLLEXPORT
-# else //LL_COMMON_BUILD
-#   define LL_COMMON_API LL_DLLIMPORT
-# endif //LL_COMMON_BUILD
-#else // LL_COMMON_LINK_SHARED
-# define LL_COMMON_API
-#endif // LL_COMMON_LINK_SHARED
-
-#endif	//	not LL_LINDEN_PREPROCESSOR_H
+/** 

+ * @file llpreprocessor.h

+ * @brief This file should be included in all Linden Lab files and

+ * should only contain special preprocessor directives

+ *

+ * $LicenseInfo:firstyear=2001&license=viewergpl$

+ * 

+ * Copyright (c) 2001-2009, Linden Research, Inc.

+ * 

+ * Second Life Viewer Source Code

+ * The source code in this file ("Source Code") is provided by Linden Lab

+ * to you under the terms of the GNU General Public License, version 2.0

+ * ("GPL"), unless you have obtained a separate licensing agreement

+ * ("Other License"), formally executed by you and Linden Lab.  Terms of

+ * the GPL can be found in doc/GPL-license.txt in this distribution, or

+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2

+ * 

+ * There are special exceptions to the terms and conditions of the GPL as

+ * it is applied to this Source Code. View the full text of the exception

+ * in the file doc/FLOSS-exception.txt in this software distribution, or

+ * online at

+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception

+ * 

+ * By copying, modifying or distributing this software, you acknowledge

+ * that you have read and understood your obligations described above,

+ * and agree to abide by those obligations.

+ * 

+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO

+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,

+ * COMPLETENESS OR PERFORMANCE.

+ * $/LicenseInfo$

+ */

+

+#ifndef LLPREPROCESSOR_H

+#define LLPREPROCESSOR_H

+

+// Figure out endianness of platform

+#ifdef LL_LINUX

+#define __ENABLE_WSTRING

+#include <endian.h>

+#endif	//	LL_LINUX

+

+#if LL_SOLARIS

+#   ifdef  __sparc     // Since we're talking Solaris 10 and up, only 64 bit is supported.

+#      define LL_BIG_ENDIAN 1

+#      define LL_SOLARIS_ALIGNED_CPU 1     //  used to designate issues where SPARC alignment is addressed

+#      define LL_SOLARIS_NON_MESA_GL 1      //  The SPARC GL does not provide a MESA-based GL API

+#   endif

+#   include <sys/isa_defs.h> // ensure we know which end is up

+#endif // LL_SOLARIS

+

+#if (defined(LL_WINDOWS) || (defined(LL_LINUX) && (__BYTE_ORDER == __LITTLE_ENDIAN)) || (defined(LL_DARWIN) && defined(__LITTLE_ENDIAN__)) || (defined(LL_SOLARIS) && defined(__i386)))

+#define LL_LITTLE_ENDIAN 1

+#else

+#define LL_BIG_ENDIAN 1

+#endif

+

+// Per-compiler switches

+#ifdef __GNUC__

+#define LL_FORCE_INLINE inline __attribute__((always_inline))

+#else

+#define LL_FORCE_INLINE __forceinline

+#endif

+

+// Figure out differences between compilers

+#if defined(__GNUC__)

+	#define GCC_VERSION (__GNUC__ * 10000 \

+						+ __GNUC_MINOR__ * 100 \

+						+ __GNUC_PATCHLEVEL__)

+	#ifndef LL_GNUC

+		#define LL_GNUC 1

+	#endif

+#elif defined(__MSVC_VER__) || defined(_MSC_VER)

+	#ifndef LL_MSVC

+		#define LL_MSVC 1

+	#endif

+	#if _MSC_VER < 1400

+		#define LL_MSVC7 //Visual C++ 2003 or earlier

+	#endif

+#endif

+

+// Deal with minor differences on Unixy OSes.

+#if LL_DARWIN || LL_LINUX

+	// Different name, same functionality.

+	#define stricmp strcasecmp

+	#define strnicmp strncasecmp

+

+	// Not sure why this is different, but...

+	#ifndef MAX_PATH

+		#define MAX_PATH PATH_MAX

+	#endif	//	not MAX_PATH

+

+#endif

+

+

+// Static linking with apr on windows needs to be declared.

+#if LL_WINDOWS && !LL_COMMON_LINK_SHARED

+#ifndef APR_DECLARE_STATIC

+#define APR_DECLARE_STATIC // For APR on Windows

+#endif

+#ifndef APU_DECLARE_STATIC

+#define APU_DECLARE_STATIC // For APR util on Windows

+#endif

+#endif

+

+#if defined(LL_WINDOWS)

+#define BOOST_REGEX_NO_LIB 1

+#define CURL_STATICLIB 1

+#define XML_STATIC

+#endif	//	LL_WINDOWS

+

+

+// Deal with VC6 problems

+#if LL_MSVC

+#pragma warning( 3	     : 4701 )	// "local variable used without being initialized"  Treat this as level 3, not level 4.

+#pragma warning( 3	     : 4702 )	// "unreachable code"  Treat this as level 3, not level 4.

+#pragma warning( 3	     : 4189 )	// "local variable initialized but not referenced"  Treat this as level 3, not level 4.

+//#pragma warning( 3	: 4018 )	// "signed/unsigned mismatch"  Treat this as level 3, not level 4.

+#pragma warning( 3       : 4265 )	// "class has virtual functions, but destructor is not virtual"

+#pragma warning( disable : 4786 )	// silly MS warning deep inside their <map> include file

+#pragma warning( disable : 4284 )	// silly MS warning deep inside their <map> include file

+#pragma warning( disable : 4503 )	// 'decorated name length exceeded, name was truncated'. Does not seem to affect compilation.

+#pragma warning( disable : 4800 )	// 'BOOL' : forcing value to bool 'true' or 'false' (performance warning)

+#pragma warning( disable : 4996 )	// warning: deprecated

+

+// level 4 warnings that we need to disable:

+#pragma warning (disable : 4100) // unreferenced formal parameter

+#pragma warning (disable : 4127) // conditional expression is constant (e.g. while(1) )

+#pragma warning (disable : 4244) // possible loss of data on conversions

+#pragma warning (disable : 4396) // the inline specifier cannot be used when a friend declaration refers to a specialization of a function template

+#pragma warning (disable : 4512) // assignment operator could not be generated

+#pragma warning (disable : 4706) // assignment within conditional (even if((x = y)) )

+

+#pragma warning (disable : 4251) // member needs to have dll-interface to be used by clients of class

+#pragma warning (disable : 4275) // non dll-interface class used as base for dll-interface class

+#endif	//	LL_MSVC

+

+#if LL_WINDOWS

+#define LL_DLLEXPORT __declspec(dllexport)

+#define LL_DLLIMPORT __declspec(dllimport)

+#else

+#define LL_DLLEXPORT

+#define LL_DLLIMPORT

+#endif // LL_WINDOWS

+

+

+#if LL_COMMON_LINK_SHARED

+# if LL_COMMON_BUILD

+#   define LL_COMMON_API LL_DLLEXPORT

+# else //LL_COMMON_BUILD

+#   define LL_COMMON_API LL_DLLIMPORT

+# endif //LL_COMMON_BUILD

+#else // LL_COMMON_LINK_SHARED

+# define LL_COMMON_API

+#endif // LL_COMMON_LINK_SHARED

+

+#endif	//	not LL_LINDEN_PREPROCESSOR_H