From a110d7a53925d7abd71704553e8d3943361c329a Mon Sep 17 00:00:00 2001 From: David Capello Date: Mon, 22 Jun 2020 11:06:55 -0300 Subject: [PATCH 1/6] Update laf module --- laf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/laf b/laf index e1fb70a06..ffb4e9d82 160000 --- a/laf +++ b/laf @@ -1 +1 @@ -Subproject commit e1fb70a069c6482be282bf6f6d9190e3a0def14a +Subproject commit ffb4e9d82e64dfb54adc0bfac250ebb02a7a65f6 From 9d6bedcb7d745a769ecc935d6d12beba3d7bcbab Mon Sep 17 00:00:00 2001 From: David Capello Date: Wed, 24 Jun 2020 12:19:47 -0300 Subject: [PATCH 2/6] Update link to pixel-perfect algorithm (fix #2138) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3cd3e904f..099981f25 100644 --- a/README.md +++ b/README.md @@ -77,7 +77,7 @@ Aseprite includes color palettes created by: It tries to replicate some pixel-art algorithms: * [RotSprite](http://forums.sonicretro.org/index.php?showtopic=8848&st=15&p=159754&#entry159754) by Xenowhirl. -* [Pixel perfect drawing algorithm](http://deepnight.net/pixel-perfect-drawing/) by [Sébastien Bénard](https://twitter.com/deepnightfr) and [Carduus](https://twitter.com/CarduusHimself/status/420554200737935361). +* [Pixel perfect drawing algorithm](https://deepnight.net/blog/tools/pixel-perfect-drawing/) by [Sébastien Bénard](https://twitter.com/deepnightfr) and [Carduus](https://twitter.com/CarduusHimself/status/420554200737935361). Thanks to [third-party open source projects](docs/LICENSES.md), to [contributors](https://www.aseprite.org/contributors/), and all the From 39d48c86e3ac99214d784f4a9cc882d6861aed6f Mon Sep 17 00:00:00 2001 From: David Capello Date: Wed, 24 Jun 2020 15:37:12 -0300 Subject: [PATCH 3/6] Add note that we don't support MingW (fix #2449) --- INSTALL.md | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index 632d1ecef..6b04d971e 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -8,6 +8,7 @@ * [Linux dependencies](#linux-dependencies) * [Compiling](#compiling) * [Windows details](#windows-details) + * [MinGW](#mingw) * [macOS details](#macos-details) * [Issues with Retina displays](#issues-with-retina-displays) * [Linux details](#linux-details) @@ -18,7 +19,7 @@ You should be able to compile Aseprite successfully on the following platforms: -* Windows 10 + [Visual Studio Community 2019 + Windows 10.0.18362.0 SDK](https://imgur.com/a/7zs51IT) +* Windows 10 + [Visual Studio Community 2019 + Windows 10.0.18362.0 SDK](https://imgur.com/a/7zs51IT) (we don't support [MinGW](#mingw)) * macOS 10.15.3 Mojave + Xcode 11.2.1 + macOS 10.15 SDK (older version might work) * Linux + gcc 9.2 or clang 9.0 @@ -58,7 +59,8 @@ To compile Aseprite you will need: ## Windows dependencies -* Windows 10 (**we don't support cross-compiling and don't know if this would be possible**) +* Windows 10 (we don't support [MinGW](#mingw), or cross-compiling, + and we don't know if this would be possible) * [Visual Studio Community 2019](https://visualstudio.microsoft.com/downloads/) * The [Desktop development with C++ item + Windows 10.0.18362.0 SDK](https://imgur.com/a/7zs51IT) from the Visual Studio installer @@ -130,6 +132,15 @@ And then In this case, `C:\deps\skia` is the directory where Skia was compiled or uncompressed. +## MinGW + +We don't support MinGW compiler. If you see that the detected C++ +compiler by cmake is `C:\MinGW\bin\c++.exe` or something similar, you +have to get rid of MinGW path (`C:\MinGW\bin`) from the `PATH` +environment variable and run cmake again from scratch so the Visual +Studio C++ compiler (`cl.exe`) is used instead. More information in +[issue #2449](https://github.com/aseprite/aseprite/issues/2449) + ## macOS details Run `cmake` with the following parameters and then `ninja`: From 200b0ce73d95752840113ef4ef539e4d9bafac8d Mon Sep 17 00:00:00 2001 From: David Capello Date: Wed, 24 Jun 2020 15:45:26 -0300 Subject: [PATCH 4/6] Minor change in Windows dependencies --- INSTALL.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index 6b04d971e..9a5f5e7e1 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -59,9 +59,8 @@ To compile Aseprite you will need: ## Windows dependencies -* Windows 10 (we don't support [MinGW](#mingw), or cross-compiling, - and we don't know if this would be possible) -* [Visual Studio Community 2019](https://visualstudio.microsoft.com/downloads/) +* Windows 10 (we don't support cross-compiling) +* [Visual Studio Community 2019](https://visualstudio.microsoft.com/downloads/) (we don't support [MinGW](#mingw)) * The [Desktop development with C++ item + Windows 10.0.18362.0 SDK](https://imgur.com/a/7zs51IT) from the Visual Studio installer From 418cbd3f20c2cef5e23909f18c1e08557fc6c48b Mon Sep 17 00:00:00 2001 From: David Capello Date: Wed, 24 Jun 2020 16:00:18 -0300 Subject: [PATCH 5/6] Add information about -DCMAKE_IGNORE_PATH to ignore MinGW Tip from: https://github.com/aseprite/aseprite/issues/2449#issuecomment-649004147 --- INSTALL.md | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index 9a5f5e7e1..2422e3983 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -133,12 +133,20 @@ or uncompressed. ## MinGW -We don't support MinGW compiler. If you see that the detected C++ -compiler by cmake is `C:\MinGW\bin\c++.exe` or something similar, you -have to get rid of MinGW path (`C:\MinGW\bin`) from the `PATH` -environment variable and run cmake again from scratch so the Visual -Studio C++ compiler (`cl.exe`) is used instead. More information in -[issue #2449](https://github.com/aseprite/aseprite/issues/2449) +We don't support MinGW compiler and it might bring some problems into +the compilation process. If you see that the detected C++ compiler by +cmake is `C:\MinGW\bin\c++.exe` or something similar, you have to get +rid of MinGW path (`C:\MinGW\bin`) from the `PATH` environment +variable and run cmake again from scratch, so the Visual Studio C++ +compiler (`cl.exe`) is used instead. + +You can define the `CMAKE_IGNORE_PATH` variable when running cmake for +the first time in case that you don't know or don't want to modify the +`PATH` variable, e.g.: + + cmake -DCMAKE_IGNORE_PATH=C:\MinGW\bin ... + +More information in [issue #2449](https://github.com/aseprite/aseprite/issues/2449) ## macOS details From 244687ccf7b6a0b919bd085a1f3c3e9825c226ed Mon Sep 17 00:00:00 2001 From: David Capello Date: Wed, 24 Jun 2020 16:01:31 -0300 Subject: [PATCH 6/6] Fix MinGW section level --- INSTALL.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/INSTALL.md b/INSTALL.md index 2422e3983..6e827b84d 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -131,7 +131,7 @@ And then In this case, `C:\deps\skia` is the directory where Skia was compiled or uncompressed. -## MinGW +### MinGW We don't support MinGW compiler and it might bring some problems into the compilation process. If you see that the detected C++ compiler by