diff options
author | McCabe Maxsted | 2009-02-25 14:27:01 -0700 |
---|---|---|
committer | McCabe Maxsted | 2009-02-25 14:27:01 -0700 |
commit | 154a108669850d46f542db7663bd71e224c8a93b (patch) | |
tree | 72d813d502f4caf34ad81417cefc481c1c321fa2 | |
parent | Forgot to add touch back in to menu_pie_hud.xml (diff) | |
download | meta-impy-154a108669850d46f542db7663bd71e224c8a93b.zip meta-impy-154a108669850d46f542db7663bd71e224c8a93b.tar.gz meta-impy-154a108669850d46f542db7663bd71e224c8a93b.tar.bz2 meta-impy-154a108669850d46f542db7663bd71e224c8a93b.tar.xz |
Fixed copy_win_libs
Diffstat (limited to '')
-rw-r--r-- | ChangeLog.txt | 3 | ||||
-rw-r--r-- | linden/indra/cmake/CopyWinLibs.cmake | 52 |
2 files changed, 33 insertions, 22 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt index bad0ab8..6eeaa7b 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt | |||
@@ -3,6 +3,9 @@ | |||
3 | * linden/indra/newview/skins/default/xui/en-us/menu_pie_hud.xml: | 3 | * linden/indra/newview/skins/default/xui/en-us/menu_pie_hud.xml: |
4 | Forgot to add touch back in to menu_pie_hud.xml. | 4 | Forgot to add touch back in to menu_pie_hud.xml. |
5 | 5 | ||
6 | * linden/indra/cmake/CopyWinLibs.cmake: | ||
7 | Fixed copy_win_libs. | ||
8 | |||
6 | 9 | ||
7 | 2009-02-24 McCabe Maxsted <hakushakukun@gmail.com> | 10 | 2009-02-24 McCabe Maxsted <hakushakukun@gmail.com> |
8 | 11 | ||
diff --git a/linden/indra/cmake/CopyWinLibs.cmake b/linden/indra/cmake/CopyWinLibs.cmake index e80f0c3..458b016 100644 --- a/linden/indra/cmake/CopyWinLibs.cmake +++ b/linden/indra/cmake/CopyWinLibs.cmake | |||
@@ -9,14 +9,14 @@ include(CMakeCopyIfDifferent) | |||
9 | set(gst_plugin_release_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release/lib/gstreamer-plugins") | 9 | set(gst_plugin_release_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release/lib/gstreamer-plugins") |
10 | set(gst_plugin_release_files | 10 | set(gst_plugin_release_files |
11 | libdshowsrcwrapper.dll | 11 | libdshowsrcwrapper.dll |
12 | libfsselector.dll | 12 | libgsta52.dll |
13 | libfsvalve.dll | ||
14 | libgstacmenc.dll | 13 | libgstacmenc.dll |
15 | libgstadder.dll | 14 | libgstadder.dll |
16 | libgstalaw.dll | 15 | libgstalaw.dll |
17 | libgstalpha.dll | 16 | libgstalpha.dll |
18 | libgstalphacolor.dll | 17 | libgstalphacolor.dll |
19 | libgstapp.dll | 18 | libgstapp.dll |
19 | libgstasfdemux.dll | ||
20 | libgstaudiochunk.dll | 20 | libgstaudiochunk.dll |
21 | libgstaudioconvert.dll | 21 | libgstaudioconvert.dll |
22 | libgstaudiofx.dll | 22 | libgstaudiofx.dll |
@@ -27,41 +27,44 @@ set(gst_plugin_release_files | |||
27 | libgstavi.dll | 27 | libgstavi.dll |
28 | libgstcoreelements.dll | 28 | libgstcoreelements.dll |
29 | libgstcutter.dll | 29 | libgstcutter.dll |
30 | libgstdecodebin2.dll | ||
31 | libgstdecodebin.dll | 30 | libgstdecodebin.dll |
31 | libgstdecodebin2.dll | ||
32 | libgstdirectdraw.dll | 32 | libgstdirectdraw.dll |
33 | libgstdirectsound.dll | 33 | libgstdirectsound.dll |
34 | libgstdshowdecwrapper.dll | 34 | libgstdshowdecwrapper.dll |
35 | libgstdshowsrcwrapper.dll | 35 | libgstdshowsrcwrapper.dll |
36 | libgstdshowvideosink.dll | 36 | libgstdshowvideosink.dll |
37 | libgstdtmf.dll | 37 | libgstfaad.dll |
38 | libgstffmpeg.dll | 38 | libgstffmpeg.dll |
39 | libgstffmpegcolorspace.dll | 39 | libgstffmpegcolorspace.dll |
40 | libgstflv.dll | 40 | libgstflv.dll |
41 | libgstgamma.dll | ||
41 | libgstgdp.dll | 42 | libgstgdp.dll |
42 | libgsth264parse.dll | 43 | libgsth264parse.dll |
43 | libgsticydemux.dll | 44 | libgsticydemux.dll |
44 | libgstid3demux.dll | 45 | libgstid3demux.dll |
45 | libgstjpeg.dll | 46 | libgstjpeg.dll |
46 | libgstlevel.dll | 47 | libgstlevel.dll |
47 | libgstmad.dll | ||
48 | libgstmms.dll | 48 | libgstmms.dll |
49 | libgstmpeg2dec.dll | 49 | libgstmpeg2dec.dll |
50 | libgstmpeg4videoparse.dll | ||
50 | libgstmpegaudioparse.dll | 51 | libgstmpegaudioparse.dll |
51 | libgstmpegstream.dll | 52 | libgstmpegstream.dll |
52 | libgstmpegvideoparse.dll | 53 | libgstmpegvideoparse.dll |
53 | libgstmscodecs.dll | ||
54 | libgstmulaw.dll | 54 | libgstmulaw.dll |
55 | libgstmultipart.dll | 55 | libgstmultipart.dll |
56 | libgstneon.dll | 56 | libgstneon.dll |
57 | libgstogg.dll | 57 | libgstogg.dll |
58 | libgstpcapparse.dll | ||
58 | libgstplaybin.dll | 59 | libgstplaybin.dll |
59 | libgstpng.dll | 60 | libgstpng.dll |
60 | libgstqtdemux.dll | 61 | libgstqtdemux.dll |
61 | libgstqueue2.dll | 62 | libgstqueue2.dll |
63 | libgstreal.dll | ||
64 | libgstrealmedia.dll | ||
62 | libgstrtp.dll | 65 | libgstrtp.dll |
63 | libgstrtpmanager.dll | 66 | libgstrtpmanager.dll |
64 | libgstrtpmuxer.dll | 67 | libgstrtpmuxer.dll |
65 | libgstrtsp.dll | 68 | libgstrtsp.dll |
66 | libgstsmpte.dll | 69 | libgstsmpte.dll |
67 | libgsttheora.dll | 70 | libgsttheora.dll |
@@ -74,13 +77,12 @@ set(gst_plugin_release_files | |||
74 | libgstvideorate.dll | 77 | libgstvideorate.dll |
75 | libgstvideoscale.dll | 78 | libgstvideoscale.dll |
76 | libgstvideosignal.dll | 79 | libgstvideosignal.dll |
77 | libgstvideotestsrc.dll | ||
78 | libgstvolume.dll | ||
79 | libgstvolume.dll | 80 | libgstvolume.dll |
80 | libgstvorbis.dll | 81 | libgstvorbis.dll |
81 | libgstwasapi.dll | 82 | libgstwasapi.dll |
82 | libgstwavparse.dll | 83 | libgstwavparse.dll |
83 | libgstwininet.dll | 84 | libgstwininet.dll |
85 | libgstwinks.dll | ||
84 | libgstx264.dll | 86 | libgstx264.dll |
85 | libgstxvid.dll | 87 | libgstxvid.dll |
86 | ) | 88 | ) |
@@ -96,14 +98,14 @@ set(all_targets ${all_targets} ${out_targets}) | |||
96 | set(gst_plugin_debug_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug/lib/gstreamer-plugins") | 98 | set(gst_plugin_debug_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug/lib/gstreamer-plugins") |
97 | set(gst_plugin_debug_files | 99 | set(gst_plugin_debug_files |
98 | libdshowsrcwrapper.dll | 100 | libdshowsrcwrapper.dll |
99 | libfsselector.dll | 101 | libgsta52.dll |
100 | libfsvalve.dll | ||
101 | libgstacmenc.dll | 102 | libgstacmenc.dll |
102 | libgstadder.dll | 103 | libgstadder.dll |
103 | libgstalaw.dll | 104 | libgstalaw.dll |
104 | libgstalpha.dll | 105 | libgstalpha.dll |
105 | libgstalphacolor.dll | 106 | libgstalphacolor.dll |
106 | libgstapp.dll | 107 | libgstapp.dll |
108 | libgstasfdemux.dll | ||
107 | libgstaudiochunk.dll | 109 | libgstaudiochunk.dll |
108 | libgstaudioconvert.dll | 110 | libgstaudioconvert.dll |
109 | libgstaudiofx.dll | 111 | libgstaudiofx.dll |
@@ -114,41 +116,44 @@ set(gst_plugin_debug_files | |||
114 | libgstavi.dll | 116 | libgstavi.dll |
115 | libgstcoreelements.dll | 117 | libgstcoreelements.dll |
116 | libgstcutter.dll | 118 | libgstcutter.dll |
117 | libgstdecodebin2.dll | ||
118 | libgstdecodebin.dll | 119 | libgstdecodebin.dll |
120 | libgstdecodebin2.dll | ||
119 | libgstdirectdraw.dll | 121 | libgstdirectdraw.dll |
120 | libgstdirectsound.dll | 122 | libgstdirectsound.dll |
121 | libgstdshowdecwrapper.dll | 123 | libgstdshowdecwrapper.dll |
122 | libgstdshowsrcwrapper.dll | 124 | libgstdshowsrcwrapper.dll |
123 | libgstdshowvideosink.dll | 125 | libgstdshowvideosink.dll |
124 | libgstdtmf.dll | 126 | libgstfaad.dll |
125 | libgstffmpeg.dll | 127 | libgstffmpeg.dll |
126 | libgstffmpegcolorspace.dll | 128 | libgstffmpegcolorspace.dll |
127 | libgstflv.dll | 129 | libgstflv.dll |
130 | libgstgamma.dll | ||
128 | libgstgdp.dll | 131 | libgstgdp.dll |
129 | libgsth264parse.dll | 132 | libgsth264parse.dll |
130 | libgsticydemux.dll | 133 | libgsticydemux.dll |
131 | libgstid3demux.dll | 134 | libgstid3demux.dll |
132 | libgstjpeg.dll | 135 | libgstjpeg.dll |
133 | libgstlevel.dll | 136 | libgstlevel.dll |
134 | libgstmad.dll | ||
135 | libgstmms.dll | 137 | libgstmms.dll |
136 | libgstmpeg2dec.dll | 138 | libgstmpeg2dec.dll |
139 | libgstmpeg4videoparse.dll | ||
137 | libgstmpegaudioparse.dll | 140 | libgstmpegaudioparse.dll |
138 | libgstmpegstream.dll | 141 | libgstmpegstream.dll |
139 | libgstmpegvideoparse.dll | 142 | libgstmpegvideoparse.dll |
140 | libgstmscodecs.dll | ||
141 | libgstmulaw.dll | 143 | libgstmulaw.dll |
142 | libgstmultipart.dll | 144 | libgstmultipart.dll |
143 | libgstneon.dll | 145 | libgstneon.dll |
144 | libgstogg.dll | 146 | libgstogg.dll |
147 | libgstpcapparse.dll | ||
145 | libgstplaybin.dll | 148 | libgstplaybin.dll |
146 | libgstpng.dll | 149 | libgstpng.dll |
147 | libgstqtdemux.dll | 150 | libgstqtdemux.dll |
148 | libgstqueue2.dll | 151 | libgstqueue2.dll |
152 | libgstreal.dll | ||
153 | libgstrealmedia.dll | ||
149 | libgstrtp.dll | 154 | libgstrtp.dll |
150 | libgstrtpmanager.dll | 155 | libgstrtpmanager.dll |
151 | libgstrtpmuxer.dll | 156 | libgstrtpmuxer.dll |
152 | libgstrtsp.dll | 157 | libgstrtsp.dll |
153 | libgstsmpte.dll | 158 | libgstsmpte.dll |
154 | libgsttheora.dll | 159 | libgsttheora.dll |
@@ -161,13 +166,12 @@ set(gst_plugin_debug_files | |||
161 | libgstvideorate.dll | 166 | libgstvideorate.dll |
162 | libgstvideoscale.dll | 167 | libgstvideoscale.dll |
163 | libgstvideosignal.dll | 168 | libgstvideosignal.dll |
164 | libgstvideotestsrc.dll | ||
165 | libgstvolume.dll | ||
166 | libgstvolume.dll | 169 | libgstvolume.dll |
167 | libgstvorbis.dll | 170 | libgstvorbis.dll |
168 | libgstwasapi.dll | 171 | libgstwasapi.dll |
169 | libgstwavparse.dll | 172 | libgstwavparse.dll |
170 | libgstwininet.dll | 173 | libgstwininet.dll |
174 | libgstwinks.dll | ||
171 | libgstx264.dll | 175 | libgstx264.dll |
172 | libgstxvid.dll | 176 | libgstxvid.dll |
173 | ) | 177 | ) |
@@ -220,6 +224,7 @@ set(debug_files | |||
220 | avformat-52.dll | 224 | avformat-52.dll |
221 | avutil-49.dll | 225 | avutil-49.dll |
222 | intl.dll | 226 | intl.dll |
227 | libfaacdrm.dll | ||
223 | libgstapp-0.10.dll | 228 | libgstapp-0.10.dll |
224 | libgstaudio-0.10.dll | 229 | libgstaudio-0.10.dll |
225 | libgstbase-0.10.dll | 230 | libgstbase-0.10.dll |
@@ -243,10 +248,11 @@ set(debug_files | |||
243 | libmms.dll | 248 | libmms.dll |
244 | liboil-0.3-0.dll | 249 | liboil-0.3-0.dll |
245 | libpng13.dll | 250 | libpng13.dll |
246 | xvidcore.dll | 251 | libspeex.dll |
247 | zlib1.dll | ||
248 | ogg.dll | 252 | ogg.dll |
249 | vorbis.dll | 253 | vorbis.dll |
254 | xvidcore.dll | ||
255 | zlib1.dll | ||
250 | ) | 256 | ) |
251 | 257 | ||
252 | copy_if_different( | 258 | copy_if_different( |
@@ -294,6 +300,7 @@ set(release_files | |||
294 | avformat-52.dll | 300 | avformat-52.dll |
295 | avutil-49.dll | 301 | avutil-49.dll |
296 | intl.dll | 302 | intl.dll |
303 | libfaacdrm.dll | ||
297 | libgstapp-0.10.dll | 304 | libgstapp-0.10.dll |
298 | libgstaudio-0.10.dll | 305 | libgstaudio-0.10.dll |
299 | libgstbase-0.10.dll | 306 | libgstbase-0.10.dll |
@@ -317,10 +324,11 @@ set(release_files | |||
317 | libmms.dll | 324 | libmms.dll |
318 | liboil-0.3-0.dll | 325 | liboil-0.3-0.dll |
319 | libpng13.dll | 326 | libpng13.dll |
320 | xvidcore.dll | 327 | libspeex.dll |
321 | zlib1.dll | ||
322 | ogg.dll | 328 | ogg.dll |
323 | vorbis.dll | 329 | vorbis.dll |
330 | xvidcore.dll | ||
331 | zlib1.dll | ||
324 | ) | 332 | ) |
325 | 333 | ||
326 | copy_if_different( | 334 | copy_if_different( |