1 files changed, 291 insertions, 46 deletions
diff --git a/linden/indra/cmake/CopyWinLibs.cmake b/linden/indra/cmake/CopyWinLibs.cmake
index 92b5d71..b3703b5 100644
--- a/linden/indra/cmake/CopyWinLibs.cmake
+++ b/linden/indra/cmake/CopyWinLibs.cmake
@@ -6,6 +6,184 @@
 include(CMakeCopyIfDifferent)
+set(gst_plugin_release_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release/lib/gstreamer-plugins")
+set(gst_plugin_release_files
+    libdshowsrcwrapper.dll
+    libgsta52.dll
+    libgstacmenc.dll
+    libgstadder.dll
+    libgstalaw.dll
+    libgstalpha.dll
+    libgstalphacolor.dll
+    libgstapp.dll
+    libgstasfdemux.dll
+    libgstaudiochunk.dll
+    libgstaudioconvert.dll
+    libgstaudiofx.dll
+    libgstaudiorate.dll
+    libgstaudioresample.dll
+    libgstaudiotestsrc.dll
+    libgstautodetect.dll
+    libgstavi.dll
+    libgstcoreelements.dll
+    libgstcutter.dll
+    libgstdecodebin.dll
+    libgstdecodebin2.dll
+    libgstdirectdraw.dll
+    libgstdirectsound.dll
+    libgstdshowdecwrapper.dll
+    libgstdshowsrcwrapper.dll
+    libgstdshowvideosink.dll
+    libgstfaad.dll
+    libgstffmpeg.dll
+    libgstffmpegcolorspace.dll
+    libgstflv.dll
+    libgstgamma.dll
+    libgstgdp.dll
+    libgsth264parse.dll
+    libgsticydemux.dll
+    libgstid3demux.dll
+    libgstjpeg.dll
+    libgstlevel.dll
+    libgstmms.dll
+    libgstmpeg2dec.dll
+    libgstmpeg4videoparse.dll
+    libgstmpegaudioparse.dll
+    libgstmpegstream.dll
+    libgstmpegvideoparse.dll
+    libgstmulaw.dll
+    libgstmultipart.dll
+    libgstneon.dll
+    libgstogg.dll
+    libgstpcapparse.dll
+    libgstplaybin.dll
+    libgstpng.dll
+    libgstqtdemux.dll
+    libgstqueue2.dll
+    libgstreal.dll
+    libgstrealmedia.dll
+    libgstrtp.dll
+    libgstrtpmanager.dll
+    libgstrtpmuxer.dll
+    libgstrtsp.dll
+    libgstsmpte.dll
+    libgsttheora.dll
+    libgsttypefindfunctions.dll
+    libgstudp.dll
+    libgstvideobalance.dll
+    libgstvideobox.dll
+    libgstvideocrop.dll
+    libgstvideomixer.dll
+    libgstvideorate.dll
+    libgstvideoscale.dll
+    libgstvideosignal.dll
+    libgstvolume.dll
+    libgstvorbis.dll
+    libgstwasapi.dll
+    libgstwavparse.dll
+    libgstwininet.dll
+    libgstwinks.dll
+    libgstx264.dll
+    libgstxvid.dll
+    )
+copy_if_different(
+    ${gst_plugin_release_dir} 
+    "${CMAKE_CURRENT_BINARY_DIR}/Release/lib/gstreamer-plugins"
+    out_targets 
+    ${gst_plugin_release_files}
+    )
+set(all_targets ${all_targets} ${out_targets})
+set(gst_plugin_debug_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug/lib/gstreamer-plugins")
+set(gst_plugin_debug_files
+    libdshowsrcwrapper.dll
+    libgsta52.dll
+    libgstacmenc.dll
+    libgstadder.dll
+    libgstalaw.dll
+    libgstalpha.dll
+    libgstalphacolor.dll
+    libgstapp.dll
+    libgstasfdemux.dll
+    libgstaudiochunk.dll
+    libgstaudioconvert.dll
+    libgstaudiofx.dll
+    libgstaudiorate.dll
+    libgstaudioresample.dll
+    libgstaudiotestsrc.dll
+    libgstautodetect.dll
+    libgstavi.dll
+    libgstcoreelements.dll
+    libgstcutter.dll
+    libgstdecodebin.dll
+    libgstdecodebin2.dll
+    libgstdirectdraw.dll
+    libgstdirectsound.dll
+    libgstdshowdecwrapper.dll
+    libgstdshowsrcwrapper.dll
+    libgstdshowvideosink.dll
+    libgstfaad.dll
+    libgstffmpeg.dll
+    libgstffmpegcolorspace.dll
+    libgstflv.dll
+    libgstgamma.dll
+    libgstgdp.dll
+    libgsth264parse.dll
+    libgsticydemux.dll
+    libgstid3demux.dll
+    libgstjpeg.dll
+    libgstlevel.dll
+    libgstmms.dll
+    libgstmpeg2dec.dll
+    libgstmpeg4videoparse.dll
+    libgstmpegaudioparse.dll
+    libgstmpegstream.dll
+    libgstmpegvideoparse.dll
+    libgstmulaw.dll
+    libgstmultipart.dll
+    libgstneon.dll
+    libgstogg.dll
+    libgstpcapparse.dll
+    libgstplaybin.dll
+    libgstpng.dll
+    libgstqtdemux.dll
+    libgstqueue2.dll
+    libgstreal.dll
+    libgstrealmedia.dll
+    libgstrtp.dll
+    libgstrtpmanager.dll
+    libgstrtpmuxer.dll
+    libgstrtsp.dll
+    libgstsmpte.dll
+    libgsttheora.dll
+    libgsttypefindfunctions.dll
+    libgstudp.dll
+    libgstvideobalance.dll
+    libgstvideobox.dll
+    libgstvideocrop.dll
+    libgstvideomixer.dll
+    libgstvideorate.dll
+    libgstvideoscale.dll
+    libgstvideosignal.dll
+    libgstvolume.dll
+    libgstvorbis.dll
+    libgstwasapi.dll
+    libgstwavparse.dll
+    libgstwininet.dll
+    libgstwinks.dll
+    libgstx264.dll
+    libgstxvid.dll
+    )
+copy_if_different(
+    ${gst_plugin_debug_dir} 
+    "${CMAKE_CURRENT_BINARY_DIR}/Debug/lib/gstreamer-plugins"
+    out_targets 
+    ${gst_plugin_debug_files}
+    )
+set(all_targets ${all_targets} ${out_targets})
 set(vivox_src_dir "${CMAKE_SOURCE_DIR}/newview/vivox-runtime/i686-win32")
 set(vivox_files
    SLVoice.exe
@@ -17,12 +195,15 @@ set(vivox_files
 set(debug_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug")
 set(debug_files
+    alut.dll
    freebl3.dll
    gksvggdiplus.dll
    js3250.dll
    nspr4.dll
    nss3.dll
    nssckbi.dll
+    openal32.dll
+    openjpegd.dll
    plc4.dll
    plds4.dll
    smime3.dll
@@ -30,8 +211,47 @@ set(debug_files
    ssl3.dll
    xpcom.dll
    xul.dll
-    openjpegd.dll
    windbgdlg.exe
+    iconv.dll
+    libxml2.dll
+    libgio-2.0-0.dll
+    libglib-2.0-0.dll
+    libgmodule-2.0-0.dll
+    libgobject-2.0-0.dll
+    libgthread-2.0-0.dll
+    avcodec-51.dll
+    avformat-52.dll
+    avutil-49.dll
+    intl.dll
+    libfaacdrm.dll
+    libgstapp-0.10.dll
+    libgstaudio-0.10.dll
+    libgstbase-0.10.dll
+    libgstcdda-0.10.dll
+    libgstcontroller-0.10.dll
+    libgstdataprotocol-0.10.dll
+    libgstdshow-0.10.dll
+    libgstfft-0.10.dll
+    libgstinterfaces-0.10.dll
+    libgstnet-0.10.dll
+    libgstnetbuffer-0.10.dll
+    libgstpbutils-0.10.dll
+    libgstreamer-0.10.dll
+    libgstriff-0.10.dll
+    libgstrtp-0.10.dll
+    libgstrtsp-0.10.dll
+    libgstsdp-0.10.dll
+    libgsttag-0.10.dll
+    libgstvideo-0.10.dll
+    libjpeg.dll
+    libmms.dll
+    liboil-0.3-0.dll
+    libpng13.dll
+    libspeex.dll
+    ogg.dll
+    vorbis.dll
+    xvidcore.dll
+    zlib1.dll
    )
 copy_if_different(
@@ -52,12 +272,15 @@ set(all_targets ${all_targets} ${out_targets})
 set(release_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release")
 set(release_files
+    alut.dll
    freebl3.dll
    gksvggdiplus.dll
    js3250.dll
    nspr4.dll
    nss3.dll
    nssckbi.dll
+    openal32.dll
+    openjpeg.dll
    plc4.dll
    plds4.dll
    smime3.dll
@@ -65,7 +288,46 @@ set(release_files
    ssl3.dll
    xpcom.dll
    xul.dll
-    openjpeg.dll
+    iconv.dll
+    libxml2.dll
+    libgio-2.0-0.dll
+    libglib-2.0-0.dll
+    libgmodule-2.0-0.dll
+    libgobject-2.0-0.dll
+    libgthread-2.0-0.dll
+    avcodec-51.dll
+    avformat-52.dll
+    avutil-49.dll
+    intl.dll
+    libfaacdrm.dll
+    libgstapp-0.10.dll
+    libgstaudio-0.10.dll
+    libgstbase-0.10.dll
+    libgstcdda-0.10.dll
+    libgstcontroller-0.10.dll
+    libgstdataprotocol-0.10.dll
+    libgstdshow-0.10.dll
+    libgstfft-0.10.dll
+    libgstinterfaces-0.10.dll
+    libgstnet-0.10.dll
+    libgstnetbuffer-0.10.dll
+    libgstpbutils-0.10.dll
+    libgstreamer-0.10.dll
+    libgstriff-0.10.dll
+    libgstrtp-0.10.dll
+    libgstrtsp-0.10.dll
+    libgstsdp-0.10.dll
+    libgsttag-0.10.dll
+    libgstvideo-0.10.dll
+    libjpeg.dll
+    libmms.dll
+    liboil-0.3-0.dll
+    libpng13.dll
+    libspeex.dll
+    ogg.dll
+    vorbis.dll
+    xvidcore.dll
+    zlib1.dll
    )
    
 copy_if_different(
@@ -100,48 +362,35 @@ copy_if_different(
    )
 set(all_targets ${all_targets} ${out_targets})
-set(internal_llkdu_path "${CMAKE_SOURCE_DIR}/llkdu")
-if(EXISTS ${internal_llkdu_path})
+# Copy MS C runtime dlls, required for packaging.
-    set(internal_llkdu_src "${CMAKE_BINARY_DIR}/llkdu/${CMAKE_CFG_INTDIR}/llkdu.dll")
+# *TODO - Adapt this to support VC9
-    set(llkdu_dst "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/llkdu.dll")
+if (MSVC80)
-    ADD_CUSTOM_COMMAND(
+    FIND_PATH(debug_msvc8_redist_path msvcr80d.dll
-        OUTPUT  ${llkdu_dst}
+        PATHS
-        COMMAND ${CMAKE_COMMAND} -E copy_if_different ${internal_llkdu_src} ${llkdu_dst}
+        [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\8.0\\Setup\\VC;ProductDir]/redist/Debug_NonRedist/x86/Microsoft.VC80.DebugCRT
-        DEPENDS ${internal_llkdu_src}
-        COMMENT "Copying llkdu.dll ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}"
-        )
-    set(all_targets ${all_targets} ${llkdu_dst})
-else(EXISTS ${internal_llkdu_path})
-    set(debug_llkdu_src "${debug_src_dir}/llkdu.dll")
-    set(debug_llkdu_dst "${CMAKE_CURRENT_BINARY_DIR}/Debug/llkdu.dll")
-    ADD_CUSTOM_COMMAND(
-        OUTPUT  ${debug_llkdu_dst}
-        COMMAND ${CMAKE_COMMAND} -E copy_if_different ${debug_llkdu_src} ${debug_llkdu_dst}
-        DEPENDS ${debug_llkdu_src}
-        COMMENT "Copying llkdu.dll ${CMAKE_CURRENT_BINARY_DIR}/Debug"
-        )
-    set(all_targets ${all_targets} ${debug_llkdu_dst})
-    set(release_llkdu_src "${release_src_dir}/llkdu.dll")
-    set(release_llkdu_dst "${CMAKE_CURRENT_BINARY_DIR}/Release/llkdu.dll")
-    ADD_CUSTOM_COMMAND(
-        OUTPUT  ${release_llkdu_dst}
-        COMMAND ${CMAKE_COMMAND} -E copy_if_different ${release_llkdu_src} ${release_llkdu_dst}
-        DEPENDS ${release_llkdu_src}
-        COMMENT "Copying llkdu.dll ${CMAKE_CURRENT_BINARY_DIR}/Release"
        )
-    set(all_targets ${all_targets} ${release_llkdu_dst})
+    if(EXISTS ${debug_msvc8_redist_path})
-    set(relwithdebinfo_llkdu_dst "${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/llkdu.dll")
+        set(debug_msvc8_files
-    ADD_CUSTOM_COMMAND(
+            msvcr80d.dll
-        OUTPUT  ${relwithdebinfo_llkdu_dst}
+            msvcp80d.dll
-        COMMAND ${CMAKE_COMMAND} -E copy_if_different ${release_llkdu_src} ${relwithdebinfo_llkdu_dst}
+            Microsoft.VC80.DebugCRT.manifest
-        DEPENDS ${release_llkdu_src}
+            )
-        COMMENT "Copying llkdu.dll ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo"
+        copy_if_different(
+            ${debug_msvc8_redist_path} 
+            "${CMAKE_CURRENT_BINARY_DIR}/Debug"
+            out_targets 
+            ${debug_msvc8_files}
+            )
+        set(all_targets ${all_targets} ${out_targets})
+    endif (EXISTS ${debug_msvc8_redist_path})
+    FIND_PATH(release_msvc8_redist_path msvcr80.dll
+        PATHS
+        [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\8.0\\Setup\\VC;ProductDir]/redist/x86/Microsoft.VC80.CRT
        )
-    set(all_targets ${all_targets} ${relwithdebinfo_llkdu_dst})
-   
-endif (EXISTS ${internal_llkdu_path})
 # Copy MS C runtime dlls, required for packaging.
 # *TODO - Adapt this to support VC9
@@ -201,7 +450,3 @@ if (MSVC80)
 endif (MSVC80)
 add_custom_target(copy_win_libs ALL DEPENDS ${all_targets})
-if(EXISTS ${internal_llkdu_path})
-    add_dependencies(copy_win_libs llkdu)
-endif(EXISTS ${internal_llkdu_path})

diff --git a/linden/indra/cmake/CopyWinLibs.cmake b/linden/indra/cmake/CopyWinLibs.cmake index 92b5d71..b3703b5 100644 --- a/linden/indra/cmake/CopyWinLibs.cmake +++ b/linden/indra/cmake/CopyWinLibs.cmake
@@ -6,6 +6,184 @@
6		6
7	include(CMakeCopyIfDifferent)	7	include(CMakeCopyIfDifferent)
8		8
		9	set(gst_plugin_release_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release/lib/gstreamer-plugins")
		10	set(gst_plugin_release_files
		11	libdshowsrcwrapper.dll
		12	libgsta52.dll
		13	libgstacmenc.dll
		14	libgstadder.dll
		15	libgstalaw.dll
		16	libgstalpha.dll
		17	libgstalphacolor.dll
		18	libgstapp.dll
		19	libgstasfdemux.dll
		20	libgstaudiochunk.dll
		21	libgstaudioconvert.dll
		22	libgstaudiofx.dll
		23	libgstaudiorate.dll
		24	libgstaudioresample.dll
		25	libgstaudiotestsrc.dll
		26	libgstautodetect.dll
		27	libgstavi.dll
		28	libgstcoreelements.dll
		29	libgstcutter.dll
		30	libgstdecodebin.dll
		31	libgstdecodebin2.dll
		32	libgstdirectdraw.dll
		33	libgstdirectsound.dll
		34	libgstdshowdecwrapper.dll
		35	libgstdshowsrcwrapper.dll
		36	libgstdshowvideosink.dll
		37	libgstfaad.dll
		38	libgstffmpeg.dll
		39	libgstffmpegcolorspace.dll
		40	libgstflv.dll
		41	libgstgamma.dll
		42	libgstgdp.dll
		43	libgsth264parse.dll
		44	libgsticydemux.dll
		45	libgstid3demux.dll
		46	libgstjpeg.dll
		47	libgstlevel.dll
		48	libgstmms.dll
		49	libgstmpeg2dec.dll
		50	libgstmpeg4videoparse.dll
		51	libgstmpegaudioparse.dll
		52	libgstmpegstream.dll
		53	libgstmpegvideoparse.dll
		54	libgstmulaw.dll
		55	libgstmultipart.dll
		56	libgstneon.dll
		57	libgstogg.dll
		58	libgstpcapparse.dll
		59	libgstplaybin.dll
		60	libgstpng.dll
		61	libgstqtdemux.dll
		62	libgstqueue2.dll
		63	libgstreal.dll
		64	libgstrealmedia.dll
		65	libgstrtp.dll
		66	libgstrtpmanager.dll
		67	libgstrtpmuxer.dll
		68	libgstrtsp.dll
		69	libgstsmpte.dll
		70	libgsttheora.dll
		71	libgsttypefindfunctions.dll
		72	libgstudp.dll
		73	libgstvideobalance.dll
		74	libgstvideobox.dll
		75	libgstvideocrop.dll
		76	libgstvideomixer.dll
		77	libgstvideorate.dll
		78	libgstvideoscale.dll
		79	libgstvideosignal.dll
		80	libgstvolume.dll
		81	libgstvorbis.dll
		82	libgstwasapi.dll
		83	libgstwavparse.dll
		84	libgstwininet.dll
		85	libgstwinks.dll
		86	libgstx264.dll
		87	libgstxvid.dll
		88	)
		89
		90	copy_if_different(
		91	${gst_plugin_release_dir}
		92	"${CMAKE_CURRENT_BINARY_DIR}/Release/lib/gstreamer-plugins"
		93	out_targets
		94	${gst_plugin_release_files}
		95	)
		96	set(all_targets ${all_targets} ${out_targets})
		97
		98	set(gst_plugin_debug_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug/lib/gstreamer-plugins")
		99	set(gst_plugin_debug_files
		100	libdshowsrcwrapper.dll
		101	libgsta52.dll
		102	libgstacmenc.dll
		103	libgstadder.dll
		104	libgstalaw.dll
		105	libgstalpha.dll
		106	libgstalphacolor.dll
		107	libgstapp.dll
		108	libgstasfdemux.dll
		109	libgstaudiochunk.dll
		110	libgstaudioconvert.dll
		111	libgstaudiofx.dll
		112	libgstaudiorate.dll
		113	libgstaudioresample.dll
		114	libgstaudiotestsrc.dll
		115	libgstautodetect.dll
		116	libgstavi.dll
		117	libgstcoreelements.dll
		118	libgstcutter.dll
		119	libgstdecodebin.dll
		120	libgstdecodebin2.dll
		121	libgstdirectdraw.dll
		122	libgstdirectsound.dll
		123	libgstdshowdecwrapper.dll
		124	libgstdshowsrcwrapper.dll
		125	libgstdshowvideosink.dll
		126	libgstfaad.dll
		127	libgstffmpeg.dll
		128	libgstffmpegcolorspace.dll
		129	libgstflv.dll
		130	libgstgamma.dll
		131	libgstgdp.dll
		132	libgsth264parse.dll
		133	libgsticydemux.dll
		134	libgstid3demux.dll
		135	libgstjpeg.dll
		136	libgstlevel.dll
		137	libgstmms.dll
		138	libgstmpeg2dec.dll
		139	libgstmpeg4videoparse.dll
		140	libgstmpegaudioparse.dll
		141	libgstmpegstream.dll
		142	libgstmpegvideoparse.dll
		143	libgstmulaw.dll
		144	libgstmultipart.dll
		145	libgstneon.dll
		146	libgstogg.dll
		147	libgstpcapparse.dll
		148	libgstplaybin.dll
		149	libgstpng.dll
		150	libgstqtdemux.dll
		151	libgstqueue2.dll
		152	libgstreal.dll
		153	libgstrealmedia.dll
		154	libgstrtp.dll
		155	libgstrtpmanager.dll
		156	libgstrtpmuxer.dll
		157	libgstrtsp.dll
		158	libgstsmpte.dll
		159	libgsttheora.dll
		160	libgsttypefindfunctions.dll
		161	libgstudp.dll
		162	libgstvideobalance.dll
		163	libgstvideobox.dll
		164	libgstvideocrop.dll
		165	libgstvideomixer.dll
		166	libgstvideorate.dll
		167	libgstvideoscale.dll
		168	libgstvideosignal.dll
		169	libgstvolume.dll
		170	libgstvorbis.dll
		171	libgstwasapi.dll
		172	libgstwavparse.dll
		173	libgstwininet.dll
		174	libgstwinks.dll
		175	libgstx264.dll
		176	libgstxvid.dll
		177	)
		178
		179	copy_if_different(
		180	${gst_plugin_debug_dir}
		181	"${CMAKE_CURRENT_BINARY_DIR}/Debug/lib/gstreamer-plugins"
		182	out_targets
		183	${gst_plugin_debug_files}
		184	)
		185	set(all_targets ${all_targets} ${out_targets})
		186
9	set(vivox_src_dir "${CMAKE_SOURCE_DIR}/newview/vivox-runtime/i686-win32")	187	set(vivox_src_dir "${CMAKE_SOURCE_DIR}/newview/vivox-runtime/i686-win32")
10	set(vivox_files	188	set(vivox_files
11	SLVoice.exe	189	SLVoice.exe
@@ -17,12 +195,15 @@ set(vivox_files
17		195
18	set(debug_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug")	196	set(debug_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug")
19	set(debug_files	197	set(debug_files
		198	alut.dll
20	freebl3.dll	199	freebl3.dll
21	gksvggdiplus.dll	200	gksvggdiplus.dll
22	js3250.dll	201	js3250.dll
23	nspr4.dll	202	nspr4.dll
24	nss3.dll	203	nss3.dll
25	nssckbi.dll	204	nssckbi.dll
		205	openal32.dll
		206	openjpegd.dll
26	plc4.dll	207	plc4.dll
27	plds4.dll	208	plds4.dll
28	smime3.dll	209	smime3.dll
@@ -30,8 +211,47 @@ set(debug_files
30	ssl3.dll	211	ssl3.dll
31	xpcom.dll	212	xpcom.dll
32	xul.dll	213	xul.dll
33	openjpegd.dll
34	windbgdlg.exe	214	windbgdlg.exe
		215	iconv.dll
		216	libxml2.dll
		217	libgio-2.0-0.dll
		218	libglib-2.0-0.dll
		219	libgmodule-2.0-0.dll
		220	libgobject-2.0-0.dll
		221	libgthread-2.0-0.dll
		222	avcodec-51.dll
		223	avformat-52.dll
		224	avutil-49.dll
		225	intl.dll
		226	libfaacdrm.dll
		227	libgstapp-0.10.dll
		228	libgstaudio-0.10.dll
		229	libgstbase-0.10.dll
		230	libgstcdda-0.10.dll
		231	libgstcontroller-0.10.dll
		232	libgstdataprotocol-0.10.dll
		233	libgstdshow-0.10.dll
		234	libgstfft-0.10.dll
		235	libgstinterfaces-0.10.dll
		236	libgstnet-0.10.dll
		237	libgstnetbuffer-0.10.dll
		238	libgstpbutils-0.10.dll
		239	libgstreamer-0.10.dll
		240	libgstriff-0.10.dll
		241	libgstrtp-0.10.dll
		242	libgstrtsp-0.10.dll
		243	libgstsdp-0.10.dll
		244	libgsttag-0.10.dll
		245	libgstvideo-0.10.dll
		246	libjpeg.dll
		247	libmms.dll
		248	liboil-0.3-0.dll
		249	libpng13.dll
		250	libspeex.dll
		251	ogg.dll
		252	vorbis.dll
		253	xvidcore.dll
		254	zlib1.dll
35	)	255	)
36		256
37	copy_if_different(	257	copy_if_different(
@@ -52,12 +272,15 @@ set(all_targets ${all_targets} ${out_targets})
52		272
53	set(release_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release")	273	set(release_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release")
54	set(release_files	274	set(release_files
		275	alut.dll
55	freebl3.dll	276	freebl3.dll
56	gksvggdiplus.dll	277	gksvggdiplus.dll
57	js3250.dll	278	js3250.dll
58	nspr4.dll	279	nspr4.dll
59	nss3.dll	280	nss3.dll
60	nssckbi.dll	281	nssckbi.dll
		282	openal32.dll
		283	openjpeg.dll
61	plc4.dll	284	plc4.dll
62	plds4.dll	285	plds4.dll
63	smime3.dll	286	smime3.dll
@@ -65,7 +288,46 @@ set(release_files
65	ssl3.dll	288	ssl3.dll
66	xpcom.dll	289	xpcom.dll
67	xul.dll	290	xul.dll
68	openjpeg.dll	291	iconv.dll
		292	libxml2.dll
		293	libgio-2.0-0.dll
		294	libglib-2.0-0.dll
		295	libgmodule-2.0-0.dll
		296	libgobject-2.0-0.dll
		297	libgthread-2.0-0.dll
		298	avcodec-51.dll
		299	avformat-52.dll
		300	avutil-49.dll
		301	intl.dll
		302	libfaacdrm.dll
		303	libgstapp-0.10.dll
		304	libgstaudio-0.10.dll
		305	libgstbase-0.10.dll
		306	libgstcdda-0.10.dll
		307	libgstcontroller-0.10.dll
		308	libgstdataprotocol-0.10.dll
		309	libgstdshow-0.10.dll
		310	libgstfft-0.10.dll
		311	libgstinterfaces-0.10.dll
		312	libgstnet-0.10.dll
		313	libgstnetbuffer-0.10.dll
		314	libgstpbutils-0.10.dll
		315	libgstreamer-0.10.dll
		316	libgstriff-0.10.dll
		317	libgstrtp-0.10.dll
		318	libgstrtsp-0.10.dll
		319	libgstsdp-0.10.dll
		320	libgsttag-0.10.dll
		321	libgstvideo-0.10.dll
		322	libjpeg.dll
		323	libmms.dll
		324	liboil-0.3-0.dll
		325	libpng13.dll
		326	libspeex.dll
		327	ogg.dll
		328	vorbis.dll
		329	xvidcore.dll
		330	zlib1.dll
69	)	331	)
70		332
71	copy_if_different(	333	copy_if_different(
@@ -100,48 +362,35 @@ copy_if_different(
100	)	362	)
101	set(all_targets ${all_targets} ${out_targets})	363	set(all_targets ${all_targets} ${out_targets})
102		364
103	set(internal_llkdu_path "${CMAKE_SOURCE_DIR}/llkdu")	365
104	if(EXISTS ${internal_llkdu_path})	366	# Copy MS C runtime dlls, required for packaging.
105	set(internal_llkdu_src "${CMAKE_BINARY_DIR}/llkdu/${CMAKE_CFG_INTDIR}/llkdu.dll")	367	# *TODO - Adapt this to support VC9
106	set(llkdu_dst "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/llkdu.dll")	368	if (MSVC80)
107	ADD_CUSTOM_COMMAND(	369	FIND_PATH(debug_msvc8_redist_path msvcr80d.dll
108	OUTPUT ${llkdu_dst}	370	PATHS
109	COMMAND ${CMAKE_COMMAND} -E copy_if_different ${internal_llkdu_src} ${llkdu_dst}	371	[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\8.0\\Setup\\VC;ProductDir]/redist/Debug_NonRedist/x86/Microsoft.VC80.DebugCRT
110	DEPENDS ${internal_llkdu_src}
111	COMMENT "Copying llkdu.dll ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}"
112	)
113	set(all_targets ${all_targets} ${llkdu_dst})
114	else(EXISTS ${internal_llkdu_path})
115	set(debug_llkdu_src "${debug_src_dir}/llkdu.dll")
116	set(debug_llkdu_dst "${CMAKE_CURRENT_BINARY_DIR}/Debug/llkdu.dll")
117	ADD_CUSTOM_COMMAND(
118	OUTPUT ${debug_llkdu_dst}
119	COMMAND ${CMAKE_COMMAND} -E copy_if_different ${debug_llkdu_src} ${debug_llkdu_dst}
120	DEPENDS ${debug_llkdu_src}
121	COMMENT "Copying llkdu.dll ${CMAKE_CURRENT_BINARY_DIR}/Debug"
122	)
123	set(all_targets ${all_targets} ${debug_llkdu_dst})
124
125	set(release_llkdu_src "${release_src_dir}/llkdu.dll")
126	set(release_llkdu_dst "${CMAKE_CURRENT_BINARY_DIR}/Release/llkdu.dll")
127	ADD_CUSTOM_COMMAND(
128	OUTPUT ${release_llkdu_dst}
129	COMMAND ${CMAKE_COMMAND} -E copy_if_different ${release_llkdu_src} ${release_llkdu_dst}
130	DEPENDS ${release_llkdu_src}
131	COMMENT "Copying llkdu.dll ${CMAKE_CURRENT_BINARY_DIR}/Release"
132	)	372	)
133	set(all_targets ${all_targets} ${release_llkdu_dst})	373
134		374	if(EXISTS ${debug_msvc8_redist_path})
135	set(relwithdebinfo_llkdu_dst "${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/llkdu.dll")	375	set(debug_msvc8_files
136	ADD_CUSTOM_COMMAND(	376	msvcr80d.dll
137	OUTPUT ${relwithdebinfo_llkdu_dst}	377	msvcp80d.dll
138	COMMAND ${CMAKE_COMMAND} -E copy_if_different ${release_llkdu_src} ${relwithdebinfo_llkdu_dst}	378	Microsoft.VC80.DebugCRT.manifest
139	DEPENDS ${release_llkdu_src}	379	)
140	COMMENT "Copying llkdu.dll ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo"	380
		381	copy_if_different(
		382	${debug_msvc8_redist_path}
		383	"${CMAKE_CURRENT_BINARY_DIR}/Debug"
		384	out_targets
		385	${debug_msvc8_files}
		386	)
		387	set(all_targets ${all_targets} ${out_targets})
		388	endif (EXISTS ${debug_msvc8_redist_path})
		389
		390	FIND_PATH(release_msvc8_redist_path msvcr80.dll
		391	PATHS
		392	[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\8.0\\Setup\\VC;ProductDir]/redist/x86/Microsoft.VC80.CRT
141	)	393	)
142	set(all_targets ${all_targets} ${relwithdebinfo_llkdu_dst})
143
144	endif (EXISTS ${internal_llkdu_path})
145		394
146	# Copy MS C runtime dlls, required for packaging.	395	# Copy MS C runtime dlls, required for packaging.
147	# *TODO - Adapt this to support VC9	396	# *TODO - Adapt this to support VC9
@@ -201,7 +450,3 @@ if (MSVC80)
201	endif (MSVC80)	450	endif (MSVC80)
202		451
203	add_custom_target(copy_win_libs ALL DEPENDS ${all_targets})	452	add_custom_target(copy_win_libs ALL DEPENDS ${all_targets})
204
205	if(EXISTS ${internal_llkdu_path})
206	add_dependencies(copy_win_libs llkdu)
207	endif(EXISTS ${internal_llkdu_path})