From 21430e81f7f27b051051aba43f353224d629b0ca Mon Sep 17 00:00:00 2001 From: manongjohn <19245851+manongjohn@users.noreply.github.com> Date: Sat, 27 Aug 2022 21:23:40 -0400 Subject: [PATCH] Update build instructions --- doc/how_to_build_linux.md | 4 ++-- doc/how_to_build_macosx.md | 4 ++-- doc/how_to_build_win.md | 16 ++++++++-------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/doc/how_to_build_linux.md b/doc/how_to_build_linux.md index addf31fc..883c9d5b 100644 --- a/doc/how_to_build_linux.md +++ b/doc/how_to_build_linux.md @@ -148,8 +148,8 @@ TODO: make sure we can use the system libtiff instead and remove this section. Features from the modified libtiff are needed currently, so this isn't a simple switch. ``` -$ cd tahoma2d/thirdparty/tiff-4.0.3 -$ ./configure --with-pic --disable-jbig +$ cd tahoma2d/thirdparty/tiff-4.2.0 +$ ./configure --with-pic --disable-jbig --disable-webp $ make -j$(nproc) $ cd ../../ ``` diff --git a/doc/how_to_build_macosx.md b/doc/how_to_build_macosx.md index 45f42696..424c2d76 100644 --- a/doc/how_to_build_macosx.md +++ b/doc/how_to_build_macosx.md @@ -70,8 +70,8 @@ $ mv ~/Downloads/boost_1_72_0.tar.bz2 . #or whatever the boost filename you do $ tar xvjf boost_1_72_0.tar.bz2 $ cd ../lzo $ cp -r 2.03/include/lzo driver -$ cd ../tiff-4.0.3 -$ ./configure --disable-lzma && make +$ cd ../tiff-4.2.0 +$ ./configure --disable-webp --disable-zstd --without-x && make ``` ### Configure build for QT version diff --git a/doc/how_to_build_win.md b/doc/how_to_build_win.md index 35085744..a7467da3 100644 --- a/doc/how_to_build_win.md +++ b/doc/how_to_build_win.md @@ -1,13 +1,13 @@ # Build Tahoma2D on Windows -This software can be built using Visual Studio 2015 or above and Qt 5.9 (later Qt versions still not working correctly.) +This software can be built using Visual Studio 2019 or above and Qt 5.9 (later Qt versions still not working correctly.) Throughout these instructions `$tahoma2d` represents the full path to your local Git repository for Tahoma2D. ## Required Software -### Visual Studio Express 2015 or higher for Windows Desktop -- [ ] Install Visual Studio Express 2015 or higher for Windows Desktop, https://www.visualstudio.com/vs/older-downloads/ +### Microsoft Visual Studio 2019 or higher for Windows Desktop +- [ ] Install Microsoft Visual Studio 2019 or higher for Windows Desktop, https://www.visualstudio.com/vs/older-downloads/ - Community and Professional versions of Visual Studio for Windows Desktop also work. - [ ] Make sure the target platform is "for Windows Desktop", not "for Windows". - [ ] During the installation, make sure to select all the Visual C++ packages. @@ -86,10 +86,10 @@ You can use GitHub Desktop https://desktop.github.com/ or Git command line. Rename the following files: - [ ] `$tahoma2d/thirdparty/LibJPEG/jpeg-9/jconfig.vc` to - `$tahoma2d/thirdparty/LibJPEG/jpeg-9/jconfig.h` -- [ ] `$tahoma2d/thirdparty/tiff-4.0.3/libtiff/tif_config.vc.h` to - - `$tahoma2d/thirdparty/tiff-4.0.3/libtiff/tif_config.h` -- [ ] `$tahoma2d/thirdparty/tiff-4.0.3/libtiff/tiffconf.vc.h` to - - `$tahoma2d/thirdparty/tiff-4.0.3/libtiff/tiffconf.h` +- [ ] `$tahoma2d/thirdparty/tiff-4.2.0/libtiff/tif_config.vc.h` to + - `$tahoma2d/thirdparty/tiff-4.2.0/libtiff/tif_config.h` +- [ ] `$tahoma2d/thirdparty/tiff-4.2.0/libtiff/tiffconf.vc.h` to + - `$tahoma2d/thirdparty/tiff-4.2.0/libtiff/tiffconf.h` - [ ] `$tahoma2d/thirdparty/libpng-1.6.21/scripts/pnglibconf.h.prebuilt` to - `$tahoma2d/thirdparty/libpng-1.6.21/pnglibconf.h` - Note that the destination folder is different for this file. @@ -134,7 +134,7 @@ To run the program with stop motion support, you will need to copy the .dll file ## Run the Program - More Steps, Individual File Copying - more awareness over which files are used 1. - [ ] Copy the entire contents of $tahoma2d/toonz/build/Release to an appropriate folder. 2. - [ ] Do **one** of: - - (option 1) Open a Command Prompt and navigate to `QT_DIR/msvc2015_64/bin`. Run the Qt program `windeployqt.exe` with the path for `Tahoma2D.exe` as an argument. + - (option 1) Open a Command Prompt and navigate to `QT_DIR/msvc2019_64/bin`. Run the Qt program `windeployqt.exe` with the path for `Tahoma2D.exe` as an argument. - (option 2) Another way to do this is to open two windows in Windows Explorer. In the first window navigate to the folder containing `windeployqt.exe`. In a second window navigate to the Release folder contining the Tahoma2D.exe you built. Drag and drop Tahoma2D.exe onto `windeployqt.exe` in the other window. - This will automatically generate the QT files and folders you will need.