aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/cmake/linden%2findra%2fcmake%2fCopyWinLibs.cmake.rej.txt
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/cmake/linden%2findra%2fcmake%2fCopyWinLibs.cmake.rej.txt')
-rw-r--r--linden/indra/cmake/linden%2findra%2fcmake%2fCopyWinLibs.cmake.rej.txt257
1 files changed, 257 insertions, 0 deletions
diff --git a/linden/indra/cmake/linden%2findra%2fcmake%2fCopyWinLibs.cmake.rej.txt b/linden/indra/cmake/linden%2findra%2fcmake%2fCopyWinLibs.cmake.rej.txt
new file mode 100644
index 0000000..295c9fe
--- /dev/null
+++ b/linden/indra/cmake/linden%2findra%2fcmake%2fCopyWinLibs.cmake.rej.txt
@@ -0,0 +1,257 @@
1***************
2*** 15,35 ****
3 wrap_oal.dll
4 )
5
6 set(debug_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug")
7 set(debug_files
8- freebl3.dll
9- js3250.dll
10- nspr4.dll
11- nss3.dll
12- nssckbi.dll
13- plc4.dll
14- plds4.dll
15- smime3.dll
16- softokn3.dll
17- ssl3.dll
18- xpcom.dll
19- xul.dll
20 openjpegd.dll
21- windbgdlg.exe
22 )
23
24--- 15,30 ----
25 wrap_oal.dll
26 )
27+ copy_if_different(
28+ ${vivox_src_dir}
29+ "${CMAKE_CURRENT_BINARY_DIR}/Debug"
30+ out_targets
31+ ${vivox_files}
32+ )
33+ set(all_targets ${all_targets} ${out_targets})
34+
35
36 set(debug_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug")
37 set(debug_files
38 openjpegd.dll
39 )
40
41***************
42*** 42,50 ****
43 set(all_targets ${all_targets} ${out_targets})
44
45- copy_if_different(
46- ${vivox_src_dir}
47- "${CMAKE_CURRENT_BINARY_DIR}/Debug"
48- out_targets
49- ${vivox_files}
50 )
51 set(all_targets ${all_targets} ${out_targets})
52--- 37,206 ----
53 set(all_targets ${all_targets} ${out_targets})
54
55+ # Debug config runtime files required for the plugin test mule
56+ set(plugintest_debug_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug")
57+ set(plugintest_debug_files
58+ libeay32.dll
59+ libglib-2.0-0.dll
60+ libgmodule-2.0-0.dll
61+ libgobject-2.0-0.dll
62+ libgthread-2.0-0.dll
63+ qtcored4.dll
64+ qtguid4.dll
65+ qtnetworkd4.dll
66+ qtopengld4.dll
67+ qtwebkitd4.dll
68+ ssleay32.dll
69+ )
70+ copy_if_different(
71+ ${plugintest_debug_src_dir}
72+ "${CMAKE_CURRENT_BINARY_DIR}/../test_apps/llplugintest/Debug"
73+ out_targets
74+ ${plugintest_debug_files}
75+ )
76+ set(all_targets ${all_targets} ${out_targets})
77+
78+ # Debug config runtime files required for the plugin test mule (Qt image format plugins)
79+ set(plugintest_debug_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug/imageformats")
80+ set(plugintest_debug_files
81+ qgifd4.dll
82+ qicod4.dll
83+ qjpegd4.dll
84+ qmngd4.dll
85+ qsvgd4.dll
86+ qtiffd4.dll
87+ )
88+ copy_if_different(
89+ ${plugintest_debug_src_dir}
90+ "${CMAKE_CURRENT_BINARY_DIR}/../test_apps/llplugintest/Debug/imageformats"
91+ out_targets
92+ ${plugintest_debug_files}
93+ )
94+ set(all_targets ${all_targets} ${out_targets})
95+
96+ copy_if_different(
97+ ${plugintest_debug_src_dir}
98+ "${CMAKE_CURRENT_BINARY_DIR}/llplugin/imageformats"
99+ out_targets
100+ ${plugintest_debug_files}
101+ )
102+ set(all_targets ${all_targets} ${out_targets})
103+
104+ # Release & ReleaseDebInfo config runtime files required for the plugin test mule
105+ set(plugintest_release_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release")
106+ set(plugintest_release_files
107+ libeay32.dll
108+ libglib-2.0-0.dll
109+ libgmodule-2.0-0.dll
110+ libgobject-2.0-0.dll
111+ libgthread-2.0-0.dll
112+ # llkdu.dll (not required for plugin test)
113+ qtcore4.dll
114+ qtgui4.dll
115+ qtnetwork4.dll
116+ qtopengl4.dll
117+ qtwebkit4.dll
118+ ssleay32.dll
119+ )
120+ copy_if_different(
121+ ${plugintest_release_src_dir}
122+ "${CMAKE_CURRENT_BINARY_DIR}/../test_apps/llplugintest/Release"
123+ out_targets
124+ ${plugintest_release_files}
125+ )
126+ set(all_targets ${all_targets} ${out_targets})
127+
128+ copy_if_different(
129+ ${plugintest_release_src_dir}
130+ "${CMAKE_CURRENT_BINARY_DIR}/../test_apps/llplugintest/RelWithDebInfo"
131+ out_targets
132+ ${plugintest_release_files}
133+ )
134+ set(all_targets ${all_targets} ${out_targets})
135+
136+ # Release & ReleaseDebInfo config runtime files required for the plugin test mule (Qt image format plugins)
137+ set(plugintest_release_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release/imageformats")
138+ set(plugintest_release_files
139+ qgif4.dll
140+ qico4.dll
141+ qjpeg4.dll
142+ qmng4.dll
143+ qsvg4.dll
144+ qtiff4.dll
145+ )
146+ copy_if_different(
147+ ${plugintest_release_src_dir}
148+ "${CMAKE_CURRENT_BINARY_DIR}/../test_apps/llplugintest/Release/imageformats"
149+ out_targets
150+ ${plugintest_release_files}
151+ )
152+ set(all_targets ${all_targets} ${out_targets})
153+
154+ copy_if_different(
155+ ${plugintest_release_src_dir}
156+ "${CMAKE_CURRENT_BINARY_DIR}/../test_apps/llplugintest/RelWithDebInfo/imageformats"
157+ out_targets
158+ ${plugintest_release_files}
159+ )
160+ set(all_targets ${all_targets} ${out_targets})
161+
162+ copy_if_different(
163+ ${plugintest_release_src_dir}
164+ "${CMAKE_CURRENT_BINARY_DIR}/Release/llplugin/imageformats"
165+ out_targets
166+ ${plugintest_release_files}
167+ )
168+ set(all_targets ${all_targets} ${out_targets})
169+
170+ copy_if_different(
171+ ${plugintest_release_src_dir}
172+ "${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/llplugin/imageformats"
173+ out_targets
174+ ${plugintest_release_files}
175+ )
176+ set(all_targets ${all_targets} ${out_targets})
177+
178+ # Debug config runtime files required for the plugins
179+ set(plugins_debug_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug")
180+ set(plugins_debug_files
181+ libeay32.dll
182+ qtcored4.dll
183+ qtguid4.dll
184+ qtnetworkd4.dll
185+ qtopengld4.dll
186+ qtwebkitd4.dll
187+ ssleay32.dll
188+ )
189+ copy_if_different(
190+ ${plugins_debug_src_dir}
191+ "${CMAKE_CURRENT_BINARY_DIR}/Debug/llplugin"
192+ out_targets
193+ ${plugins_debug_files}
194+ )
195+ set(all_targets ${all_targets} ${out_targets})
196+
197+ # Release & ReleaseDebInfo config runtime files required for the plugins
198+ set(plugins_release_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release")
199+ set(plugins_release_files
200+ libeay32.dll
201+ qtcore4.dll
202+ qtgui4.dll
203+ qtnetwork4.dll
204+ qtopengl4.dll
205+ qtwebkit4.dll
206+ ssleay32.dll
207+ )
208+ copy_if_different(
209+ ${plugins_release_src_dir}
210+ "${CMAKE_CURRENT_BINARY_DIR}/Release/llplugin"
211+ out_targets
212+ ${plugins_release_files}
213+ )
214+ set(all_targets ${all_targets} ${out_targets})
215+
216+ copy_if_different(
217+ ${plugins_release_src_dir}
218+ "${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/llplugin"
219+ out_targets
220+ ${plugins_release_files}
221 )
222 set(all_targets ${all_targets} ${out_targets})
223***************
224*** 52,67 ****
225 set(release_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release")
226 set(release_files
227- freebl3.dll
228- js3250.dll
229- nspr4.dll
230- nss3.dll
231- nssckbi.dll
232- plc4.dll
233- plds4.dll
234- smime3.dll
235- softokn3.dll
236- ssl3.dll
237- xpcom.dll
238- xul.dll
239 openjpeg.dll
240 )
241--- 208,211 ----
242 set(release_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release")
243 set(release_files
244 openjpeg.dll
245 )
246***************
247*** 252,256 ****
248 ${debug_appconfig_file}
249 )
250- add_dependencies(copy_win_libs prepare)
251
252 if(EXISTS ${internal_llkdu_path})
253--- 396,399 ----
254 ${debug_appconfig_file}
255 )
256
257 if(EXISTS ${internal_llkdu_path})
generated by cgit v1.1 at 2025-02-28 21:02:19 +0000