Skip to content

Commit

Permalink
make both arch
Browse files Browse the repository at this point in the history
  • Loading branch information
Anime4000 committed Dec 12, 2017
1 parent bd0823f commit 3a808de
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 28 deletions.
31 changes: 23 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,25 +8,39 @@ MONOMK=mkbundle
MODE=Release

DIR=build
IFME=ifme7
DIR32=build32
DIR64=build64

REL32=release-ifme7_i686
REL64=release-ifme7_amd64

ARC32=ifme7_i686
ARC64=ifme7_amd64

all: clean compile copy fixmod
mv "$(DIR)" "release-ifme7"
7za a -tzip -mm=lzma -mx=9 "$(IFME).zip" "release-ifme7"
mv "release-ifme7" "$(DIR)"
cp "$(DIR)" "$(REL32)"
mv "$(DIR)" "$(REL64)"
tar -xvJf plugin32.tar.xz -C "$(REL32)"
tar -xvJf plugin64.tar.xz -C "$(REL64)"
7za a -tzip -mm=Deflate -mfb=258 -mpass=15 "$(ARC32).zip" "$(REL32)"
7za a -tzip -mm=Deflate -mfb=258 -mpass=15 "$(ARC64).zip" "$(REL64)"
mv "$(REL32)" "$(DIR32)"
mv "$(REL64)" "$(DIR64)"

clean:
rm -rf "$(DIR)"
rm -f "$(IFME).zip"
rm -rf "$(DIR32)"
rm -rf "$(DIR64)"
rm -f "$(ARC32).7z"
rm -f "$(ARC64).7z"

compile:
$(MONOCC) /nologo /verbosity:normal ifme.sln /target:Build /property:Configuration=$(MODE)

copy:
mkdir "$(DIR)"
tar -xvJf plugin.tar.xz -C "$(DIR)"
cp "license.txt" "$(DIR)"
cp "patents.txt" "$(DIR)"
cp "changelog.txt" "$(DIR)"
cp "doc/readme.txt" "$(DIR)"
cp "bin/FontReg32.exe" "$(DIR)"
cp "bin/FontReg64.exe" "$(DIR)"
Expand All @@ -50,4 +64,5 @@ fixmod:
find "./$(DIR)" -name "*.sh" -exec chmod +x {} \;
find "./$(DIR)" -name "*.desktop" -exec chmod +x {} \;
find "./$(DIR)" -name "*.exe" -exec chmod -x {} \;
find "./$(DIR)" -name "*.dll" -exec chmod -x {} \;
find "./$(DIR)" -name "*.dll" -exec chmod -x {} \;

1 change: 1 addition & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
[fixed] Plugins script: value now can have prefix & postfix (eg: 128k instead of 128000)
[fixed] Audio channel now give meaningful text instead of numbers
[fixed] Media settings cannot save (revert to default) when select different target format item
[change] Update x265 version 2.6+13 (64-bit only)
[change] Rename included preset to friendly name :)
[chnage] More branding support
[change] Target Format now using "DropDown" selection
Expand Down
34 changes: 14 additions & 20 deletions configure
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#!/bin/bash

DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
BIT="$(uname -m | grep '64')"

cd "$DIR"

Expand Down Expand Up @@ -88,34 +89,27 @@ else
git clone https://github.com/Anime4000/FFmpegDotNet "../FFmpegDotNet"
fi

echo "Checking plugin archive"
if [ -f "plugin.tar.xz" ]; then
echo " Plugins found!"
sleep 1
else
echo " Plugin not found, downloading..."
if [ $(uname -m | grep '64') ]; then
echo " 64-bit OS"
wget --no-check-certificate https://sourceforge.net/projects/ifme/files/plugin/plugin-basic_2017-12-12_amd64.tar.xz -O plugin.tar.xz
else
echo " 32-bit OS"
wget --no-check-certificate https://sourceforge.net/projects/ifme/files/plugin/plugin-basic_2017-12-12_i686.tar.xz -O plugin.tar.xz
fi
fi

echo "Download necessary stuff"
mkdir bin
wget --no-check-certificate https://sourceforge.net/projects/ifme/files/stuff/FontReg32.exe -O ./bin/FontReg32.exe
wget --no-check-certificate https://sourceforge.net/projects/ifme/files/stuff/FontReg64.exe -O ./bin/FontReg64.exe

echo "Patch Makefile?"
if [ $(uname -m | grep '64') ]; then
echo " NO! 64-BIT AWESOME!"
echo "Checking plugin archive"
if [ -f "plugin32.tar.xz" ]; then
echo " 32-bit Plugins found!"
sleep 1
else
wget --no-check-certificate https://sourceforge.net/projects/ifme/files/plugin/plugin-basic_2017-12-12_i686.tar.xz -O plugin32.tar.xz
fi

if [ -f "plugin64.tar.xz" ]; then
echo " 64-bit Plugins found!"
sleep 1
else
echo " YES! MAKE 32-BIT COMPATIBLE"
sed -i '/mkdir "$(DIR)"/a\\tcp "sources/ffmpeg64_32layer.sh" "$(DIR)"\n\tcp "sources/ffmpeg64_32layer.cmd" "$(DIR)"' Makefile
wget --no-check-certificate https://sourceforge.net/projects/ifme/files/plugin/plugin-basic_2017-12-12_amd64.tar.xz -O plugin64.tar.xz
fi


echo "Done, now you can make"
exit 0

Expand Down

0 comments on commit 3a808de

Please sign in to comment.