razzaline/tahoma2d
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

modify tif_config for msvc (#796)

Browse source
This commit is contained in:
shun-iwasawa 2016-09-08 18:17:04 +09:00 committed by Shinya Kitaoka
parent 7cd1ff71f5
commit 3ae939fa35
3 changed files with 2 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
doc/how_to_build_win.md
View file

@ -63,13 +63,6 @@ Rename the following files:
- `$opentoonz/thirdparty/libpng-1.6.21/scripts/pnglibconf.h.prebuilt` to `$opentoonz/thirdparty/libpng-1.6.21/pnglibconf.h` - `$opentoonz/thirdparty/libpng-1.6.21/scripts/pnglibconf.h.prebuilt` to `$opentoonz/thirdparty/libpng-1.6.21/pnglibconf.h`
- Note that the destination is a different folder for the last file. - Note that the destination is a different folder for the last file.
Add a guard for snprintf at tif_config.h(50):
```
+#if _MSC_VER < 1900
#define snprintf _snprintf
+#endif
```
## Building ## Building
1. Open `$opentoonz/toonz/build/OpenToonz.sln` and change to `Release` 1. Open `$opentoonz/toonz/build/OpenToonz.sln` and change to `Release`
2. The output will be in `$opentoonz/toonz/build/Release` 2. The output will be in `$opentoonz/toonz/build/Release`

7
doc/how_to_build_win_ja.md
View file

@ -57,13 +57,6 @@ Visual Studio 2015 と Qt 5.6 でビルドできることを確認していま
- `$opentoonz/thirdparty/tiff-4.0.3/libtiff/tiffconf.vc.h` → `$opentoonz/thirdparty/tiff-4.0.3/libtiff/tiffconf.h` - `$opentoonz/thirdparty/tiff-4.0.3/libtiff/tiffconf.vc.h` → `$opentoonz/thirdparty/tiff-4.0.3/libtiff/tiffconf.h`
- `$opentoonz/thirdparty/libpng-1.6.21/scripts/pnglibconf.h.prebuilt` → `$opentoonz/thirdparty/libpng-1.6.21/pnglibconf.h` - `$opentoonz/thirdparty/libpng-1.6.21/scripts/pnglibconf.h.prebuilt` → `$opentoonz/thirdparty/libpng-1.6.21/pnglibconf.h`
`tif_config.h` の 50 行目あたりに下記の修正を加えます:
```
+#if _MSC_VER < 1900
#define snprintf _snprintf
+#endif
```
## ビルド ## ビルド
1. `$opentoonz/toonz/build/OpenToonz.sln` を開いて Release 構成を選択してビルドします 1. `$opentoonz/toonz/build/OpenToonz.sln` を開いて Release 構成を選択してビルドします
2. `$opentoonz/toonz/build/Release` にファイルが生成されます 2. `$opentoonz/toonz/build/Release` にファイルが生成されます

2
thirdparty/tiff-4.0.3/libtiff/tif_config.vc.h vendored
View file

@ -47,7 +47,9 @@
/* Set the native cpu bit order */ /* Set the native cpu bit order */
#define HOST_FILLORDER FILLORDER_LSB2MSB #define HOST_FILLORDER FILLORDER_LSB2MSB
#if defined(_MSC_VER) && (_MSC_VER < 1900)
#define snprintf _snprintf #define snprintf _snprintf
#endif
/* Define to 1 if your processor stores words with the most significant byte /* Define to 1 if your processor stores words with the most significant byte
first (like Motorola and SPARC, unlike Intel and VAX). */ first (like Motorola and SPARC, unlike Intel and VAX). */