From 227a72c421c3357196650b634c6ca15200db3a0b Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 5 Oct 2010 01:34:35 -0500 Subject: [PATCH] VC2010 cmake alterations. Lib stuff not included. --- indra/cmake/00-Common.cmake | 1 + indra/cmake/DirectX.cmake | 2 ++ indra/develop.py | 13 +++++++++---- indra/llaudio/llaudiodecodemgr.cpp | 1 + indra/llmessage/llbuffer.cpp | 1 + indra/llmessage/lldispatcher.cpp | 1 + indra/llmessage/llpumpio.cpp | 1 + indra/tools/vstool/VSTool.exe | Bin 24576 -> 24576 bytes indra/tools/vstool/main.cs | 8 ++++++++ 9 files changed, 24 insertions(+), 4 deletions(-) diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index 2ce116448..fa8af643f 100644 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -53,6 +53,7 @@ if (WINDOWS) /Zc:forScope /nologo /Oy- + /Zc:wchar_t- #wchar_t is now on by default in VS2010. Force it to be disabled. ) if(MSVC80 OR MSVC90) diff --git a/indra/cmake/DirectX.cmake b/indra/cmake/DirectX.cmake index 29724ee2f..5f538c80a 100644 --- a/indra/cmake/DirectX.cmake +++ b/indra/cmake/DirectX.cmake @@ -3,6 +3,7 @@ if (VIEWER AND WINDOWS) find_path(DIRECTX_INCLUDE_DIR dxdiag.h "$ENV{DXSDK_DIR}/Include" + "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (June 2010)/Include" "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (March 2009)/Include" "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (August 2008)/Include" "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (June 2008)/Include" @@ -24,6 +25,7 @@ if (VIEWER AND WINDOWS) find_path(DIRECTX_LIBRARY_DIR dxguid.lib "$ENV{DXSDK_DIR}/Lib/x86" + "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (June 2010)/Lib/x86" "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (March 2009)/Lib/x86" "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (August 2008)/Lib/x86" "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (June 2008)/Lib/x86" diff --git a/indra/develop.py b/indra/develop.py index e9fc86ea6..c391a3f53 100755 --- a/indra/develop.py +++ b/indra/develop.py @@ -483,11 +483,16 @@ class WindowsSetup(PlatformSetup): 'vc90' : { 'gen' : r'Visual Studio 9 2008', 'ver' : r'9.0' + }, + 'vc100' : { + 'gen' : r'Visual Studio 10', + 'ver' : r'10.0' } } gens['vs2003'] = gens['vc71'] gens['vs2005'] = gens['vc80'] gens['vs2008'] = gens['vc90'] + gens['vs2010'] = gens['vc100'] search_path = r'C:\windows' exe_suffixes = ('.exe', '.bat', '.com') @@ -499,14 +504,14 @@ class WindowsSetup(PlatformSetup): def _get_generator(self): if self._generator is None: - for version in 'vc80 vc90 vc71'.split(): + for version in 'vc80 vc90 vc100 vc71'.split(): if self.find_visual_studio(version): self._generator = version print 'Building with ', self.gens[version]['gen'] break else: print >> sys.stderr, 'Cannot find a Visual Studio installation, testing for express editions' - for version in 'vc80 vc90 vc71'.split(): + for version in 'vc80 vc90 vc100 vc71'.split(): if self.find_visual_studio_express(version): self._generator = version self.using_express = True @@ -729,8 +734,8 @@ Options: -m32 | -m64 build architecture (32-bit or 64-bit) -N | --no-distcc disable use of distcc -G | --generator=NAME generator name - Windows: VC71 or VS2003 (default), VC80 (VS2005) or - VC90 (VS2008) + Windows: VC71 or VS2003 (default), VC80 (VS2005) + VC90 (VS2008), or VC100 (VS2010) Mac OS X: Xcode (default), Unix Makefiles Linux: Unix Makefiles (default), KDevelop3 -p | --project=NAME set the root project name. (Doesn't effect makefiles) diff --git a/indra/llaudio/llaudiodecodemgr.cpp b/indra/llaudio/llaudiodecodemgr.cpp index 8725b2317..b80ce5306 100644 --- a/indra/llaudio/llaudiodecodemgr.cpp +++ b/indra/llaudio/llaudiodecodemgr.cpp @@ -45,6 +45,7 @@ #include "vorbis/codec.h" #include "vorbis/vorbisfile.h" #include "llvorbisencode.h" +#include //VS2010 extern LLAudioEngine *gAudiop; diff --git a/indra/llmessage/llbuffer.cpp b/indra/llmessage/llbuffer.cpp index 1ffcecd84..1924fcdf5 100644 --- a/indra/llmessage/llbuffer.cpp +++ b/indra/llmessage/llbuffer.cpp @@ -38,6 +38,7 @@ #include "llmath.h" #include "llmemtype.h" #include "llstl.h" +#include //VS2010 /** * LLSegment diff --git a/indra/llmessage/lldispatcher.cpp b/indra/llmessage/lldispatcher.cpp index 6632fbb67..c5ee86992 100644 --- a/indra/llmessage/lldispatcher.cpp +++ b/indra/llmessage/lldispatcher.cpp @@ -37,6 +37,7 @@ #include #include "llstl.h" #include "message.h" +#include //VS2010 ///---------------------------------------------------------------------------- /// Class lldispatcher diff --git a/indra/llmessage/llpumpio.cpp b/indra/llmessage/llpumpio.cpp index 3e3f0b37a..06135d556 100644 --- a/indra/llmessage/llpumpio.cpp +++ b/indra/llmessage/llpumpio.cpp @@ -43,6 +43,7 @@ #include "llmemtype.h" #include "llstl.h" #include "llstat.h" +#include //VS2010 // These should not be enabled in production, but they can be // intensely useful during development for finding certain kinds of diff --git a/indra/tools/vstool/VSTool.exe b/indra/tools/vstool/VSTool.exe index 6d1497d5e5293408fc3018432382ec00dae438b8..330cf75d59f37ec656f6991899a1f26409164af0 100755 GIT binary patch delta 1039 zcmZvbO=uHA6vy9elWe-1q@8R@vWcNdTH8&N)=fVwEhqs6+aNZ@Rs}8XK|xWlj2G)i zKZHm@ij6CRH&F^jdXa@*s#p&_coLE7K`4b@dXXwUREmOcXOnRv4?o3 zN<)W|z}9fB$vA6SWM7Q!kVdyKLLC~Obtz8jWZ#Uqn(*#b?y#t2h%&?5VM?X32^X2=_!4*>Y^TnZ#%0_{Y(;@c$ewgd3Z# z;63hK5vj-uNN9GU9JCU;n%Ii56OPf3l@c3a#mzDvBNpktbldZH;Yvar#TxGMIw+YsmtqTR%_LEXAXQzyLhyYBbKwu`>>Uuv=LF9%;_~=N0!tv9A?AtX*h>( z2j2@coEYvuj(XXgIj|@6UC?k1Pw)e|0~&lU(ULF&Nf@{OKiqpK%t9J&rfm9z)C#$@ zMfXEl(gbZ#mo``HC;SdM0~sUJuDj(ka11h_8zb$XNy?aSPgEh9tsSzXcK>m6=ZBwc zVCiBZw|u?7%k1mU3jW5@_h_X(YOQ0%ctFr|=5o)r)AVKcYlM8SN%K23MP2*@**L>> delta 962 zcmZuwO=uHA6n-7`&gpa_DZNU0Q5_NtiTT~Vpvr3Bi82aAdaL6G|PCpn0F*f-yMGvD{k+qZKyGFKzF z7kcVfFN}fr)FDg)#1BxwgyAMP%GIaCM5@+}@Io12!p@!pcu1=$O{Baw*Y!oC&=K(Hu0}#XvKo&np!5VL0A|xU<*=rK99(Sz!h$UvCr8B3QkN;GlV#WZ} z!91crO_V{T_!~6?5o@A&&fwjM)LfSLJ2A!gI8o;ZoXGegk&o@VLE3Fw6rL=DYTMKb z6e<{l=&nm;X=f8lRdx;^O?9;)+8qJ6>(he z30ciE{Bx_A)6;rL^-l6cW2O0-A6Z`M*`&h~a9M&Z$cxQAAr|73LW-Bjv^X3ucE7_4 zb==J2DER(ybU*$-N9*x)rZ3>>YYJ2NK}2Zwd?RTS${9W_k_m$?V%C+|h--en9T4M* zkxL`NM%EQ>5@IXnvF5ZT7+u815lv=tgg#<&$j|MowYoR+;dDI1t(^`;Ia@xAjg6`s z2~FZ_LGd-Qs&`>CdnYHL6F&;h1@s=7ERSMLTQ9nP(Xmkz*Kh}i{5qIW^Ux}thb)u^ z+}avlfIN)lT=WsqAjEOx0dB=gBm=u)D`$OA&UAy&Nggj_2OLV;_HOuZ?OdBD;T-mD&GATA~#zT>9Nc>qU!=e`~82l)qs( BwaNeh diff --git a/indra/tools/vstool/main.cs b/indra/tools/vstool/main.cs index 5c41c916e..4c331419b 100644 --- a/indra/tools/vstool/main.cs +++ b/indra/tools/vstool/main.cs @@ -550,6 +550,10 @@ namespace VSTool case "10.00": version = "VC90"; break; + + case "11.00": + version = "VC100"; + break; default: throw new ApplicationException("Unknown .sln version: " + format); } @@ -585,6 +589,10 @@ namespace VSTool case "VC90": progid = "VisualStudio.DTE.9.0"; break; + + case "VC100": + progid = "VisualStudio.DTE.10.0"; + break; default: throw new ApplicationException("Can't handle VS version: " + version); }