diff options
Diffstat (limited to 'linden/indra/cmake/CopyWinLibs.cmake')
-rw-r--r-- | linden/indra/cmake/CopyWinLibs.cmake | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/linden/indra/cmake/CopyWinLibs.cmake b/linden/indra/cmake/CopyWinLibs.cmake index 52f000f..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) |
@@ -62,7 +62,6 @@ set(debug_files | |||
62 | libogg-0.dll | 62 | libogg-0.dll |
63 | liboil-0.3-0.dll | 63 | liboil-0.3-0.dll |
64 | libopenjpeg-2.dll | 64 | libopenjpeg-2.dll |
65 | libpng12-0.dll | ||
66 | libschroedinger-1.0-0.dll | 65 | libschroedinger-1.0-0.dll |
67 | libspeex-1.dll | 66 | libspeex-1.dll |
68 | libtheora-0.dll | 67 | libtheora-0.dll |
@@ -137,7 +136,6 @@ set(release_files | |||
137 | libogg-0.dll | 136 | libogg-0.dll |
138 | liboil-0.3-0.dll | 137 | liboil-0.3-0.dll |
139 | libopenjpeg-2.dll | 138 | libopenjpeg-2.dll |
140 | libpng12-0.dll | ||
141 | libschroedinger-1.0-0.dll | 139 | libschroedinger-1.0-0.dll |
142 | libspeex-1.dll | 140 | libspeex-1.dll |
143 | libtheora-0.dll | 141 | libtheora-0.dll |
@@ -198,7 +196,7 @@ if (MSVC80) | |||
198 | ARGS | 196 | ARGS |
199 | ${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py | 197 | ${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py |
200 | ${CMAKE_CURRENT_BINARY_DIR}/Debug/Microsoft.VC80.DebugCRT.manifest | 198 | ${CMAKE_CURRENT_BINARY_DIR}/Debug/Microsoft.VC80.DebugCRT.manifest |
201 | ${CMAKE_CURRENT_SOURCE_DIR}/SecondLifeDebug.exe.config | 199 | ${CMAKE_CURRENT_SOURCE_DIR}/ImprudenceDebug.exe.config |
202 | ${debug_appconfig_file} | 200 | ${debug_appconfig_file} |
203 | DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/Debug/Microsoft.VC80.DebugCRT.manifest | 201 | DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/Debug/Microsoft.VC80.DebugCRT.manifest |
204 | COMMENT "Creating debug app config file" | 202 | COMMENT "Creating debug app config file" |
@@ -243,7 +241,7 @@ if (MSVC80) | |||
243 | ARGS | 241 | ARGS |
244 | ${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py | 242 | ${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py |
245 | ${CMAKE_CURRENT_BINARY_DIR}/Release/Microsoft.VC80.CRT.manifest | 243 | ${CMAKE_CURRENT_BINARY_DIR}/Release/Microsoft.VC80.CRT.manifest |
246 | ${CMAKE_CURRENT_SOURCE_DIR}/SecondLife.exe.config | 244 | ${CMAKE_CURRENT_SOURCE_DIR}/Imprudence.exe.config |
247 | ${release_appconfig_file} | 245 | ${release_appconfig_file} |
248 | DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/Release/Microsoft.VC80.CRT.manifest | 246 | DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/Release/Microsoft.VC80.CRT.manifest |
249 | COMMENT "Creating release app config file" | 247 | COMMENT "Creating release app config file" |
@@ -256,7 +254,7 @@ if (MSVC80) | |||
256 | ARGS | 254 | ARGS |
257 | ${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py | 255 | ${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py |
258 | ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/Microsoft.VC80.CRT.manifest | 256 | ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/Microsoft.VC80.CRT.manifest |
259 | ${CMAKE_CURRENT_SOURCE_DIR}/SecondLife.exe.config | 257 | ${CMAKE_CURRENT_SOURCE_DIR}/Imprudence.exe.config |
260 | ${relwithdebinfo_appconfig_file} | 258 | ${relwithdebinfo_appconfig_file} |
261 | DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/Microsoft.VC80.CRT.manifest | 259 | DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/Microsoft.VC80.CRT.manifest |
262 | COMMENT "Creating relwithdebinfo app config file" | 260 | COMMENT "Creating relwithdebinfo app config file" |