Update FLTK to 1.3.6

.gitignore

@@ -1,25 +1,19 @@
-# output directory
+# directories
 bin/
-
-# working directory
+lib/
+share/
 tmp/
+fltk/
 
-# no binaries
-*.exe
-
-# no libraries
-*.lib
-*.a
-lib/*
-!lib/fltk-1.3.5.zip
+# no FL includes
+include/FL/
 
 # no IDE files
-.vs
+.vs/
 *.sdf
 *.opensdf
 *.suo
 *.aps
-
 *.vcxproj.user
 
 # no static analysis files

.travis.yml

@@ -3,15 +3,13 @@ compiler: g++
 os: linux
 dist: bionic
 before_install:
-  - sudo apt-get install -y unzip zlib1g-dev libpng-dev libxpm-dev libx11-dev libxft-dev libxinerama-dev libfontconfig1-dev x11proto-xext-dev libxrender-dev libxfixes-dev
-  - pushd lib
-  - unzip fltk-1.3.5-mod.zip
-  - cd fltk-1.3.5-mod
-  - chmod +x configure
-  - ./configure --prefix="$PWD/.." --with-abiversion=10305
+  - sudo apt-get install -y git zlib1g-dev libpng-dev libxpm-dev libx11-dev libxft-dev libxinerama-dev libfontconfig1-dev x11proto-xext-dev libxrender-dev libxfixes-dev
+  - git clone --branch release-1.3.6 --depth 1 https://github.com/fltk/fltk.git
+  - pushd fltk
+  - ./autogen.sh --prefix="$PWD/.." --with-abiversion=10306
   - make
   - make install
   - popd
 script:
-  - export PATH="$PWD/lib/bin:$PATH"
+  - export PATH="$PWD/bin:$PATH"
   - make

INSTALL.md

@@ -15,18 +15,21 @@ You will need [Microsoft Visual Studio](https://visualstudio.microsoft.com/vs/);
 
 If the pre-built release already works for you, you don't have to build it yourself.
 
-1. On GitHub, click the green "**Clone or download**" button and click "**Download ZIP**". This will download **polished-map-master.zip**.
+1. On GitHub, click the green "**Code**" button and click "**Download ZIP**". This will download **polished-map-master.zip**.
 2. Unzip polished-map-master.zip. This will create the **polished-map-master** folder.
 3. Navigate to the polished-map-master folder in Explorer.
-4. Unzip lib/fltk-1.3.5-mod.zip. This will create the lib/**fltk-1.3.5-mod** folder.
-5. Open lib/fltk-1.3.5-mod/ide/VisualC2010/fltk.sln in Visual Studio 2019. (Other versions may or may not work, I haven't tried.)
-6. A dialog "Upgrade VS++ Compiler and Libraries" will open, since fltk.sln was made for Visual Studio 2008. Click OK.
-7. Go to **Build → Batch Build…**, check the projects **fltk**, **fltkimages**, **fltkpng**, **fltkjpeg**, and **fltkzlib** in the Release configuration, and click the **Build** button.
-8. Move the .lib files from lib/fltk-1.3.5-mod/lib to lib.
-9. Open ide/polished-map.sln in Visual Studio 2019.
-10. If the Solution Configuration dropdown on the toolbar says Debug, set it to **Release**.
-11. Go to **Build → Build Solution** or press F7 to build the project. This will create bin/Release/**polishedmap.exe**.
-12. Hold down Shift, right-click **install.bat**, and click "**Run as administrator**". This will install Polished Map to your account and create a shortcut on your Desktop.
+4. Download fltk-1.3.6-source.tar.bz2 or fltk-1.3.6-source.tar.gz from [**fltk.org**](https://www.fltk.org/software.php) to a new **polished-map-master\lib** subfolder.
+5. Extract fltk-1.3.6-source.tar (you may need a program such as [7-Zip](https://www.7-zip.org/)). This will create the lib\**fltk-1.3.6** folder.
+6. Open lib\fltk-1.3.6\abi-version.ide in a text editor such as Notepad and replace "`#undef FL_ABI_VERSION`" with "`#define FL_ABI_VERSION 10306`". Save it.
+7. Open lib\fltk-1.3.6\ide\VisualC2010\fltk.sln in Visual Studio 2019. (Other versions may or may not work, I haven't tried.)
+8. A "Retarget Projects" dialog will open, since fltk.sln was made for Visual Studio 2010. Click OK to upgrade the Windows SDK version and platform toolset.
+9. Go to **Build → Batch Build…**, check the projects **fltk**, **fltkimages**, **fltkpng**, **fltkjpeg**, and **fltkzlib** in the Release configuration, and click the **Build** button.
+10. Move all the .lib files from lib\fltk-1.3.6\lib\\\*.lib up to lib\\\*.lib.
+11. Copy the lib\FL folder up to include\FL.
+12. Open ide\polished-map.sln in Visual Studio 2019.
+13. If the Solution Configuration dropdown on the toolbar says Debug, set it to **Release**.
+14. Go to **Build → Build Solution** or press F7 to build the project. This will create bin\Release\**polishedmap.exe**.
+15. Hold down Shift, right-click **install.bat**, and click "**Run as administrator**". This will install Polished Map to your account and create a shortcut on your Desktop.
 
 
 ## Linux
@@ -40,16 +43,16 @@ You need at least g++ 7 for C++11 `<regex>` and C++17 `<string_view>` support.
 Run the following commands:
 
 ```bash
-sudo apt-get install make g++ git unzip
-sudo apt-get install zlib1g-dev libpng-dev libxpm-dev libx11-dev libxft-dev libxinerama-dev libfontconfig1-dev x11proto-xext-dev libxrender-dev libxfixes-dev
+sudo apt install make g++ git autoconf
+sudo apt install zlib1g-dev libpng-dev libxpm-dev libx11-dev libxft-dev libxinerama-dev libfontconfig1-dev x11proto-xext-dev libxrender-dev libxfixes-dev
 ```
 
 #### Fedora
 
 Run the following commands:
 
 ```bash
-sudo dnf install make g++ git unzip
+sudo dnf install make g++ git autoconf
 sudo dnf install zlib-devel libpng-devel libXpm-devel libX11-devel libXft-devel libXinerama-devel fontconfig-devel libXext-devel libXrender-devel libXfixes-devel
 ```
 
@@ -62,20 +65,18 @@ Run the following commands:
 git clone https://github.com/Rangi42/polished-map.git
 cd polished-map
 
-# Build modified FLTK 1.3.5 with the latest ABI enabled
+# Build FLTK 1.3.6 with the latest ABI enabled
 # (even if you already have libfltk1.3-dev installed)
-pushd lib
-unzip fltk-1.3.5-mod.zip
-cd fltk-1.3.5-mod
-chmod +x configure
-./configure --prefix="$PWD/.." --with-abiversion=10305
+git clone --branch release-1.3.6 --depth 1 https://github.com/fltk/fltk.git
+pushd fltk
+./autogen.sh --prefix="$PWD/.." --with-abiversion=10306
 make
 make install
 popd
 
 # Build Polished Map
-# ("export PATH" is needed if fltk-config is not already in your PATH)
-export PATH="$PWD/lib/bin:$PATH"
+# ("export PATH" is needed if bin/fltk-config is not already in your PATH)
+export PATH="$PWD/bin:$PATH"
 make
 
 # Install Polished Map