From 9ab038b8462f5e51e936642562ec21b4474da1fb Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Wed, 4 Feb 2009 10:52:53 -0700 Subject: Updated CMake files to RC1 --- linden/indra/cmake/CopyWinLibs.cmake | 88 +++++++++++++++++++++++++++++++++--- linden/indra/cmake/OPENAL.cmake | 13 ++++-- 2 files changed, 92 insertions(+), 9 deletions(-) (limited to 'linden/indra/cmake') diff --git a/linden/indra/cmake/CopyWinLibs.cmake b/linden/indra/cmake/CopyWinLibs.cmake index fdfcb3f..1484663 100644 --- a/linden/indra/cmake/CopyWinLibs.cmake +++ b/linden/indra/cmake/CopyWinLibs.cmake @@ -8,43 +8,81 @@ include(CMakeCopyIfDifferent) set(gst_plugin_debug_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug/gstreamer-plugins") set(gst_plugin_debug_files + libdshowsrcwrapper.dll + libfsselector.dll + libfsvalve.dll + libgstacmenc.dll libgstadder.dll libgstalaw.dll + libgstalpha.dll + libgstalphacolor.dll + libgstapp.dll + libgstaudiochunk.dll libgstaudioconvert.dll + libgstaudiofx.dll libgstaudiorate.dll libgstaudioresample.dll libgstaudiotestsrc.dll libgstautodetect.dll libgstavi.dll + libgstcoreelements.dll libgstcutter.dll libgstdecodebin2.dll libgstdecodebin.dll libgstdirectdraw.dll libgstdirectsound.dll - libgsteffectv.dll + libgstdshowdecwrapper.dll + libgstdshowsrcwrapper.dll + libgstdshowvideosink.dll + libgstdtmf.dll libgstffmpeg.dll libgstffmpegcolorspace.dll + libgstflv.dll libgstgdp.dll + libgsth264parse.dll + libgsticydemux.dll + libgstid3demux.dll libgstjpeg.dll + libgstlevel.dll + libgstmad.dll + libgstmms.dll + libgstmpeg2dec.dll + libgstmpegaudioparse.dll + libgstmpegstream.dll + libgstmpegvideoparse.dll + libgstmscodecs.dll libgstmulaw.dll + libgstmultipart.dll + libgstneon.dll libgstogg.dll libgstplaybin.dll + libgstpng.dll libgstqtdemux.dll - libgstrtp.dll + libgstqueue2.dll + libgstrtp.dll + libgstrtpmanager.dll + libgstrtpmuxer.dll libgstrtsp.dll + libgstsmpte.dll libgsttheora.dll libgsttypefindfunctions.dll libgstudp.dll libgstvideobalance.dll libgstvideobox.dll libgstvideocrop.dll - libgstvideoflip.dll libgstvideomixer.dll libgstvideorate.dll libgstvideoscale.dll + libgstvideosignal.dll libgstvideotestsrc.dll libgstvolume.dll + libgstvolume.dll libgstvorbis.dll + libgstwasapi.dll + libgstwavparse.dll + libgstwininet.dll + libgstx264.dll + libgstxvid.dll ) copy_if_different( @@ -57,43 +95,81 @@ set(all_targets ${all_targets} ${out_targets}) set(gst_plugin_release_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release/gstreamer-plugins") set(gst_plugin_release_files + libdshowsrcwrapper.dll + libfsselector.dll + libfsvalve.dll + libgstacmenc.dll libgstadder.dll libgstalaw.dll + libgstalpha.dll + libgstalphacolor.dll + libgstapp.dll + libgstaudiochunk.dll libgstaudioconvert.dll + libgstaudiofx.dll libgstaudiorate.dll libgstaudioresample.dll libgstaudiotestsrc.dll libgstautodetect.dll libgstavi.dll + libgstcoreelements.dll libgstcutter.dll libgstdecodebin2.dll libgstdecodebin.dll libgstdirectdraw.dll libgstdirectsound.dll - libgsteffectv.dll + libgstdshowdecwrapper.dll + libgstdshowsrcwrapper.dll + libgstdshowvideosink.dll + libgstdtmf.dll libgstffmpeg.dll libgstffmpegcolorspace.dll + libgstflv.dll libgstgdp.dll + libgsth264parse.dll + libgsticydemux.dll + libgstid3demux.dll libgstjpeg.dll + libgstlevel.dll + libgstmad.dll + libgstmms.dll + libgstmpeg2dec.dll + libgstmpegaudioparse.dll + libgstmpegstream.dll + libgstmpegvideoparse.dll + libgstmscodecs.dll libgstmulaw.dll + libgstmultipart.dll + libgstneon.dll libgstogg.dll libgstplaybin.dll + libgstpng.dll libgstqtdemux.dll - libgstrtp.dll + libgstqueue2.dll + libgstrtp.dll + libgstrtpmanager.dll + libgstrtpmuxer.dll libgstrtsp.dll + libgstsmpte.dll libgsttheora.dll libgsttypefindfunctions.dll libgstudp.dll libgstvideobalance.dll libgstvideobox.dll libgstvideocrop.dll - libgstvideoflip.dll libgstvideomixer.dll libgstvideorate.dll libgstvideoscale.dll + libgstvideosignal.dll libgstvideotestsrc.dll libgstvolume.dll + libgstvolume.dll libgstvorbis.dll + libgstwasapi.dll + libgstwavparse.dll + libgstwininet.dll + libgstx264.dll + libgstxvid.dll ) copy_if_different( diff --git a/linden/indra/cmake/OPENAL.cmake b/linden/indra/cmake/OPENAL.cmake index a2bae5d..f24ec22 100644 --- a/linden/indra/cmake/OPENAL.cmake +++ b/linden/indra/cmake/OPENAL.cmake @@ -9,8 +9,15 @@ if (OPENAL) # OPENAL_LIB + if (WINDOWS) find_library(OPENAL_LIB - NAMES openal OpenAL OpenAL32 wrap_oal + NAMES openal openal32 OpenAL OpenAL32 wrap_oal + PATHS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/libraries/i686-win32/lib/release/ + ) + + else (WINDOWS) + find_library(OPENAL_LIB + NAMES openal openal32 OpenAL OpenAL32 wrap_oal PATHS ${ARCH_PREBUILT_DIRS_RELEASE} ) @@ -26,7 +33,7 @@ if (OPENAL) find_path(OPENAL_INCLUDE_DIR NAMES al.h - PATHS ${LIBS_PREBUILT_DIR}/include /usr/include/AL + PATHS ${LIBS_PREBUILT_DIR}/include/AL /usr/include/AL ) if (NOT OPENAL_INCLUDE_DIR) @@ -56,7 +63,7 @@ if (OPENAL) find_path(ALUT_INCLUDE_DIR NAMES alut.h - PATHS ${LIBS_PREBUILT_DIR}/include /usr/include/AL + PATHS ${LIBS_PREBUILT_DIR}/include/AL /usr/include/AL ) if (NOT ALUT_INCLUDE_DIR) -- cgit v1.1 From 40811dbf0d99f07acaedcd8c0f01803b39971df9 Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Fri, 6 Feb 2009 01:49:25 -0700 Subject: develop.py should now work again under windows --- linden/indra/cmake/CopyWinLibs.cmake | 25 +++++++++++-------------- linden/indra/cmake/GStreamer.cmake | 2 ++ linden/indra/cmake/OPENAL.cmake | 13 +++++++++++-- 3 files changed, 24 insertions(+), 16 deletions(-) (limited to 'linden/indra/cmake') diff --git a/linden/indra/cmake/CopyWinLibs.cmake b/linden/indra/cmake/CopyWinLibs.cmake index 1484663..e80f0c3 100644 --- a/linden/indra/cmake/CopyWinLibs.cmake +++ b/linden/indra/cmake/CopyWinLibs.cmake @@ -6,8 +6,8 @@ include(CMakeCopyIfDifferent) -set(gst_plugin_debug_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug/gstreamer-plugins") -set(gst_plugin_debug_files +set(gst_plugin_release_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release/lib/gstreamer-plugins") +set(gst_plugin_release_files libdshowsrcwrapper.dll libfsselector.dll libfsvalve.dll @@ -86,15 +86,15 @@ set(gst_plugin_debug_files ) copy_if_different( - ${gst_plugin_debug_dir} - "${CMAKE_CURRENT_BINARY_DIR}/Debug/lib/gstreamer-plugins" + ${gst_plugin_release_dir} + "${CMAKE_CURRENT_BINARY_DIR}/Release/lib/gstreamer-plugins" out_targets - ${gst_plugin_debug_files} + ${gst_plugin_release_files} ) set(all_targets ${all_targets} ${out_targets}) -set(gst_plugin_release_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release/gstreamer-plugins") -set(gst_plugin_release_files +set(gst_plugin_debug_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug/lib/gstreamer-plugins") +set(gst_plugin_debug_files libdshowsrcwrapper.dll libfsselector.dll libfsvalve.dll @@ -173,10 +173,10 @@ set(gst_plugin_release_files ) copy_if_different( - ${gst_plugin_release_dir} - "${CMAKE_CURRENT_BINARY_DIR}/Release/lib/gstreamer-plugins" + ${gst_plugin_debug_dir} + "${CMAKE_CURRENT_BINARY_DIR}/Debug/lib/gstreamer-plugins" out_targets - ${gst_plugin_release_files} + ${gst_plugin_debug_files} ) set(all_targets ${all_targets} ${out_targets}) @@ -184,11 +184,8 @@ set(vivox_src_dir "${CMAKE_SOURCE_DIR}/newview/vivox-runtime/i686-win32") set(vivox_files tntk.dll libeay32.dll - SLVoice.exe ssleay32.dll - SLVoiceAgent.exe srtp.dll - vivoxsdk.dll ortp.dll wrap_oal.dll ) @@ -414,4 +411,4 @@ if (MSVC80) endif (EXISTS ${release_msvc8_redist_path}) endif (MSVC80) -add_custom_target(copy_win_libs ALL DEPENDS ${all_targets}) +add_custom_target(copy_win_libs ALL DEPENDS ${all_targets}) \ No newline at end of file diff --git a/linden/indra/cmake/GStreamer.cmake b/linden/indra/cmake/GStreamer.cmake index fc256a8..b4b984d 100644 --- a/linden/indra/cmake/GStreamer.cmake +++ b/linden/indra/cmake/GStreamer.cmake @@ -10,6 +10,8 @@ include(Prebuilt) if (WINDOWS) use_prebuilt_binary(libxml) + use_prebuilt_binary(iconv) + use_prebuilt_binary(gstreamer-plugins) set(GSTREAMER_FOUND ON FORCE BOOL) set(GSTREAMER_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/glib diff --git a/linden/indra/cmake/OPENAL.cmake b/linden/indra/cmake/OPENAL.cmake index f24ec22..5e71f66 100644 --- a/linden/indra/cmake/OPENAL.cmake +++ b/linden/indra/cmake/OPENAL.cmake @@ -12,7 +12,7 @@ if (OPENAL) if (WINDOWS) find_library(OPENAL_LIB NAMES openal openal32 OpenAL OpenAL32 wrap_oal - PATHS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/libraries/i686-win32/lib/release/ + PATHS ${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release ) else (WINDOWS) @@ -20,7 +20,8 @@ if (OPENAL) NAMES openal openal32 OpenAL OpenAL32 wrap_oal PATHS ${ARCH_PREBUILT_DIRS_RELEASE} ) - + endif (WINDOWS) + if (NOT OPENAL_LIB) message(FATAL_ERROR "OpenAL not found!") else (NOT OPENAL_LIB) @@ -46,10 +47,18 @@ if (OPENAL) # ALUT_LIB + if (WINDOWS) + find_library(ALUT_LIB + NAMES alut freealut + PATHS ${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release + ) + + else (WINDOWS) find_library(ALUT_LIB NAMES alut freealut PATHS ${ARCH_PREBUILT_DIRS_RELEASE} ) + endif (WINDOWS) if (NOT ALUT_LIB) message(FATAL_ERROR "ALUT not found!") -- cgit v1.1