livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge

meow-7.2.2
Ansariel 2016-10-14 18:02:06 +02:00
parent 31680c69e3 89e2da5a39
commit d5ab0a9cdf
4 changed files with 11 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
autobuild.xml
View File

@ -3618,7 +3618,6 @@
<array>
<string>--fmodex</string>
<string>--kdu</string>
<string>--quicktime</string>
<string>--version</string>
<string>--platform win32</string>
</array>
@ -3655,7 +3654,6 @@
<array>
<string>--fmodex</string>
<string>--kdu</string>
<string>--quicktime</string>
<string>--version</string>
<string>--platform win32</string>
</array>
@ -3692,7 +3690,6 @@
<array>
<string>--fmodex</string>
<string>--kdu</string>
<string>--quicktime</string>
<string>--version</string>
<string>--platform win32</string>
</array>

10
indra/media_plugins/gstreamer10/CMakeLists.txt
View File

@ -62,11 +62,11 @@ target_link_libraries(media_plugin_gstreamer10
${GSTREAMER10_LIBRARIES}
)
add_dependencies(media_plugin_gstreamer10
${LLPLUGIN_LIBRARIES}
${MEDIA_PLUGIN_BASE_LIBRARIES}
${LLCOMMON_LIBRARIES}
)
#add_dependencies(media_plugin_gstreamer10
# ${LLPLUGIN_LIBRARIES}
# ${MEDIA_PLUGIN_BASE_LIBRARIES}
# ${LLCOMMON_LIBRARIES}
#)
if (WINDOWS)
set_target_properties(

10
indra/media_plugins/libvlc/CMakeLists.txt
View File

@ -56,11 +56,11 @@ target_link_libraries(media_plugin_libvlc
${PLUGIN_API_WINDOWS_LIBRARIES}
)
add_dependencies(media_plugin_libvlc
${LLPLUGIN_LIBRARIES}
${MEDIA_PLUGIN_BASE_LIBRARIES}
${LLCOMMON_LIBRARIES}
)
#add_dependencies(media_plugin_libvlc
# ${LLPLUGIN_LIBRARIES}
# ${MEDIA_PLUGIN_BASE_LIBRARIES}
# ${LLCOMMON_LIBRARIES}
#)
if (WINDOWS)
set_target_properties(

15
scripts/configure_firestorm.sh
View File

@ -34,7 +34,6 @@ WANTS_PACKAGE=$FALSE
WANTS_VERSION=$FALSE
WANTS_KDU=$FALSE
WANTS_FMODEX=$FALSE
WANTS_QUICKTIME=$FALSE
WANTS_OPENSIM=$TRUE
WANTS_AVX=$FALSE
WANTS_AVX2=$FALSE
@ -101,7 +100,6 @@ getArgs()
;;
kdu) WANTS_KDU=$TRUE;;
fmodex) WANTS_FMODEX=$TRUE;;
quicktime) WANTS_QUICKTIME=$TRUE;;
opensim) WANTS_OPENSIM=$TRUE;;
no-opensim) WANTS_OPENSIM=$FALSE;;
avx) WANTS_AVX=$TRUE;;
@ -279,7 +277,6 @@ echo -e "configure_firestorm.py" > $LOG
echo -e " PLATFORM: '$PLATFORM'" | tee -a $LOG
echo -e " KDU: `b2a $WANTS_KDU`" | tee -a $LOG
echo -e " FMODEX: `b2a $WANTS_FMODEX`" | tee -a $LOG
echo -e " QUICKTIME: `b2a $WANTS_QUICKTIME`" | tee -a $LOG
echo -e " OPENSIM: `b2a $WANTS_OPENSIM`" | tee -a $LOG
echo -e " AVX: `b2a $WANTS_AVX` " | tee -a $LOG
echo -e " AVX2: `b2a $WANTS_AVX2` " | tee -a $LOG
@ -379,16 +376,6 @@ if [ $WANTS_CONFIG -eq $TRUE ] ; then
FMODEX="-DFMODEX:BOOL=OFF"
fi
if [ $PLATFORM == "win32" ] ; then
if [ $WANTS_QUICKTIME -eq $TRUE ] ; then
QUICKTIME="-DHAVE_QUICKTIME_3P:BOOL=ON"
else
QUICKTIME="-DHAVE_QUICKTIME_3P:BOOL=OFF"
fi
else
QUICKTIME=""
fi
if [ $WANTS_OPENSIM -eq $TRUE ] ; then
OPENSIM="-DOPENSIM:BOOL=ON"
else
@ -459,7 +446,7 @@ if [ $WANTS_CONFIG -eq $TRUE ] ; then
UNATTENDED="-DUNATTENDED=ON"
fi
cmake -G "$TARGET" ../indra $CHANNEL $FMODEX $QUICKTIME $KDU $OPENSIM $AVX_OPTIMIZATION $AVX2_OPTIMIZATION $PACKAGE $UNATTENDED -DLL_TESTS:BOOL=OFF -DWORD_SIZE:STRING=$WORD_SIZE -DCMAKE_BUILD_TYPE:STRING=$BTYPE \
cmake -G "$TARGET" ../indra $CHANNEL $FMODEX $KDU $OPENSIM $AVX_OPTIMIZATION $AVX2_OPTIMIZATION $PACKAGE $UNATTENDED -DLL_TESTS:BOOL=OFF -DWORD_SIZE:STRING=$WORD_SIZE -DCMAKE_BUILD_TYPE:STRING=$BTYPE \
-DNDTARGET_ARCH:STRING="${TARGET_ARCH}" -DROOT_PROJECT_NAME:STRING=Firestorm $LL_ARGS_PASSTHRU | tee $LOG
if [ $PLATFORM == "win32" ] ; then