Merged with default tip (Revision 8301f50a65b0)

--HG-- branch : Viewer-Build
2010-11-13 04:48:08 +01:00 · 2010-11-13 04:48:08 +01:00 · 74f3a9787c
parent 5cbbb565f1 7511074441
commit 74f3a9787c
8 changed files with 100 additions and 56 deletions
--- a/.hgpatchinfo/Viewer-Build.dep
+++ b/.hgpatchinfo/Viewer-Build.dep
@ -0,0 +1 @@
+8301f50a65b023f1a0d0e17899ca3fef797f6eaa
--- a/.hgpatchinfo/Viewer-Build.desc
+++ b/.hgpatchinfo/Viewer-Build.desc
@ -0,0 +1,7 @@
+[Viewer/Build]
+- changed  : compiler options for "Release with Debug" builds
+- changed  : compiler and linker options for "Release" builds
+- added    : imported SNOW-788 - Fix boost lib detection with Visual Studio to allow multiple VS versions
+- changed  : removed LL's changeset tags and added new (consistent) SL-2.X.Y tags for releases
+- imported : [VWR-23406] Link error: undefined reference to `LLPanelStandStopFlying::getInstance
+    -> needed for Linux (thankies Satomi)
--- a/.hgtags
+++ b/.hgtags
@ -3,22 +3,27 @@ bb38ff1a763738609e1b3cada6d15fa61e5e84b9 2.1.1-release
 08398e650c222336bb2b6de0cd3bba944aef11b4 2-1rn1
 0962101bfa7df0643a6e625786025fe7f8a6dc97 2-1-beta-2
 12769e547e30067d494a6c01479a18107366ce2f beta-5
+1415e6538d54fd5d568ee88343424d57c6803c2c SL-2.2.0
 17fc2908e9a1ef34a9f53a41a393caf5c3cac390 beta-3-5
 19547b909b404552593be5ec7c18241e062a6d65 2-1-1-beta-1
 1e2b517adc2ecb342cd3c865f2a6ccf82a3cf8d7 2-1-beta-3
 3469d90a115b900f8f250e137bbd9b684130f5d2 beta-4
 3e4b947f79d88c385e8218cbc0731cef0e42cfc4 2-1-beta-1
 46002088d9a4489e323b8d56131c680eaa21258c viewer-2-1-0-start
+4f777ffb99fefdc6497c61385c22688ff149c659 SL-2.0.0
 4f777ffb99fefdc6497c61385c22688ff149c659 viewer-2-0-0
 52d96ad3d39be29147c5b2181b3bb46af6164f0e alpha-3
 668851b2ef0f8cf8df07a0fba429e4a6c1e70abb viewer-2-0-1
+668851b2ef0f8cf8df07a0fba429e4a6c1e70abb SL-2.0.1
 6e3b2e13906ba8ff22d3c8490b02d518adb2c907 2-1-1-beta-2
 7f16e79826d377f5f9f5b33dc721ab56d0d7dc8f alpha-4
 7f16e79826d377f5f9f5b33dc721ab56d0d7dc8f fork to viewer-20qa
 80bc6cff515118a36108967af49d3f8105c95bc9 viewer-2-0-2-start
 b03065d018b8a2e28b7de85b293a4c992cb4c12d 2-1-release
+b03065d018b8a2e28b7de85b293a4c992cb4c12d SL-2.1.0
 b8419565906e4feb434426d8d9b17dd1458e24b2 alpha-6
 bb38ff1a763738609e1b3cada6d15fa61e5e84b9 2-1-1-release
+bb38ff1a763738609e1b3cada6d15fa61e5e84b9 SL-2.1.1
 c6969fe44e58c542bfc6f1bd6c0be2fa860929ac 2-1-beta-4
 d2382d374139850efa5bb6adfb229e3e656cfc40 howard-demo
 d40ac9dd949cba6dab1cc386da6a2027690c2519 alpha-5
@ -35,3 +40,40 @@ b0cd7e150009809a0b5b0a9d5785cd4bb230413a 2.2.0-beta3
 a3c12342b1af0951b8aa3b828aacef17fcea8178 2.3.0-beta1
 db0fe9bb65187f365e58a717dd23d0f4754a9c1d 2.3.0-beta2
 6ad3d6fa35a4e320e9ce442fce2bf9c7fc852556 2.3.0-beta3
+0000000000000000000000000000000000000000 2.1.1-release
+0000000000000000000000000000000000000000 v2start
+0000000000000000000000000000000000000000 2-1rn1
+0000000000000000000000000000000000000000 2-1-beta-2
+0000000000000000000000000000000000000000 beta-5
+0000000000000000000000000000000000000000 beta-3-5
+0000000000000000000000000000000000000000 2-1-1-beta-1
+0000000000000000000000000000000000000000 2-1-beta-3
+0000000000000000000000000000000000000000 beta-4
+0000000000000000000000000000000000000000 2-1-beta-1
+0000000000000000000000000000000000000000 viewer-2-1-0-start
+0000000000000000000000000000000000000000 viewer-2-0-0
+0000000000000000000000000000000000000000 alpha-3
+0000000000000000000000000000000000000000 viewer-2-0-1
+0000000000000000000000000000000000000000 2-1-1-beta-2
+0000000000000000000000000000000000000000 alpha-4
+0000000000000000000000000000000000000000 fork to viewer-20qa
+0000000000000000000000000000000000000000 viewer-2-0-2-start
+0000000000000000000000000000000000000000 2-1-release
+0000000000000000000000000000000000000000 alpha-6
+0000000000000000000000000000000000000000 2-1-1-release
+0000000000000000000000000000000000000000 2-1-beta-4
+0000000000000000000000000000000000000000 howard-demo
+0000000000000000000000000000000000000000 alpha-5
+0000000000000000000000000000000000000000 fork to viewer-2-0
+0000000000000000000000000000000000000000 last_sprint
+0000000000000000000000000000000000000000 beta_2.1.3
+0000000000000000000000000000000000000000 2.2.0-beta1
+0000000000000000000000000000000000000000 2.2.0-beta2
+0000000000000000000000000000000000000000 2.2.0-beta3
+0000000000000000000000000000000000000000 2.2.0-beta4
+0000000000000000000000000000000000000000 2.3.0-beta1
+0000000000000000000000000000000000000000 2.2.0-release
+0000000000000000000000000000000000000000 2.3.0-start
+0000000000000000000000000000000000000000 2.3.0-beta1
+0000000000000000000000000000000000000000 2.3.0-beta2
+0000000000000000000000000000000000000000 2.3.0-beta3
--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@ -38,10 +38,10 @@ if (WINDOWS)
  set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /Od /Zi /MDd /MP"
      CACHE STRING "C++ compiler debug options" FORCE)
  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO 
-      "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Od /Zi /MD /MP"
+      "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Od /Zi /MD /Gm"
      CACHE STRING "C++ compiler release-with-debug options" FORCE)
  set(CMAKE_CXX_FLAGS_RELEASE
-      "${CMAKE_CXX_FLAGS_RELEASE} ${LL_CXX_FLAGS} /O2 /Zi /MD /MP"
+      "${CMAKE_CXX_FLAGS_RELEASE} ${LL_CXX_FLAGS} /O2 /Zi /MD /Oi /Ot /GF /Gy /arch:SSE2"
      CACHE STRING "C++ compiler release options" FORCE)

  set(CMAKE_CXX_STANDARD_LIBRARIES "")
@ -78,6 +78,20 @@ if (WINDOWS)
  # configure win32 API for windows XP+ compatibility
  set(WINVER "0x0501" CACHE STRING "Win32 API Target version (see http://msdn.microsoft.com/en-us/library/aa383745%28v=VS.85%29.aspx)")
  add_definitions("/DWINVER=${WINVER}" "/D_WIN32_WINNT=${WINVER}")
+    
+  # Various libs are compiler specific, generate some variables here we can just use
+  # when we require them instead of reimplementing the test each time.
+  if (MSVC71)
+	set(MSVC_DIR 7.1)
+	set(MSVC_SUFFIX 71)
+  elseif (MSVC80)
+	set(MSVC_DIR 8.0)
+	set(MSVC_SUFFIX 80)
+  elseif (MSVC90)
+	set(MSVC_DIR 9.0)
+	set(MSVC_SUFFIX 90)
+  endif (MSVC71)
+  
 endif (WINDOWS)


--- a/indra/cmake/Boost.cmake
+++ b/indra/cmake/Boost.cmake
@ -16,27 +16,30 @@ else (STANDALONE)

  if (WINDOWS)
    set(BOOST_VERSION 1_39)
-    if (MSVC71)
-      set(BOOST_PROGRAM_OPTIONS_LIBRARY 
-          optimized libboost_program_options-vc71-mt-s-${BOOST_VERSION}
-          debug libboost_program_options-vc71-mt-sgd-${BOOST_VERSION})
-      set(BOOST_REGEX_LIBRARY
-          optimized libboost_regex-vc71-mt-s-${BOOST_VERSION}
-          debug libboost_regex-vc71-mt-sgd-${BOOST_VERSION})
-      set(BOOST_SIGNALS_LIBRARY 
-          optimized libboost_signals-vc71-mt-s-${BOOST_VERSION}
-          debug libboost_signals-vc71-mt-sgd-${BOOST_VERSION})
-    else (MSVC71)
-      set(BOOST_PROGRAM_OPTIONS_LIBRARY 
-          optimized libboost_program_options-vc80-mt-${BOOST_VERSION}
-          debug libboost_program_options-vc80-mt-gd-${BOOST_VERSION})
-      set(BOOST_REGEX_LIBRARY
-          optimized libboost_regex-vc80-mt-${BOOST_VERSION}
-          debug libboost_regex-vc80-mt-gd-${BOOST_VERSION})
-      set(BOOST_SIGNALS_LIBRARY 
-          optimized libboost_signals-vc80-mt-${BOOST_VERSION}
-          debug libboost_signals-vc80-mt-gd-${BOOST_VERSION})
-    endif (MSVC71)
+   
+	# SNOW-788
+	# 00-Common.cmake alreay sets MSVC_SUFFIX to be correct for the VS we are using eg VC71, VC80, VC90 etc
+	# The precompiled boost libs for VC71 use a different suffix to VS80 and VS90
+	# This code should ensure the cmake rules are valid for any VS being used in future as long as the approprate
+	# boost libs are avaiable - RC.
+	
+	if (MSVC71)
+	    set(BOOST_OPTIM_SUFFIX mt-s)
+	    set(BOOST_DEBUG_SUFFIX mt-sgd)
+	else (MSVC71)
+	    set(BOOST_OPTIM_SUFFIX mt)
+	    set(BOOST_DEBUG_SUFFIX mt-gd)
+	endif (MSVC71)
+		
+    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
+          optimized libboost_regex-vc${MSVC_SUFFIX}-${BOOST_OPTIM_SUFFIX}-${BOOST_VERSION}
+          debug libboost_regex-vc${MSVC_SUFFIX}-${BOOST_DEBUG_SUFFIX}-${BOOST_VERSION})
+    set(BOOST_SIGNALS_LIBRARY 
+          optimized libboost_signals-vc${MSVC_SUFFIX}-${BOOST_OPTIM_SUFFIX}-${BOOST_VERSION}
+          debug libboost_signals-vc${MSVC_SUFFIX}-${BOOST_DEBUG_SUFFIX}-${BOOST_VERSION})
  elseif (DARWIN)
    set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-xgcc40-mt)
    set(BOOST_REGEX_LIBRARY boost_regex-xgcc40-mt)
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@ -1418,7 +1418,7 @@ if (WINDOWS)
    if(MSVC71)
        set(release_flags "/MAP:Release/${VIEWER_BINARY_NAME}.map /MAPINFO:LINES")
    else(MSVC71)
-        set(release_flags "/MAP:Release/${VIEWER_BINARY_NAME}.map")
+        set(release_flags "/MAP:Release/${VIEWER_BINARY_NAME}.map /OPT:REF")
    endif(MSVC71)
    
    set_target_properties(${VIEWER_BINARY_NAME}
--- a/indra/newview/llmoveview.cpp
+++ b/indra/newview/llmoveview.cpp
@ -545,17 +545,12 @@ LLPanelStandStopFlying::LLPanelStandStopFlying() :
 	mStopFlyingButton(NULL),
 	mAttached(false)
 {
-	// make sure we have the only instance of this class
-	static bool b = true;
-	llassert_always(b);
-	b=false;
-}
+	buildFromFile("panel_stand_stop_flying.xml");
+	setVisible(FALSE);

-// static
-inline LLPanelStandStopFlying* LLPanelStandStopFlying::getInstance()
-{
-	static LLPanelStandStopFlying* panel = getStandStopFlyingPanel();
-	return panel;
+	llinfos << "Build LLPanelStandStopFlying panel" << llendl;
+
+	updatePosition();
 }

 //static
@ -693,21 +688,6 @@ void LLPanelStandStopFlying::reparent(LLFloaterMove* move_view)
 // Private Section
 //////////////////////////////////////////////////////////////////////////

-//static
-LLPanelStandStopFlying* LLPanelStandStopFlying::getStandStopFlyingPanel()
-{
-	LLPanelStandStopFlying* panel = new LLPanelStandStopFlying();
-	panel->buildFromFile("panel_stand_stop_flying.xml");
-
-	panel->setVisible(FALSE);
-	//LLUI::getRootView()->addChild(panel);
-
-	llinfos << "Build LLPanelStandStopFlying panel" << llendl;
-
-	panel->updatePosition();
-	return panel;
-}
-
 void LLPanelStandStopFlying::onStandButtonClick()
 {
 	LLFirstUse::sit(false);
--- a/indra/newview/llmoveview.h
+++ b/indra/newview/llmoveview.h
@ -28,6 +28,7 @@
 #define LL_LLMOVEVIEW_H

 // Library includes
+#include "llsingleton.h"
 #include "lltransientdockablefloater.h"

 class LLButton;
@ -117,7 +118,7 @@ private:
 /**
 * This class contains Stand Up and Stop Flying buttons displayed above Move button in bottom tray
 */
-class LLPanelStandStopFlying : public LLPanel
+class LLPanelStandStopFlying : public LLPanel, public LLSingleton<LLPanelStandStopFlying>
 {
 	LOG_CLASS(LLPanelStandStopFlying);
 public:
@ -127,6 +128,8 @@ public:
 		SSFM_STOP_FLYING
 	} EStandStopFlyingMode;

+	LLPanelStandStopFlying();
+
 	/**
 	 * Attach or detach the panel to/from the movement controls floater.
 	 * 
@ -140,7 +143,6 @@ public:
 	 */
 	void reparent(LLFloaterMove* move_view);

-	static LLPanelStandStopFlying* getInstance();
 	static void setStandStopFlyingMode(EStandStopFlyingMode mode);
 	static void clearStandStopFlyingMode(EStandStopFlyingMode mode);
 	/*virtual*/ BOOL postBuild();
@ -152,12 +154,7 @@ public:
 	/*virtual*/ BOOL handleToolTip(S32 x, S32 y, MASK mask);


-protected:
-	LLPanelStandStopFlying();
-
-
 private:
-	static LLPanelStandStopFlying* getStandStopFlyingPanel();
 	void onStandButtonClick();
 	void onStopFlyingButtonClick();
 	void updatePosition();