diff options
author | McCabe Maxsted | 2009-12-04 12:57:57 -0700 |
---|---|---|
committer | Jacek Antonelli | 2009-12-06 16:46:33 -0600 |
commit | 58f0017d201b87a4ee7db7d118379c7c7e71a7e0 (patch) | |
tree | 24112cd9fa5753723fb522c58b93109c251eb06e /linden | |
parent | Forgot to remove the debug entry for libpng12-0.dll from CopyWinLibs.cmake (diff) | |
download | meta-impy-58f0017d201b87a4ee7db7d118379c7c7e71a7e0.zip meta-impy-58f0017d201b87a4ee7db7d118379c7c7e71a7e0.tar.gz meta-impy-58f0017d201b87a4ee7db7d118379c7c7e71a7e0.tar.bz2 meta-impy-58f0017d201b87a4ee7db7d118379c7c7e71a7e0.tar.xz |
Added Imprudence VC80 .config files to the repo
Diffstat (limited to 'linden')
-rw-r--r-- | linden/indra/cmake/CopyWinLibs.cmake | 8 | ||||
-rw-r--r-- | linden/indra/newview/Imprudence.exe.config | 20 | ||||
-rw-r--r-- | linden/indra/newview/ImprudenceDebug.exe.config | 20 |
3 files changed, 44 insertions, 4 deletions
diff --git a/linden/indra/cmake/CopyWinLibs.cmake b/linden/indra/cmake/CopyWinLibs.cmake index 808c693..add94dd 100644 --- a/linden/indra/cmake/CopyWinLibs.cmake +++ b/linden/indra/cmake/CopyWinLibs.cmake | |||
@@ -1,7 +1,7 @@ | |||
1 | # -*- cmake -*- | 1 | # -*- cmake -*- |
2 | 2 | ||
3 | # The copy_win_libs folder contains file lists and a script used to | 3 | # The copy_win_libs folder contains file lists and a script used to |
4 | # copy dlls, exes and such needed to run the SecondLife from within | 4 | # copy dlls, exes and such needed to run Imprudence from within |
5 | # VisualStudio. | 5 | # VisualStudio. |
6 | 6 | ||
7 | include(CMakeCopyIfDifferent) | 7 | include(CMakeCopyIfDifferent) |
@@ -196,7 +196,7 @@ if (MSVC80) | |||
196 | ARGS | 196 | ARGS |
197 | ${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py | 197 | ${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py |
198 | ${CMAKE_CURRENT_BINARY_DIR}/Debug/Microsoft.VC80.DebugCRT.manifest | 198 | ${CMAKE_CURRENT_BINARY_DIR}/Debug/Microsoft.VC80.DebugCRT.manifest |
199 | ${CMAKE_CURRENT_SOURCE_DIR}/SecondLifeDebug.exe.config | 199 | ${CMAKE_CURRENT_SOURCE_DIR}/ImprudenceDebug.exe.config |
200 | ${debug_appconfig_file} | 200 | ${debug_appconfig_file} |
201 | DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/Debug/Microsoft.VC80.DebugCRT.manifest | 201 | DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/Debug/Microsoft.VC80.DebugCRT.manifest |
202 | COMMENT "Creating debug app config file" | 202 | COMMENT "Creating debug app config file" |
@@ -241,7 +241,7 @@ if (MSVC80) | |||
241 | ARGS | 241 | ARGS |
242 | ${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py | 242 | ${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py |
243 | ${CMAKE_CURRENT_BINARY_DIR}/Release/Microsoft.VC80.CRT.manifest | 243 | ${CMAKE_CURRENT_BINARY_DIR}/Release/Microsoft.VC80.CRT.manifest |
244 | ${CMAKE_CURRENT_SOURCE_DIR}/SecondLife.exe.config | 244 | ${CMAKE_CURRENT_SOURCE_DIR}/Imprudence.exe.config |
245 | ${release_appconfig_file} | 245 | ${release_appconfig_file} |
246 | DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/Release/Microsoft.VC80.CRT.manifest | 246 | DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/Release/Microsoft.VC80.CRT.manifest |
247 | COMMENT "Creating release app config file" | 247 | COMMENT "Creating release app config file" |
@@ -254,7 +254,7 @@ if (MSVC80) | |||
254 | ARGS | 254 | ARGS |
255 | ${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py | 255 | ${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py |
256 | ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/Microsoft.VC80.CRT.manifest | 256 | ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/Microsoft.VC80.CRT.manifest |
257 | ${CMAKE_CURRENT_SOURCE_DIR}/SecondLife.exe.config | 257 | ${CMAKE_CURRENT_SOURCE_DIR}/Imprudence.exe.config |
258 | ${relwithdebinfo_appconfig_file} | 258 | ${relwithdebinfo_appconfig_file} |
259 | DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/Microsoft.VC80.CRT.manifest | 259 | DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/Microsoft.VC80.CRT.manifest |
260 | COMMENT "Creating relwithdebinfo app config file" | 260 | COMMENT "Creating relwithdebinfo app config file" |
diff --git a/linden/indra/newview/Imprudence.exe.config b/linden/indra/newview/Imprudence.exe.config new file mode 100644 index 0000000..293a9ba --- /dev/null +++ b/linden/indra/newview/Imprudence.exe.config | |||
@@ -0,0 +1,20 @@ | |||
1 | <configuration> | ||
2 | |||
3 | <windows> | ||
4 | |||
5 | <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> | ||
6 | |||
7 | <dependentAssembly> | ||
8 | |||
9 | <assemblyIdentity type="win32" name="Microsoft.VC80.CRT" processorArchitecture="x86" publicKeyToken="1fc8b3b9a1e18e3b"></assemblyIdentity> | ||
10 | |||
11 | <bindingRedirect oldVersion="8.0.41204.256-" newVersion="0.0.0.0"/> | ||
12 | |||
13 | </dependentAssembly> | ||
14 | |||
15 | </assemblyBinding> | ||
16 | |||
17 | </windows> | ||
18 | |||
19 | </configuration> | ||
20 | |||
diff --git a/linden/indra/newview/ImprudenceDebug.exe.config b/linden/indra/newview/ImprudenceDebug.exe.config new file mode 100644 index 0000000..04d0e00 --- /dev/null +++ b/linden/indra/newview/ImprudenceDebug.exe.config | |||
@@ -0,0 +1,20 @@ | |||
1 | <configuration> | ||
2 | |||
3 | <windows> | ||
4 | |||
5 | <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> | ||
6 | |||
7 | <dependentAssembly> | ||
8 | |||
9 | <assemblyIdentity type="win32" name="Microsoft.VC80.DebugCRT" processorArchitecture="x86" publicKeyToken="1fc8b3b9a1e18e3b"></assemblyIdentity> | ||
10 | |||
11 | <bindingRedirect oldVersion="8.0.41204.256-" newVersion="0.0.0.0"/> | ||
12 | |||
13 | </dependentAssembly> | ||
14 | |||
15 | </assemblyBinding> | ||
16 | |||
17 | </windows> | ||
18 | |||
19 | </configuration> | ||
20 | |||