diff --git a/README.md b/README.md index 367ce21c..88a56ff4 100644 --- a/README.md +++ b/README.md @@ -11,6 +11,7 @@ * Clang & LLVM 4.0.1 (doesnt quite work for windows, use unix setup below and skip all the ninja stuff)(installation guide http://clang.llvm.org/docs/LibASTMatchersTutorial.html) * Boost 1.64 * Botan 2.1.0 +* Image Magick 7.0.6 also something about java, but who knows... @@ -28,6 +29,7 @@ For Windows: * QT_WIN32_DIR - .../Qt/Qt5.9.1/5.9.1/msvc2015 * QT_WIN64_DIR - .../Qt/Qt5.9.1/5.9.1/msvc2015_64 * VLD_DIR - .../Visual Leak Detector +* JAVA_HOME - .../Java/jdk1.x.x_xxx * path - apped path to git.exe - apped path to jdk/bin diff --git a/script/create_windows_icon.sh b/script/create_windows_icon.sh index 12a5749b..9fec489c 100644 --- a/script/create_windows_icon.sh +++ b/script/create_windows_icon.sh @@ -7,16 +7,16 @@ ICON_BUILD_PATH=$ICON_INPUT_PATH/build mkdir -p $ICON_SIZES_PATH mkdir -p $ICON_BUILD_PATH -convert $ICON_INPUT_PATH/logo_1024_1024.png -resize 16x16 $ICON_SIZES_PATH/icon_16.png -convert $ICON_INPUT_PATH/logo_1024_1024.png -resize 24x24 $ICON_SIZES_PATH/icon_24.png -convert $ICON_INPUT_PATH/logo_1024_1024.png -resize 32x32 $ICON_SIZES_PATH/icon_32.png -convert $ICON_INPUT_PATH/logo_1024_1024.png -resize 40x40 $ICON_SIZES_PATH/icon_40.png -convert $ICON_INPUT_PATH/logo_1024_1024.png -resize 48x48 $ICON_SIZES_PATH/icon_48.png -convert $ICON_INPUT_PATH/logo_1024_1024.png -resize 64x64 $ICON_SIZES_PATH/icon_64.png -convert $ICON_INPUT_PATH/logo_1024_1024.png -resize 128x128 $ICON_SIZES_PATH/icon_128.png -convert $ICON_INPUT_PATH/logo_1024_1024.png -resize 256x256 $ICON_SIZES_PATH/icon_256.png +magick convert $ICON_INPUT_PATH/logo_1024_1024.png -resize 16x16 $ICON_SIZES_PATH/icon_16.png +magick convert $ICON_INPUT_PATH/logo_1024_1024.png -resize 24x24 $ICON_SIZES_PATH/icon_24.png +magick convert $ICON_INPUT_PATH/logo_1024_1024.png -resize 32x32 $ICON_SIZES_PATH/icon_32.png +magick convert $ICON_INPUT_PATH/logo_1024_1024.png -resize 40x40 $ICON_SIZES_PATH/icon_40.png +magick convert $ICON_INPUT_PATH/logo_1024_1024.png -resize 48x48 $ICON_SIZES_PATH/icon_48.png +magick convert $ICON_INPUT_PATH/logo_1024_1024.png -resize 64x64 $ICON_SIZES_PATH/icon_64.png +magick convert $ICON_INPUT_PATH/logo_1024_1024.png -resize 128x128 $ICON_SIZES_PATH/icon_128.png +magick convert $ICON_INPUT_PATH/logo_1024_1024.png -resize 256x256 $ICON_SIZES_PATH/icon_256.png -convert $ICON_SIZES_PATH/icon_16.png $ICON_SIZES_PATH/icon_24.png $ICON_SIZES_PATH/icon_32.png $ICON_SIZES_PATH/icon_40.png $ICON_SIZES_PATH/icon_48.png $ICON_SIZES_PATH/icon_64.png $ICON_SIZES_PATH/icon_128.png $ICON_SIZES_PATH/icon_256.png -colors 256 $ICON_BUILD_PATH/sourcetrail.ico +magick convert $ICON_SIZES_PATH/icon_16.png $ICON_SIZES_PATH/icon_24.png $ICON_SIZES_PATH/icon_32.png $ICON_SIZES_PATH/icon_40.png $ICON_SIZES_PATH/icon_48.png $ICON_SIZES_PATH/icon_64.png $ICON_SIZES_PATH/icon_128.png $ICON_SIZES_PATH/icon_256.png -colors 256 $ICON_BUILD_PATH/sourcetrail.ico cp $ICON_BUILD_PATH/sourcetrail.ico $MY_PATH/../build/win32 cp $ICON_BUILD_PATH/sourcetrail.ico $MY_PATH/../build/win64