livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

various fixes to get the debug build working; don't look for or copy msvc*80.dll's.

master
Alain Linden 2011-02-10 17:26:16 -08:00
parent 6dd41886b3
commit 38a2af9235
5 changed files with 13 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
autobuild.xml
View File

@ -908,9 +908,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>a668a4ddfe20a078d720d7a4fca205bd</string>
<string>afff2018e6a887c281b072eecdd9343e</string>
<key>url</key>
<string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/jsoncpp-0.5.0-windows-20110131a.tar.bz2</string>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-jsoncpp/rev/220579/arch/CYGWIN/installer/jsoncpp-0.5.0-windows-20110208.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
@ -1066,7 +1066,7 @@
<key>license</key>
<string>lgpl</string>
<key>license_file</key>
<string>LICENSES/LLQTWEBKIT_LICENSE.txt</string>
<string>LICENSES/llqtwebkit.txt</string>
<key>name</key>
<string>llqtwebkit</string>
<key>platforms</key>
@ -1100,9 +1100,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>5744e07b1b775afd259f3916a436c54c</string>
<string>7865b9c3a5d9f9424af56d5d05b82de9</string>
<key>url</key>
<string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-4.7.1-windows-20110204.tar.bz2</string>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/alain_llqtwebkit/rev/220864/arch/CYGWIN/installer/llqtwebkit-4.7.1-windows-20110210.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
@ -1389,30 +1389,6 @@
</map>
</map>
</map>
<key>qt</key>
<map>
<key>license</key>
<string>LGPL</string>
<key>license_file</key>
<string>LICENSES/qt.txt</string>
<key>name</key>
<string>qt</string>
<key>platforms</key>
<map>
<key>windows</key>
<map>
<key>archive</key>
<map>
<key>hash</key>
<string>ad536aebb28e578164f58e3f7b53bbb1</string>
<key>url</key>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-qt/rev/220494/arch/CYGWIN/installer/qt-4.7.1-windows-20110207.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
</map>
</map>
</map>
<key>quicktime</key>
<map>
<key>license</key>

2
indra/cmake/JsonCpp.cmake
View File

@ -11,7 +11,7 @@ else (STANDALONE)
use_prebuilt_binary(jsoncpp)
if (WINDOWS)
set(JSONCPP_LIBRARIES
# debug json_vc100_libmt
debug json_vc100debug_libmt.lib
optimized json_vc100_libmt)
elseif (DARWIN)
set(JSONCPP_LIBRARIES libjson_linux-gcc-4.0.1_libmt)

1
indra/cmake/WebKitLibPlugin.cmake
View File

@ -35,7 +35,6 @@ else (STANDALONE)
endif (STANDALONE)
if (WINDOWS)
use_prebuilt_binary(qt)
set(WEBKIT_PLUGIN_LIBRARIES
debug llqtwebkitd
debug QtWebKitd4

15
indra/newview/CMakeLists.txt
View File

@ -1488,15 +1488,12 @@ if (WINDOWS)
${SHARED_LIB_STAGING_DIR}/Release/fmod.dll
${SHARED_LIB_STAGING_DIR}/RelWithDebInfo/fmod.dll
${SHARED_LIB_STAGING_DIR}/Debug/fmod.dll
${SHARED_LIB_STAGING_DIR}/Release/msvcr80.dll
${SHARED_LIB_STAGING_DIR}/Release/msvcp80.dll
${SHARED_LIB_STAGING_DIR}/Release/Microsoft.VC80.CRT.manifest
${SHARED_LIB_STAGING_DIR}/RelWithDebInfo/msvcr80.dll
${SHARED_LIB_STAGING_DIR}/RelWithDebInfo/msvcp80.dll
${SHARED_LIB_STAGING_DIR}/RelWithDebInfo/Microsoft.VC80.CRT.manifest
${SHARED_LIB_STAGING_DIR}/Debug/msvcr80d.dll
${SHARED_LIB_STAGING_DIR}/Debug/msvcp80d.dll
${SHARED_LIB_STAGING_DIR}/Debug/Microsoft.VC80.DebugCRT.manifest
${SHARED_LIB_STAGING_DIR}/Release/msvcr100.dll
${SHARED_LIB_STAGING_DIR}/Release/msvcp100.dll
${SHARED_LIB_STAGING_DIR}/RelWithDebInfo/msvcr100.dll
${SHARED_LIB_STAGING_DIR}/RelWithDebInfo/msvcp100.dll
${SHARED_LIB_STAGING_DIR}/Debug/msvcr100d.dll
${SHARED_LIB_STAGING_DIR}/Debug/msvcp100d.dll
${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR}/SLVoice.exe
${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR}/vivoxsdk.dll
${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR}/ortp.dll

2
indra/newview/viewer_manifest.py
View File

@ -289,7 +289,7 @@ class WindowsManifest(ViewerManifest):
# See http://msdn.microsoft.com/en-us/library/ms235291(VS.80).aspx
if self.args['configuration'].lower() == 'debug':
self.path("msvcr100d.dll")
self.path("msvcp80d.dll")
self.path("msvcp100d.dll")
else:
self.path("msvcr100.dll")
self.path("msvcp100.dll")