diff --git a/.gitignore b/.gitignore index 72a0428..86d50b4 100644 --- a/.gitignore +++ b/.gitignore @@ -21,5 +21,7 @@ uvg266/BSD/uvg266 vvdecWebPlayer/ vvenc/ vvdec/ +*.7z +[Ii]nstall/ .vscode \ No newline at end of file diff --git a/BuildVVC.sh b/BuildVVC.sh index 406ae24..77f9279 100644 --- a/BuildVVC.sh +++ b/BuildVVC.sh @@ -2,9 +2,9 @@ OS=$(uname) echo "Martin Eesmaa / VVC Compiler (vvenc and vvdec)" echo "You're running on $OS of bash script version to compile VVC binaries" +echo "Checking and installing required packages..." setup_linux() { - echo "Checking and installing required packages..." sudo apt update && sudo apt upgrade -y sudo apt install build-essential cmake -y } @@ -22,21 +22,16 @@ setup_macos() { } setup_msys64() { - echo "Checking and installing required packages..." pacman -Syu --noconfirm pacman -S --noconfirm base-devel cmake git } setup_freebsd() { - echo "Checking and installing required packages..." pkg update && pkg upgrade -y pkg install -y cmake git gmake } build_repos() { - echo "Cloning repositories..." - cd ~/Downloads - if [ ! -d vvenc ]; then git clone --depth=1 https://github.com/fraunhoferhhi/vvenc else @@ -59,7 +54,7 @@ build_repos() { cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_EXE_LINKER_FLAGS="-static" .. cmake --build . -j $(nproc) fi - cd ../../ + cd - done echo "Please see the build files starting with (vvenc/vvdec)/bin/release-static." } diff --git a/README.md b/README.md index 1eea72f..9cae306 100644 --- a/README.md +++ b/README.md @@ -163,10 +163,7 @@ git clone --depth=1 https://github.com/MartinEesmaa/VVCEasy && cd VVCEasy VVCEasy_compiler.iss ``` -Step 2: Before you compile, please replace example username by your username of LicenseFile, OutputDir and Source. See the image: -![Instructionsofcompilevvceasy](https://user-images.githubusercontent.com/88035011/153736145-a24a1997-1133-4933-8797-de7c62295d1d.png) - -Step 3: Once you're replaced of your username, press F9 to compile on your keyboard. After compiling, VVCEasy.exe (Installer) will be on your Downloads folder. +Step 2: Press F9 to compile on your keyboard. After compiling, VVCEasy.exe (Installer) can be found on Install folder. ![VVCEasyclickblueplaybutton](https://user-images.githubusercontent.com/88035011/153736303-b0949f5a-5ac5-4123-92c5-305211a8aadc.png) --- diff --git a/VVCEasy_compiler.iss b/VVCEasy_compiler.iss index 9017d68..80a9b8f 100644 --- a/VVCEasy_compiler.iss +++ b/VVCEasy_compiler.iss @@ -19,10 +19,10 @@ AppSupportURL={#MyAppURL} AppUpdatesURL={#MyAppURL} DefaultDirName={autopf}\{#MyAppName} DefaultGroupName={#MyAppName} -LicenseFile=C:\Users\User\Downloads\VVCEasy\LICENSE +LicenseFile=LICENSE ; Uncomment the following line to run in non administrative install mode (install for current user only.) ;PrivilegesRequired=lowest -OutputDir=C:\Users\User\Downloads +OutputDir=Install OutputBaseFilename=VVCEasy Compression=lzma2/ultra64 SolidCompression=yes @@ -34,6 +34,20 @@ CompressionThreads=1 Name: "english"; MessagesFile: "compiler:Default.isl" [Files] -Source: "C:\Users\User\Downloads\VVCEasy\*"; DestDir: "{win}"; Flags: ignoreversion recursesubdirs createallsubdirs +Source: "WindowsVVC\WindowsVVC.7z"; DestDir: "{app}\WindowsVVC"; Flags: ignoreversion recursesubdirs createallsubdirs +Source: "uvg266\Windows\uvg266-Windows.7z"; DestDir: "{app}\uvg266\Windows"; Flags: ignoreversion recursesubdirs createallsubdirs +Source: "LAVFilters\LAVFilters-0.79.2-x64-VVCEasy.7z"; DestDir: "{app}\LAVFilters"; Flags: ignoreversion recursesubdirs createallsubdirs +Source: "VVCEasy.bat"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs +Source: "wget.exe"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs +Source: "7-Zip\7z.exe"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs +Source: "7-Zip\7z.dll"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs +Source: "INSTALLVLCPLUGIN\libvtmdec.dll"; DestDir: "{app}\INSTALLVLCPLUGIN"; Flags: ignoreversion recursesubdirs createallsubdirs +Source: "INSTALLVLCPLUGIN\libvvcdecoder_plugin.dll"; DestDir: "{app}\INSTALLVLCPLUGIN"; Flags: ignoreversion recursesubdirs createallsubdirs +Source: "INSTALLVLCPLUGIN\libvvctsdemux_plugin.dll"; DestDir: "{app}\INSTALLVLCPLUGIN"; Flags: ignoreversion recursesubdirs createallsubdirs ; NOTE: Don't use "Flags: ignoreversion" on any shared system files +[Icons] +Name: "{group}\VVCEasy"; Filename: "{app}\VVCEasy.bat"; WorkingDir: "{app}"; Comment: "Run VVCEasy" + +[Run] +Filename: "{app}\VVCEasy.bat"; Description: "Launch VVCEasy"; Flags: nowait postinstall skipifdoesntexist \ No newline at end of file