Skip to content

Commit

Permalink
Update FLTK to 1.4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
dannye committed Nov 18, 2024
1 parent 904a508 commit 505cc39
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
with:
path: lib/fltk
repository: fltk/fltk
ref: release-1.4.0rc3
ref: release-1.4.0
fetch-depth: 1

- name: Install FLTK
Expand Down
12 changes: 6 additions & 6 deletions INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@ If the pre-built release already works for you, you don't have to build it yours
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. Download fltk-1.4.0rc3-source.tar.bz2 or fltk-1.4.0rc3-source.tar.gz from [**fltk.org**](https://www.fltk.org/software.php) to a new **polished-map-master\lib** subfolder.
5. Extract fltk-1.4.0rc3-source.tar (you may need a program such as [7-Zip](https://www.7-zip.org/)). This will create the lib\\**fltk-1.4.0rc3** folder.
6. Open Visual Studio, select **Open a local folder**, and open the lib\fltk-1.4.0rc3 folder. This will automatically generate the CMake project with a configuration named **x64-Debug** by default.
4. Download fltk-1.4.0-source.tar.bz2 or fltk-1.4.0-source.tar.gz from [**fltk.org**](https://www.fltk.org/software.php) to a new **polished-map-master\lib** subfolder.
5. Extract fltk-1.4.0-source.tar (you may need a program such as [7-Zip](https://www.7-zip.org/)). This will create the lib\\**fltk-1.4.0** folder.
6. Open Visual Studio, select **Open a local folder**, and open the lib\fltk-1.4.0 folder. This will automatically generate the CMake project with a configuration named **x64-Debug** by default.
7. From the Configuration dropdown, select **Manage Configurations...**, click the green plus sign to add a new configuration, and select **x86-Release** from the list. Set the **Configuration type** to **Release**, set the **Toolset** to **msvc_x86_x64**, and uncheck the **FLTK_GRAPHICS_GDIPLUS** option in the list of CMake variables.
8. Set the active Configuration to **x86-Release**.
9. In the **Solution Explorer**, switch to the **CMake Targets View**, right-click on **fltk_images**, and select **Build fltk_images**. This will also build the other required libraries: fltk, fltk_jpeg, fltk_png, and fltk_z.
10. Move all the .lib files from lib\fltk-1.4.0rc3\out\build\x86-Release\lib\\\*.lib up to lib\\\*.lib.
11. Copy the lib\fltk-1.4.0rc3\\**FL** folder to a new include\\**FL** folder. Also copy lib\fltk-1.4.0rc3\out\build\x86-Release\FL\fl_config.h into include\FL.
10. Move all the .lib files from lib\fltk-1.4.0\out\build\x86-Release\lib\\\*.lib up to lib\\\*.lib.
11. Copy the lib\fltk-1.4.0\\**FL** folder to a new include\\**FL** folder. Also copy lib\fltk-1.4.0\out\build\x86-Release\FL\fl_config.h into 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**.
Expand Down Expand Up @@ -68,7 +68,7 @@ git clone https://github.com/Rangi42/polished-map.git
cd polished-map

# Build FLTK 1.4.0
git clone --branch release-1.4.0rc3 --depth 1 https://github.com/fltk/fltk.git lib/fltk
git clone --branch release-1.4.0 --depth 1 https://github.com/fltk/fltk.git lib/fltk
pushd lib/fltk
cmake -D CMAKE_INSTALL_PREFIX="$(realpath "$PWD/../..")" -D CMAKE_BUILD_TYPE=Release -D FLTK_GRAPHICS_CAIRO=1 -D FLTK_BACKEND_WAYLAND=0 -D FLTK_USE_SYSTEM_LIBPNG=0 -D FLTK_USE_SYSTEM_ZLIB=0
make
Expand Down

0 comments on commit 505cc39

Please sign in to comment.