aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/cmake
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/cmake')
-rw-r--r--linden/indra/cmake/00-Common.cmake17
-rw-r--r--linden/indra/cmake/APR.cmake2
-rw-r--r--linden/indra/cmake/CopyWinLibs.cmake337
-rw-r--r--linden/indra/cmake/FMOD.cmake2
-rw-r--r--linden/indra/cmake/GStreamer.cmake110
-rw-r--r--linden/indra/cmake/LLAudio.cmake2
-rw-r--r--linden/indra/cmake/LLKDU.cmake18
-rw-r--r--linden/indra/cmake/LLMedia.cmake7
-rw-r--r--linden/indra/cmake/NDOF.cmake6
-rw-r--r--linden/indra/cmake/OPENAL.cmake125
-rw-r--r--linden/indra/cmake/QuickTime.cmake49
-rw-r--r--linden/indra/cmake/UnixInstall.cmake4
-rw-r--r--linden/indra/cmake/Variables.cmake2
13 files changed, 523 insertions, 158 deletions
diff --git a/linden/indra/cmake/00-Common.cmake b/linden/indra/cmake/00-Common.cmake
index bf2d2c3..27838d6 100644
--- a/linden/indra/cmake/00-Common.cmake
+++ b/linden/indra/cmake/00-Common.cmake
@@ -57,6 +57,21 @@ if (WINDOWS)
57 /Zc:wchar_t- 57 /Zc:wchar_t-
58 ) 58 )
59 endif (MSVC80 OR MSVC90) 59 endif (MSVC80 OR MSVC90)
60
61 # VS optimization flags
62 if(MSVC80)
63
64 set(NUMBER_OF_CORES $ENV{NUMBER_OF_PROCESSORS})
65
66 set(CMAKE_CXX_FLAGS_RELEASE
67 "${CMAKE_CXX_FLAGS_RELEASE} /Ob2 /Oi /Ot /GT"
68 CACHE STRING "C++ compiler release options" FORCE)
69
70 add_definitions(
71 /MP${NUMBER_OF_CORES}
72 )
73
74 endif (MSVC80)
60 75
61 # Are we using the crummy Visual Studio KDU build workaround? 76 # Are we using the crummy Visual Studio KDU build workaround?
62 if (NOT VS_DISABLE_FATAL_WARNINGS) 77 if (NOT VS_DISABLE_FATAL_WARNINGS)
@@ -150,7 +165,7 @@ if (LINUX)
150 endif (SERVER) 165 endif (SERVER)
151 166
152 if (VIEWER) 167 if (VIEWER)
153 add_definitions(-DAPPID=secondlife) 168 add_definitions(-DAPPID=imprudence)
154 add_definitions(-fvisibility=hidden) 169 add_definitions(-fvisibility=hidden)
155 if (NOT STANDALONE) 170 if (NOT STANDALONE)
156 # this stops us requiring a really recent glibc at runtime 171 # this stops us requiring a really recent glibc at runtime
diff --git a/linden/indra/cmake/APR.cmake b/linden/indra/cmake/APR.cmake
index 523d8ee..088b3e6 100644
--- a/linden/indra/cmake/APR.cmake
+++ b/linden/indra/cmake/APR.cmake
@@ -27,6 +27,8 @@ else (STANDALONE)
27 debug ${ARCH_PREBUILT_DIRS_DEBUG}/apriconv-1.lib 27 debug ${ARCH_PREBUILT_DIRS_DEBUG}/apriconv-1.lib
28 optimized ${ARCH_PREBUILT_DIRS_RELEASE}/apriconv-1.lib 28 optimized ${ARCH_PREBUILT_DIRS_RELEASE}/apriconv-1.lib
29 ) 29 )
30 # Doesn't need to link with iconv.dll
31 set(APRICONV_LIBRARIES "")
30 elseif (DARWIN) 32 elseif (DARWIN)
31 set(APR_LIBRARIES 33 set(APR_LIBRARIES
32 debug ${ARCH_PREBUILT_DIRS_DEBUG}/libapr-1.a 34 debug ${ARCH_PREBUILT_DIRS_DEBUG}/libapr-1.a
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
7include(CMakeCopyIfDifferent) 7include(CMakeCopyIfDifferent)
8 8
9set(gst_plugin_release_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release/lib/gstreamer-plugins")
10set(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
90copy_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 )
96set(all_targets ${all_targets} ${out_targets})
97
98set(gst_plugin_debug_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug/lib/gstreamer-plugins")
99set(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
179copy_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 )
185set(all_targets ${all_targets} ${out_targets})
186
9set(vivox_src_dir "${CMAKE_SOURCE_DIR}/newview/vivox-runtime/i686-win32") 187set(vivox_src_dir "${CMAKE_SOURCE_DIR}/newview/vivox-runtime/i686-win32")
10set(vivox_files 188set(vivox_files
11 SLVoice.exe 189 SLVoice.exe
@@ -17,12 +195,15 @@ set(vivox_files
17 195
18set(debug_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug") 196set(debug_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug")
19set(debug_files 197set(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
37copy_if_different( 257copy_if_different(
@@ -52,12 +272,15 @@ set(all_targets ${all_targets} ${out_targets})
52 272
53set(release_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release") 273set(release_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release")
54set(release_files 274set(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
71copy_if_different( 333copy_if_different(
@@ -100,48 +362,35 @@ copy_if_different(
100 ) 362 )
101set(all_targets ${all_targets} ${out_targets}) 363set(all_targets ${all_targets} ${out_targets})
102 364
103set(internal_llkdu_path "${CMAKE_SOURCE_DIR}/llkdu") 365
104if(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") 368if (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})
114else(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
144endif (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)
201endif (MSVC80) 450endif (MSVC80)
202 451
203add_custom_target(copy_win_libs ALL DEPENDS ${all_targets}) 452add_custom_target(copy_win_libs ALL DEPENDS ${all_targets})
204
205if(EXISTS ${internal_llkdu_path})
206 add_dependencies(copy_win_libs llkdu)
207endif(EXISTS ${internal_llkdu_path})
diff --git a/linden/indra/cmake/FMOD.cmake b/linden/indra/cmake/FMOD.cmake
index 759b8f1..e9f483a 100644
--- a/linden/indra/cmake/FMOD.cmake
+++ b/linden/indra/cmake/FMOD.cmake
@@ -7,6 +7,7 @@ if(INSTALL_PROPRIETARY)
7 use_prebuilt_binary(fmod) 7 use_prebuilt_binary(fmod)
8endif(INSTALL_PROPRIETARY) 8endif(INSTALL_PROPRIETARY)
9 9
10if (FMOD)
10find_library(FMOD_LIBRARY_RELEASE 11find_library(FMOD_LIBRARY_RELEASE
11 NAMES fmod fmodvc fmod-3.75 12 NAMES fmod fmodvc fmod-3.75
12 PATHS 13 PATHS
@@ -18,6 +19,7 @@ find_library(FMOD_LIBRARY_DEBUG
18 PATHS 19 PATHS
19 ${ARCH_PREBUILT_DIRS_DEBUG} 20 ${ARCH_PREBUILT_DIRS_DEBUG}
20 ) 21 )
22endif (FMOD)
21 23
22if (FMOD_LIBRARY_RELEASE AND FMOD_LIBRARY_DEBUG) 24if (FMOD_LIBRARY_RELEASE AND FMOD_LIBRARY_DEBUG)
23 set(FMOD_LIBRARY 25 set(FMOD_LIBRARY
diff --git a/linden/indra/cmake/GStreamer.cmake b/linden/indra/cmake/GStreamer.cmake
index 10d5207..880233e 100644
--- a/linden/indra/cmake/GStreamer.cmake
+++ b/linden/indra/cmake/GStreamer.cmake
@@ -1,33 +1,111 @@
1# -*- cmake -*- 1# -*- cmake -*-
2include(Prebuilt) 2include(Prebuilt)
3 3
4if (STANDALONE)
5 include(FindPkgConfig)
6
7 pkg_check_modules(GSTREAMER REQUIRED gstreamer-0.10)
8 pkg_check_modules(GSTREAMER_PLUGINS_BASE REQUIRED gstreamer-plugins-base-0.10)
9elseif (LINUX)
10 use_prebuilt_binary(gstreamer)
11 # possible libxml should have its own .cmake file instead 4 # possible libxml should have its own .cmake file instead
12 use_prebuilt_binary(libxml) 5 use_prebuilt_binary(libxml)
13 set(GSTREAMER_FOUND ON FORCE BOOL) 6 set(GSTREAMER_FOUND ON FORCE BOOL)
14 set(GSTREAMER_PLUGINS_BASE_FOUND ON FORCE BOOL) 7 set(GSTREAMER_PLUGINS_BASE_FOUND ON FORCE BOOL)
8 use_prebuilt_binary(gstreamer)
9
10if (WINDOWS)
11
12 use_prebuilt_binary(libxml)
13 use_prebuilt_binary(iconv)
14 use_prebuilt_binary(gstreamer-plugins)
15 set(GSTREAMER_FOUND ON FORCE BOOL)
15 set(GSTREAMER_INCLUDE_DIRS 16 set(GSTREAMER_INCLUDE_DIRS
16 ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/gstreamer-0.10 17 ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/glib
17 ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/glib-2.0 18 ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/gio
19 ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/gobject
18 ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/libxml2 20 ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/libxml2
21 ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/iconv
22 ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/gst
19 ) 23 )
20 # We don't need to explicitly link against gstreamer itself, because 24
21 # LLMediaImplGStreamer probes for the system's copy at runtime.
22 set(GSTREAMER_LIBRARIES 25 set(GSTREAMER_LIBRARIES
23 gobject-2.0 26 glib-2.0
27 gio-2.0
24 gmodule-2.0 28 gmodule-2.0
25 dl 29 gobject-2.0
26 gthread-2.0 30 gthread-2.0
27 rt 31 libgstvideo-0.10
28 glib-2.0 32 libgsttag-0.10
33 libgstsdp-0.10
34 libgstrtsp-0.10
35 libgstrtp-0.10
36 libgstriff-0.10
37 libgstreamer-0.10
38 libgstpbutils-0.10
39 libgstnetbuffer-0.10
40 libgstnet-0.10
41 libgstinterfaces-0.10
42 libgstdshow-0.10
43 libgstdataprotocol-0.10
44 libgstcontroller-0.10
45 libgstbase-0.10
46 libgstaudio-0.10
47 libgstapp-0.10
48 libxml2
49 libxml2_a
50 libxml2_a_dll
51 iconv
52 iconv_a
29 ) 53 )
30endif (STANDALONE) 54
55else (WINDOWS)
56
57 set(GSTREAMER_INCLUDE_DIRS
58 ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/gstreamer-0.10
59 ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/glib-2.0
60 ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/glib-2.0/glib
61 ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/glib-2.0/gobject
62 ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/libxml2
63 )
64
65 if (DARWIN)
66
67 find_library( XML2_LIB
68 NAMES xml2.2
69 PATHS ${ARCH_PREBUILT_DIRS_RELEASE}
70 NO_DEFAULT_PATH
71 DOC "libxml2 dynamic library / shared object" )
72
73 if (NOT XML2_LIB)
74 message(FATAL_ERROR "libxml2 not found!")
75 else (NOT XML2_LIB)
76 #message(STATUS "libxml2 found: ${XML2_LIB}")
77 endif (NOT XML2_LIB)
78
79 set(GSTREAMER_LIBRARIES
80 gstvideo-0.10
81 gstaudio-0.10
82 gstbase-0.10
83 gstreamer-0.10
84 gobject-2.0
85 gmodule-2.0
86 gthread-2.0
87 glib-2.0
88 ${XML2_LIB}
89 )
90
91 else (DARWIN)
92
93 set(GSTREAMER_LIBRARIES
94 gstvideo-0.10
95 gstaudio-0.10
96 gstbase-0.10
97 gstreamer-0.10
98 gobject-2.0
99 gmodule-2.0
100 dl
101 gthread-2.0
102 rt
103 glib-2.0
104 )
105
106 endif (DARWIN)
107
108endif (WINDOWS)
31 109
32if (GSTREAMER_FOUND AND GSTREAMER_PLUGINS_BASE_FOUND) 110if (GSTREAMER_FOUND AND GSTREAMER_PLUGINS_BASE_FOUND)
33 set(GSTREAMER ON CACHE BOOL "Build with GStreamer streaming media support.") 111 set(GSTREAMER ON CACHE BOOL "Build with GStreamer streaming media support.")
diff --git a/linden/indra/cmake/LLAudio.cmake b/linden/indra/cmake/LLAudio.cmake
index ff479f6..dcfd269 100644
--- a/linden/indra/cmake/LLAudio.cmake
+++ b/linden/indra/cmake/LLAudio.cmake
@@ -1,9 +1,11 @@
1# -*- cmake -*- 1# -*- cmake -*-
2 2
3include(Audio) 3include(Audio)
4include(OPENAL)
4 5
5set(LLAUDIO_INCLUDE_DIRS 6set(LLAUDIO_INCLUDE_DIRS
6 ${LIBS_OPEN_DIR}/llaudio 7 ${LIBS_OPEN_DIR}/llaudio
8 ${OPENAL_INCLUDE_DIRS}
7 ) 9 )
8 10
9set(LLAUDIO_LIBRARIES 11set(LLAUDIO_LIBRARIES
diff --git a/linden/indra/cmake/LLKDU.cmake b/linden/indra/cmake/LLKDU.cmake
deleted file mode 100644
index f103dcf..0000000
--- a/linden/indra/cmake/LLKDU.cmake
+++ /dev/null
@@ -1,18 +0,0 @@
1# -*- cmake -*-
2include(Prebuilt)
3
4if (NOT STANDALONE AND EXISTS ${LIBS_CLOSED_DIR}/llkdu)
5 use_prebuilt_binary(kdu)
6 if (WINDOWS)
7 set(KDU_LIBRARY debug kdu_cored optimized kdu_core)
8 else (WINDOWS)
9 set(KDU_LIBRARY kdu)
10 endif (WINDOWS)
11
12 set(KDU_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include)
13
14 set(LLKDU_LIBRARY llkdu)
15 set(LLKDU_STATIC_LIBRARY llkdu_static)
16 set(LLKDU_LIBRARIES ${LLKDU_LIBRARY})
17 set(LLKDU_STATIC_LIBRARIES ${LLKDU_STATIC_LIBRARY})
18endif (NOT STANDALONE AND EXISTS ${LIBS_CLOSED_DIR}/llkdu)
diff --git a/linden/indra/cmake/LLMedia.cmake b/linden/indra/cmake/LLMedia.cmake
index 91c7818..8a36a69 100644
--- a/linden/indra/cmake/LLMedia.cmake
+++ b/linden/indra/cmake/LLMedia.cmake
@@ -1,10 +1,13 @@
1# -*- cmake -*- 1# -*- cmake -*-
2 2
3include(GStreamer) 3include(GStreamer)
4include(QuickTime)
5 4
6set(LLMEDIA_INCLUDE_DIRS 5set(LLMEDIA_INCLUDE_DIRS
7 ${LIBS_OPEN_DIR}/llmedia 6 ${LIBS_OPEN_DIR}/llmedia
8 ) 7 )
9 8
10set(LLMEDIA_LIBRARIES llmedia) 9set(LLMEDIA_LIBRARIES
10 llmedia
11 ${GSTREAMER_LIBRARIES}
12 ${GSTREAMER_PLUGINS_BASE_LIBRARIES}
13 )
diff --git a/linden/indra/cmake/NDOF.cmake b/linden/indra/cmake/NDOF.cmake
index 3f715a2..dad74e9 100644
--- a/linden/indra/cmake/NDOF.cmake
+++ b/linden/indra/cmake/NDOF.cmake
@@ -3,12 +3,12 @@ include(Prebuilt)
3 3
4use_prebuilt_binary(ndofdev) 4use_prebuilt_binary(ndofdev)
5 5
6if (WINDOWS OR DARWIN) 6if (WINDOWS OR DARWIN OR LINUX)
7 add_definitions(-DLIB_NDOF=1) 7 add_definitions(-DLIB_NDOF=1)
8endif (WINDOWS OR DARWIN) 8endif (WINDOWS OR DARWIN OR LINUX)
9 9
10if (WINDOWS) 10if (WINDOWS)
11 set(NDOF_LIBRARY libndofdev) 11 set(NDOF_LIBRARY libndofdev)
12elseif (DARWIN) 12elseif (DARWIN OR LINUX)
13 set(NDOF_LIBRARY ndofdev) 13 set(NDOF_LIBRARY ndofdev)
14endif (WINDOWS) 14endif (WINDOWS)
diff --git a/linden/indra/cmake/OPENAL.cmake b/linden/indra/cmake/OPENAL.cmake
index eb195a0..94fa75d 100644
--- a/linden/indra/cmake/OPENAL.cmake
+++ b/linden/indra/cmake/OPENAL.cmake
@@ -1,28 +1,113 @@
1# -*- cmake -*- 1# -*- cmake -*-
2
3include(Variables)
2include(Linking) 4include(Linking)
3include(Prebuilt)
4 5
5if (LINUX) 6set(OPENAL ON CACHE BOOL "Enable OpenAL")
6 set(OPENAL ON CACHE BOOL "Enable OpenAL") 7
7else (LINUX)
8 set(OPENAL OFF CACHE BOOL "Enable OpenAL")
9endif (LINUX)
10 8
11if (OPENAL) 9if (OPENAL)
12 if (STANDALONE) 10
13 include(FindPkgConfig) 11 # message(STATUS "Building with OpenAL audio support")
14 include(FindOpenAL) 12
15 pkg_check_modules(OPENAL_LIB REQUIRED openal) 13 # OPENAL_LIB
16 pkg_check_modules(FREEALUT_LIB REQUIRED freealut) 14
17 else (STANDALONE) 15 if (WINDOWS)
18 use_prebuilt_binary(openal) 16 find_library(OPENAL_LIB
19 endif (STANDALONE) 17 NAMES openal32
20 set(OPENAL_LIBRARIES 18 PATHS ${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release
21 openal 19 )
22 alut 20 elseif (DARWIN)
21 # Look for for system's OpenAL.framework
22 find_library(OPENAL_LIB
23 NAMES openal.1
24 PATHS ${ARCH_PREBUILT_DIRS_RELEASE}
25 NO_DEFAULT_PATH
26 )
27 else (WINDOWS)
28 set(OPENAL_LIB openal)
29 endif (WINDOWS)
30
31 if (NOT OPENAL_LIB)
32 message(FATAL_ERROR "OpenAL not found!")
33 else (NOT OPENAL_LIB)
34 # message(STATUS "OpenAL found: ${OPENAL_LIB}")
35 endif (NOT OPENAL_LIB)
36
37
38
39 # OPENAL_INCLUDE_DIR
40
41 if (DARWIN)
42 set(OPENAL_INCLUDE_DIR "${LIBS_PREBUILT_DIR}/include/AL")
43 else (DARWIN)
44 find_path(OPENAL_INCLUDE_DIR
45 NAMES al.h
46 PATHS ${LIBS_PREBUILT_DIR}/include/AL
47 )
48 endif (DARWIN)
49
50 if (NOT OPENAL_INCLUDE_DIR)
51 message(FATAL_ERROR "al.h not found!")
52 else (NOT OPENAL_INCLUDE_DIR)
53 # message(STATUS "al.h found in: ${OPENAL_INCLUDE_DIR}")
54 endif (NOT OPENAL_INCLUDE_DIR)
55
56
57
58 # ALUT_LIB
59
60 if (WINDOWS)
61 find_library(ALUT_LIB
62 NAMES alut freealut
63 PATHS ${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release
64 )
65 elseif (DARWIN)
66 find_library( ALUT_LIB
67 NAMES alut.0
68 PATHS ${ARCH_PREBUILT_DIRS_RELEASE}
69 NO_DEFAULT_PATH
70 )
71 else (WINDOWS)
72 set(ALUT_LIB alut)
73 endif (WINDOWS)
74
75 if (NOT ALUT_LIB)
76 message(FATAL_ERROR "ALUT not found!")
77 else (NOT ALUT_LIB)
78 # message(STATUS "ALUT found: ${ALUT_LIB}")
79 endif (NOT ALUT_LIB)
80
81
82
83 # ALUT_INCLUDE_DIR
84
85 find_path(ALUT_INCLUDE_DIR
86 NAMES alut.h
87 PATHS ${LIBS_PREBUILT_DIR}/include/AL
88 )
89
90 if (NOT ALUT_INCLUDE_DIR)
91 message(FATAL_ERROR "alut.h not found!")
92 else (NOT ALUT_INCLUDE_DIR)
93 # message(STATUS "alut.h found in: ${ALUT_INCLUDE_DIR}")
94 endif (NOT ALUT_INCLUDE_DIR)
95
96
97
98 set(OPENAL_LIBRARIES
99 ${OPENAL_LIB}
100 ${ALUT_LIB}
101 )
102
103 set(OPENAL_INCLUDE_DIRS
104 ${OPENAL_INCLUDE_DIR}
105 ${ALUT_INCLUDE_DIR}
106 )
107
108
109 set(OPENAL_FOUND TRUE CACHE BOOL
110 "Found OpenAL and ALUT libraries successfully"
23 ) 111 )
24endif (OPENAL)
25 112
26if (OPENAL)
27 message(STATUS "Building with OpenAL audio support")
28endif (OPENAL) 113endif (OPENAL)
diff --git a/linden/indra/cmake/QuickTime.cmake b/linden/indra/cmake/QuickTime.cmake
deleted file mode 100644
index 4352709..0000000
--- a/linden/indra/cmake/QuickTime.cmake
+++ /dev/null
@@ -1,49 +0,0 @@
1# -*- cmake -*-
2
3if(INSTALL_PROPRIETARY)
4 include(Prebuilt)
5 use_prebuilt_binary(quicktime)
6endif(INSTALL_PROPRIETARY)
7
8if (DARWIN)
9 include(CMakeFindFrameworks)
10 find_library(QUICKTIME_LIBRARY QuickTime)
11elseif (WINDOWS)
12 set(QUICKTIME_SDK_DIR "$ENV{PROGRAMFILES}/QuickTime SDK"
13 CACHE PATH "Location of the QuickTime SDK.")
14
15 find_library(DEBUG_QUICKTIME_LIBRARY qtmlclient
16 PATHS
17 ${ARCH_PREBUILT_DIRS_DEBUG}
18 "${QUICKTIME_SDK_DIR}\\libraries"
19 )
20
21 find_library(RELEASE_QUICKTIME_LIBRARY qtmlclient
22 PATHS
23 ${ARCH_PREBUILT_DIRS_RELEASE}
24 "${QUICKTIME_SDK_DIR}\\libraries"
25 )
26
27 if (DEBUG_QUICKTIME_LIBRARY AND RELEASE_QUICKTIME_LIBRARY)
28 set(QUICKTIME_LIBRARY
29 optimized ${RELEASE_QUICKTIME_LIBRARY}
30 debug ${DEBUG_QUICKTIME_LIBRARY}
31 )
32
33 endif (DEBUG_QUICKTIME_LIBRARY AND RELEASE_QUICKTIME_LIBRARY)
34
35 include_directories(
36 ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/quicktime
37 "${QUICKTIME_SDK_DIR}\\CIncludes"
38 )
39endif (DARWIN)
40
41mark_as_advanced(QUICKTIME_LIBRARY)
42
43if (QUICKTIME_LIBRARY)
44 set(QUICKTIME ON CACHE BOOL "Build with QuickTime streaming media support.")
45endif (QUICKTIME_LIBRARY)
46
47if (QUICKTIME)
48 add_definitions(-DLL_QUICKTIME_ENABLED=1)
49endif (QUICKTIME)
diff --git a/linden/indra/cmake/UnixInstall.cmake b/linden/indra/cmake/UnixInstall.cmake
index 139be0a..0234dee 100644
--- a/linden/indra/cmake/UnixInstall.cmake
+++ b/linden/indra/cmake/UnixInstall.cmake
@@ -21,11 +21,11 @@ if (INSTALL)
21 set(INSTALL_SHARE_DIR ${INSTALL_PREFIX}/share CACHE PATH 21 set(INSTALL_SHARE_DIR ${INSTALL_PREFIX}/share CACHE PATH
22 "Installation directory for read-only shared files.") 22 "Installation directory for read-only shared files.")
23 23
24 set(APP_BINARY_DIR ${INSTALL_LIBRARY_DIR}/secondlife-${viewer_VERSION} 24 set(APP_BINARY_DIR ${INSTALL_LIBRARY_DIR}/imprudence-${viewer_VERSION}
25 CACHE PATH 25 CACHE PATH
26 "Installation directory for binaries.") 26 "Installation directory for binaries.")
27 27
28 set(APP_SHARE_DIR ${INSTALL_SHARE_DIR}/secondlife-${viewer_VERSION} 28 set(APP_SHARE_DIR ${INSTALL_SHARE_DIR}/imprudence-${viewer_VERSION}
29 CACHE PATH 29 CACHE PATH
30 "Installation directory for read-only data files.") 30 "Installation directory for read-only data files.")
31endif (INSTALL) 31endif (INSTALL)
diff --git a/linden/indra/cmake/Variables.cmake b/linden/indra/cmake/Variables.cmake
index 5868e4d..8f33a95 100644
--- a/linden/indra/cmake/Variables.cmake
+++ b/linden/indra/cmake/Variables.cmake
@@ -79,7 +79,7 @@ endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
79set(GRID agni CACHE STRING "Target Grid") 79set(GRID agni CACHE STRING "Target Grid")
80 80
81set(VIEWER ON CACHE BOOL "Build Second Life viewer.") 81set(VIEWER ON CACHE BOOL "Build Second Life viewer.")
82set(VIEWER_CHANNEL "Developer" CACHE STRING "Viewer Channel Name") 82set(VIEWER_CHANNEL "Imprudence" CACHE STRING "Viewer Channel Name")
83set(VIEWER_LOGIN_CHANNEL ${VIEWER_CHANNEL} CACHE STRING "Fake login channel for A/B Testing") 83set(VIEWER_LOGIN_CHANNEL ${VIEWER_CHANNEL} CACHE STRING "Fake login channel for A/B Testing")
84 84
85set(STANDALONE OFF CACHE BOOL "Do not use Linden-supplied prebuilt libraries.") 85set(STANDALONE OFF CACHE BOOL "Do not use Linden-supplied prebuilt libraries.")
generated by cgit v1.1 at 2025-01-30 22:47:43 +0000