diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/newview.vcproj | 47 |
1 files changed, 31 insertions, 16 deletions
diff --git a/linden/indra/newview/newview.vcproj b/linden/indra/newview/newview.vcproj index 726f77a..6fda220 100644 --- a/linden/indra/newview/newview.vcproj +++ b/linden/indra/newview/newview.vcproj | |||
@@ -37,7 +37,7 @@ | |||
37 | Name="VCCustomBuildTool"/> | 37 | Name="VCCustomBuildTool"/> |
38 | <Tool | 38 | <Tool |
39 | Name="VCLinkerTool" | 39 | Name="VCLinkerTool" |
40 | AdditionalDependencies="advapi32.lib apr-1.lib aprutil-1.lib comdlg32.lib dinput8.lib dsound.lib dxerr8.lib dxguid.lib fmodvc.lib freetype.lib gdi32.lib glu32.lib jpeglib_6b.lib kernel32.lib libboost_regex-vc71-mt-s.lib libcurl.lib libeay32.lib libexpatMT.lib LibOpenJPEG.lib llmozlib.lib mswsock.lib netapi32.lib odbc32.lib odbccp32.lib ogg_static_mt.lib ole32.lib oleaut32.lib opengl32.lib png12.lib qtmlclient.lib shell32.lib ssleay32.lib user32.lib Vfw32.lib vorbis_static_mt.lib vorbisenc_static_mt.lib vorbisfile_static_mt.lib winmm.lib winspool.lib ws2_32.lib xmlrpcepi.lib zlib.lib dnsapi.lib" | 40 | AdditionalDependencies="advapi32.lib apr-1.lib aprutil-1.lib areslib.lib comdlg32.lib dinput8.lib dsound.lib dxerr8.lib dxguid.lib fmodvc.lib freetype.lib gdi32.lib glu32.lib jpeglib_6b.lib kernel32.lib libboost_regex-vc71-mt-s.lib libcurl.lib libeay32.lib libexpatMT.lib OpenJPEG.lib llmozlib.lib mswsock.lib netapi32.lib odbc32.lib odbccp32.lib ogg_static_mt.lib ole32.lib oleaut32.lib opengl32.lib png12.lib psapi.lib qtmlclient.lib shell32.lib ssleay32.lib user32.lib Vfw32.lib vorbis_static_mt.lib vorbisenc_static_mt.lib vorbisfile_static_mt.lib winmm.lib winspool.lib ws2_32.lib xmlrpcepi.lib zlib.lib dnsapi.lib" |
41 | OutputFile="$(ConfigurationName)/debugview.exe" | 41 | OutputFile="$(ConfigurationName)/debugview.exe" |
42 | LinkIncremental="2" | 42 | LinkIncremental="2" |
43 | AdditionalLibraryDirectories=""../lib_$(ConfigurationName)/i686-win32";"../../libraries/i686-win32/lib_debug"" | 43 | AdditionalLibraryDirectories=""../lib_$(ConfigurationName)/i686-win32";"../../libraries/i686-win32/lib_debug"" |
@@ -102,7 +102,7 @@ | |||
102 | Name="VCCustomBuildTool"/> | 102 | Name="VCCustomBuildTool"/> |
103 | <Tool | 103 | <Tool |
104 | Name="VCLinkerTool" | 104 | Name="VCLinkerTool" |
105 | AdditionalDependencies="advapi32.lib apr-1.lib aprutil-1.lib comdlg32.lib dinput8.lib dsound.lib dxerr8.lib dxguid.lib fmodvc.lib freetype.lib gdi32.lib glu32.lib jpeglib_6b.lib kernel32.lib libboost_regex-vc71-mt-s.lib libcurl.lib libeay32.lib libexpatMT.lib LibOpenJPEG.lib llaudio.lib llmedia.lib llcharacter.lib llcommon.lib llimage.lib llimagej2coj.lib llinventory.lib llmath.lib llmessage.lib llmozlib.lib llprimitive.lib llrender.lib llui.lib llvfs.lib llwindow.lib llxml.lib lscript_library.lib mswsock.lib netapi32.lib odbc32.lib odbccp32.lib ogg_static_mt.lib ole32.lib oleaut32.lib opengl32.lib png12.lib qtmlclient.lib shell32.lib ssleay32.lib user32.lib Vfw32.lib vorbis_static_mt.lib vorbisenc_static_mt.lib vorbisfile_static_mt.lib winmm.lib winspool.lib ws2_32.lib xmlrpcepi.lib zlib.lib dnsapi.lib" | 105 | AdditionalDependencies="advapi32.lib apr-1.lib aprutil-1.lib areslib.lib comdlg32.lib dinput8.lib dsound.lib dxerr8.lib dxguid.lib fmodvc.lib freetype.lib gdi32.lib glu32.lib jpeglib_6b.lib kernel32.lib libboost_regex-vc71-mt-s.lib libcurl.lib libeay32.lib libexpatMT.lib OpenJPEG.lib llaudio.lib llmedia.lib llcharacter.lib llcommon.lib llimage.lib llimagej2coj.lib llinventory.lib llmath.lib llmessage.lib llmozlib.lib llprimitive.lib llrender.lib llui.lib llvfs.lib llwindow.lib llxml.lib lscript_library.lib mswsock.lib netapi32.lib odbc32.lib odbccp32.lib ogg_static_mt.lib ole32.lib oleaut32.lib opengl32.lib png12.lib psapi.lib qtmlclient.lib shell32.lib ssleay32.lib user32.lib Vfw32.lib vorbis_static_mt.lib vorbisenc_static_mt.lib vorbisfile_static_mt.lib winmm.lib winspool.lib ws2_32.lib xmlrpcepi.lib zlib.lib dnsapi.lib" |
106 | OutputFile="$(ConfigurationName)/newview.exe" | 106 | OutputFile="$(ConfigurationName)/newview.exe" |
107 | LinkIncremental="2" | 107 | LinkIncremental="2" |
108 | AdditionalLibraryDirectories=""../lib_$(ConfigurationName)/i686-win32";"../../libraries/i686-win32/lib_release"" | 108 | AdditionalLibraryDirectories=""../lib_$(ConfigurationName)/i686-win32";"../../libraries/i686-win32/lib_release"" |
@@ -164,7 +164,7 @@ | |||
164 | Outputs="$(TargetFileName)"/> | 164 | Outputs="$(TargetFileName)"/> |
165 | <Tool | 165 | <Tool |
166 | Name="VCLinkerTool" | 166 | Name="VCLinkerTool" |
167 | AdditionalDependencies="advapi32.lib apr-1.lib aprutil-1.lib comdlg32.lib dinput8.lib dsound.lib dxerr8.lib dxguid.lib fmodvc.lib freetype.lib gdi32.lib glu32.lib jpeglib_6b.lib kernel32.lib libboost_regex-vc71-mt-s.lib libcurl.lib libeay32.lib libexpatMT.lib LibOpenJPEG.lib llaudio.lib llmedia.lib llcharacter.lib llcommon.lib llimage.lib llimagej2coj.lib llinventory.lib llmath.lib llmessage.lib llmozlib.lib llprimitive.lib llrender.lib llui.lib llvfs.lib llwindow.lib llxml.lib lscript_library.lib mswsock.lib netapi32.lib odbc32.lib odbccp32.lib ogg_static_mt.lib ole32.lib oleaut32.lib opengl32.lib png12.lib qtmlclient.lib shell32.lib ssleay32.lib user32.lib Vfw32.lib vorbis_static_mt.lib vorbisenc_static_mt.lib vorbisfile_static_mt.lib winmm.lib winspool.lib ws2_32.lib xmlrpcepi.lib zlib.lib dnsapi.lib" | 167 | AdditionalDependencies="advapi32.lib apr-1.lib aprutil-1.lib areslib.lib comdlg32.lib dinput8.lib dsound.lib dxerr8.lib dxguid.lib fmodvc.lib freetype.lib gdi32.lib glu32.lib jpeglib_6b.lib kernel32.lib libboost_regex-vc71-mt-s.lib libcurl.lib libeay32.lib libexpatMT.lib OpenJPEG.lib llaudio.lib llmedia.lib llcharacter.lib llcommon.lib llimage.lib llimagej2coj.lib llinventory.lib llmath.lib llmessage.lib llmozlib.lib llprimitive.lib llrender.lib llui.lib llvfs.lib llwindow.lib llxml.lib lscript_library.lib mswsock.lib netapi32.lib odbc32.lib odbccp32.lib ogg_static_mt.lib ole32.lib oleaut32.lib opengl32.lib png12.lib psapi.lib qtmlclient.lib shell32.lib ssleay32.lib user32.lib Vfw32.lib vorbis_static_mt.lib vorbisenc_static_mt.lib vorbisfile_static_mt.lib winmm.lib winspool.lib ws2_32.lib xmlrpcepi.lib zlib.lib dnsapi.lib" |
168 | OutputFile="$(ConfigurationName)/SecondLife.exe" | 168 | OutputFile="$(ConfigurationName)/SecondLife.exe" |
169 | LinkIncremental="0" | 169 | LinkIncremental="0" |
170 | AdditionalLibraryDirectories=""../lib_release/i686-win32";"../../libraries/i686-win32/lib_release"" | 170 | AdditionalLibraryDirectories=""../lib_release/i686-win32";"../../libraries/i686-win32/lib_release"" |
@@ -224,7 +224,7 @@ | |||
224 | Name="VCCustomBuildTool"/> | 224 | Name="VCCustomBuildTool"/> |
225 | <Tool | 225 | <Tool |
226 | Name="VCLinkerTool" | 226 | Name="VCLinkerTool" |
227 | AdditionalDependencies="advapi32.lib apr-1.lib aprutil-1.lib comdlg32.lib dinput8.lib dsound.lib dxerr8.lib dxguid.lib fmodvc.lib freetype.lib gdi32.lib glu32.lib jpeglib_6b.lib kernel32.lib libboost_regex-vc71-mt-s.lib libcurl.lib libeay32.lib libexpatMT.lib LibOpenJPEG.lib llmozlib.lib mswsock.lib netapi32.lib odbc32.lib odbccp32.lib ogg_static_mt.lib ole32.lib oleaut32.lib opengl32.lib png12.lib qtmlclient.lib shell32.lib ssleay32.lib user32.lib Vfw32.lib vorbis_static_mt.lib vorbisenc_static_mt.lib vorbisfile_static_mt.lib winmm.lib winspool.lib ws2_32.lib xmlrpcepi.lib zlib.lib dnsapi.lib" | 227 | AdditionalDependencies="advapi32.lib apr-1.lib aprutil-1.lib areslib.lib comdlg32.lib dinput8.lib dsound.lib dxerr8.lib dxguid.lib fmodvc.lib freetype.lib gdi32.lib glu32.lib jpeglib_6b.lib kernel32.lib libboost_regex-vc71-mt-s.lib libcurl.lib libeay32.lib libexpatMT.lib OpenJPEG.lib llmozlib.lib mswsock.lib netapi32.lib odbc32.lib odbccp32.lib ogg_static_mt.lib ole32.lib oleaut32.lib opengl32.lib png12.lib psapi.lib qtmlclient.lib shell32.lib ssleay32.lib user32.lib Vfw32.lib vorbis_static_mt.lib vorbisenc_static_mt.lib vorbisfile_static_mt.lib winmm.lib winspool.lib ws2_32.lib xmlrpcepi.lib zlib.lib dnsapi.lib" |
228 | OutputFile="$(ConfigurationName)/newview_noopt.exe" | 228 | OutputFile="$(ConfigurationName)/newview_noopt.exe" |
229 | LinkIncremental="2" | 229 | LinkIncremental="2" |
230 | AdditionalLibraryDirectories=""../lib_releasenoopt/i686-win32";"../../libraries/i686-win32/lib_release"" | 230 | AdditionalLibraryDirectories=""../lib_releasenoopt/i686-win32";"../../libraries/i686-win32/lib_release"" |
@@ -292,9 +292,6 @@ | |||
292 | RelativePath=".\llassetuploadresponders.cpp"> | 292 | RelativePath=".\llassetuploadresponders.cpp"> |
293 | </File> | 293 | </File> |
294 | <File | 294 | <File |
295 | RelativePath=".\llasynchostbyname.cpp"> | ||
296 | </File> | ||
297 | <File | ||
298 | RelativePath=".\llaudiosourcevo.cpp"> | 295 | RelativePath=".\llaudiosourcevo.cpp"> |
299 | </File> | 296 | </File> |
300 | <File | 297 | <File |
@@ -334,6 +331,9 @@ | |||
334 | RelativePath=".\llcolorswatch.cpp"> | 331 | RelativePath=".\llcolorswatch.cpp"> |
335 | </File> | 332 | </File> |
336 | <File | 333 | <File |
334 | RelativePath=".\llcommandhandler.cpp"> | ||
335 | </File> | ||
336 | <File | ||
337 | RelativePath=".\llcompass.cpp"> | 337 | RelativePath=".\llcompass.cpp"> |
338 | </File> | 338 | </File> |
339 | <File | 339 | <File |
@@ -526,9 +526,6 @@ | |||
526 | RelativePath=".\llfloaterhtml.cpp"> | 526 | RelativePath=".\llfloaterhtml.cpp"> |
527 | </File> | 527 | </File> |
528 | <File | 528 | <File |
529 | RelativePath=".\llfloaterhtmlfind.cpp"> | ||
530 | </File> | ||
531 | <File | ||
532 | RelativePath=".\llfloaterhtmlhelp.cpp"> | 529 | RelativePath=".\llfloaterhtmlhelp.cpp"> |
533 | </File> | 530 | </File> |
534 | <File | 531 | <File |
@@ -541,6 +538,9 @@ | |||
541 | RelativePath=".\llfloaterinspect.cpp"> | 538 | RelativePath=".\llfloaterinspect.cpp"> |
542 | </File> | 539 | </File> |
543 | <File | 540 | <File |
541 | RelativePath=".\llfloaterlagmeter.cpp"> | ||
542 | </File> | ||
543 | <File | ||
544 | RelativePath=".\llfloaterland.cpp"> | 544 | RelativePath=".\llfloaterland.cpp"> |
545 | </File> | 545 | </File> |
546 | <File | 546 | <File |
@@ -1075,6 +1075,12 @@ | |||
1075 | RelativePath=".\llurl.cpp"> | 1075 | RelativePath=".\llurl.cpp"> |
1076 | </File> | 1076 | </File> |
1077 | <File | 1077 | <File |
1078 | RelativePath=".\llurldispatcher.cpp"> | ||
1079 | </File> | ||
1080 | <File | ||
1081 | RelativePath=".\llurlsimstring.cpp"> | ||
1082 | </File> | ||
1083 | <File | ||
1078 | RelativePath=".\llurlwhitelist.cpp"> | 1084 | RelativePath=".\llurlwhitelist.cpp"> |
1079 | </File> | 1085 | </File> |
1080 | <File | 1086 | <File |
@@ -1433,6 +1439,9 @@ | |||
1433 | RelativePath=".\llcolorswatch.h"> | 1439 | RelativePath=".\llcolorswatch.h"> |
1434 | </File> | 1440 | </File> |
1435 | <File | 1441 | <File |
1442 | RelativePath=".\llcommandhandler.h"> | ||
1443 | </File> | ||
1444 | <File | ||
1436 | RelativePath=".\llcompass.h"> | 1445 | RelativePath=".\llcompass.h"> |
1437 | </File> | 1446 | </File> |
1438 | <File | 1447 | <File |
@@ -1625,9 +1634,6 @@ | |||
1625 | RelativePath=".\llfloaterhtml.h"> | 1634 | RelativePath=".\llfloaterhtml.h"> |
1626 | </File> | 1635 | </File> |
1627 | <File | 1636 | <File |
1628 | RelativePath=".\llfloaterhtmlfind.h"> | ||
1629 | </File> | ||
1630 | <File | ||
1631 | RelativePath=".\llfloaterhtmlhelp.h"> | 1637 | RelativePath=".\llfloaterhtmlhelp.h"> |
1632 | </File> | 1638 | </File> |
1633 | <File | 1639 | <File |
@@ -1640,6 +1646,9 @@ | |||
1640 | RelativePath=".\llfloaterinspect.h"> | 1646 | RelativePath=".\llfloaterinspect.h"> |
1641 | </File> | 1647 | </File> |
1642 | <File | 1648 | <File |
1649 | RelativePath=".\llfloaterlagmeter.h"> | ||
1650 | </File> | ||
1651 | <File | ||
1643 | RelativePath=".\llfloaterland.h"> | 1652 | RelativePath=".\llfloaterland.h"> |
1644 | </File> | 1653 | </File> |
1645 | <File | 1654 | <File |
@@ -2186,6 +2195,12 @@ | |||
2186 | RelativePath=".\llurl.h"> | 2195 | RelativePath=".\llurl.h"> |
2187 | </File> | 2196 | </File> |
2188 | <File | 2197 | <File |
2198 | RelativePath=".\llurldispatcher.h"> | ||
2199 | </File> | ||
2200 | <File | ||
2201 | RelativePath=".\llurlsimstring.h"> | ||
2202 | </File> | ||
2203 | <File | ||
2189 | RelativePath=".\llurlwhitelist.h"> | 2204 | RelativePath=".\llurlwhitelist.h"> |
2190 | </File> | 2205 | </File> |
2191 | <File | 2206 | <File |
@@ -2512,9 +2527,6 @@ | |||
2512 | RelativePath=".\skins\xui\en-us\floater_directory.xml"> | 2527 | RelativePath=".\skins\xui\en-us\floater_directory.xml"> |
2513 | </File> | 2528 | </File> |
2514 | <File | 2529 | <File |
2515 | RelativePath=".\skins\xui\en-us\floater_friends.xml"> | ||
2516 | </File> | ||
2517 | <File | ||
2518 | RelativePath=".\skins\xui\en-us\floater_gesture.xml"> | 2530 | RelativePath=".\skins\xui\en-us\floater_gesture.xml"> |
2519 | </File> | 2531 | </File> |
2520 | <File | 2532 | <File |
@@ -2566,6 +2578,9 @@ | |||
2566 | RelativePath=".\skins\xui\en-us\floater_joystick.xml"> | 2578 | RelativePath=".\skins\xui\en-us\floater_joystick.xml"> |
2567 | </File> | 2579 | </File> |
2568 | <File | 2580 | <File |
2581 | RelativePath=".\skins\xui\en-us\floater_lagmeter.xml"> | ||
2582 | </File> | ||
2583 | <File | ||
2569 | RelativePath=".\skins\xui\en-us\floater_land_holdings.xml"> | 2584 | RelativePath=".\skins\xui\en-us\floater_land_holdings.xml"> |
2570 | </File> | 2585 | </File> |
2571 | <File | 2586 | <File |