games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-20 20:23:03 +02:00
Code Issues Releases Activity

patches from forum:

Browse Source 
- (vcmibuilder) fix for space in path
- (cmake) fix ffmpeg detection on Mac
This commit is contained in:
Ivan Savenko 2013-01-30 20:46:09 +00:00
parent a82601db72
commit 843f8f10c0
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmake_modules/FindFFmpeg.cmake
View File

@ -144,5 +144,10 @@ foreach (_component ${FFmpeg_FIND_COMPONENTS})
list(APPEND _FFmpeg_REQUIRED_VARS ${_component}_LIBRARIES ${_component}_INCLUDE_DIRS) list(APPEND _FFmpeg_REQUIRED_VARS ${_component}_LIBRARIES ${_component}_INCLUDE_DIRS)
endforeach () endforeach ()
# On OS X we ffmpeg libraries depend on VideoDecodeAcceleration and CoreVideo frameworks
IF (APPLE)
SET(FFMPEG_LIBRARIES ${FFMPEG_LIBRARIES} "-framework VideoDecodeAcceleration -framework CoreVideo -lbz2")
ENDIF()
# Give a nice error message if some of the required vars are missing. # Give a nice error message if some of the required vars are missing.
find_package_handle_standard_args(FFmpeg DEFAULT_MSG ${_FFmpeg_REQUIRED_VARS}) find_package_handle_standard_args(FFmpeg DEFAULT_MSG ${_FFmpeg_REQUIRED_VARS})

24
vcmibuilder
View File

@ -163,20 +163,20 @@ fi
if [[ -n "$cd1_dir" ]] if [[ -n "$cd1_dir" ]]
then then
data_dir="./cddir" data_dir="./cddir"
mkdir -p $data_dir mkdir -p "$data_dir"
unshield -d $data_dir x $cd1_dir/_setup/data1.cab || fail "Error: failed to extract from Install Shield installer!" "rm -rf ./cddir" unshield -d "$data_dir" x $cd1_dir/_setup/data1.cab || fail "Error: failed to extract from Install Shield installer!" "rm -rf ./cddir"
# a bit tricky - different releases have different root directory. Move extracted files to data_dir # a bit tricky - different releases have different root directory. Move extracted files to data_dir
if [ -d $data_dir/"Heroes3" ] if [ -d "$data_dir"/"Heroes3" ]
then then
mv $data_dir/Heroes3/* $data_dir mv "$data_dir"/Heroes3/* "$data_dir"
elif [ -d $data_dir"/Program_Files" ] elif [ -d "$data_dir""/Program_Files" ]
then then
mv $data_dir/Program_Files/* $data_dir mv "$data_dir"/Program_Files/* "$data_dir"
else else
echo "Error: failed to find extracted game files!" echo "Error: failed to find extracted game files!"
echo "Extracted directories are: " echo "Extracted directories are: "
ls -la $data_dir ls -la "$data_dir"
echo "Please report this on vcmi.eu" echo "Please report this on vcmi.eu"
exit 1; exit 1;
fi fi
@ -198,16 +198,16 @@ fi
if [[ -n "$data_dir" ]] if [[ -n "$data_dir" ]]
then then
cp -r $data_dir/Data $dest_dir cp -r "$data_dir"/Data $dest_dir
cp -r $data_dir/Maps $dest_dir cp -r "$data_dir"/Maps $dest_dir
# this folder is named differently from time to time # this folder is named differently from time to time
# vcmi can handle any case but script can't # vcmi can handle any case but script can't
if [ -d $data_dir/MP3 ] if [ -d "$data_dir"/MP3 ]
then then
cp -r $data_dir/MP3 $dest_dir cp -r "$data_dir"/MP3 $dest_dir
else else
cp -r $data_dir/Mp3 $dest_dir cp -r "$data_dir"/Mp3 $dest_dir
fi fi
fi fi