Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Switch server-side mapimg to Qt #2334

Merged
merged 10 commits into from
Aug 10, 2024
Merged

Switch server-side mapimg to Qt #2334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
e74f307
Remove unused function mapimg_get_format_list
lmoureaux Aug 3, 2024
e531fec
Remove the server-side ImageMagick image format
lmoureaux Aug 3, 2024
04da79c
Add a Qt backend for mapimg
lmoureaux Aug 3, 2024
a12477a
Remove the built-in PPM writer
lmoureaux Aug 3, 2024
7ebe4e5
Remove the notion of separate image toolkits from mapimg
lmoureaux Aug 3, 2024
23f31e9
Remove built-in file format definitions
lmoureaux Aug 3, 2024
e8aa9a7
Fold img_save_qt in to img_save
lmoureaux Aug 3, 2024
924eeea
Remove unused function img_playerstr
lmoureaux Aug 3, 2024
853b399
Don't try to install the MAGICKWAND licence
lmoureaux Aug 6, 2024
ff80c31
Delete the IMAGEMAGICK license
lmoureaux Aug 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion INSTALL
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,6 @@ following commands.
qt5-default \
libkf5archive-dev \
liblua5.3-dev \
libmagickwand-dev \
libsdl2-mixer-dev \
libunwind-dev \
libdw-dev
Expand Down
2 changes: 0 additions & 2 deletions cmake/FreecivInstall.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,10 @@ install(
${CMAKE_SOURCE_DIR}/dist/licenses/FTL.txt
${CMAKE_SOURCE_DIR}/dist/licenses/GPL2.txt
${CMAKE_SOURCE_DIR}/dist/licenses/GPL3.txt
${CMAKE_SOURCE_DIR}/dist/licenses/IMAGEMAGICK.txt
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should delete this file too.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My bad, I missed that there were two licenses for ImageMagick

${CMAKE_SOURCE_DIR}/dist/licenses/LGPL-2.0-ONLY.txt
${CMAKE_SOURCE_DIR}/dist/licenses/LGPL-2.0-OR-LATER.txt
${CMAKE_SOURCE_DIR}/dist/licenses/LGPL-3.0-ONLY.txt
${CMAKE_SOURCE_DIR}/dist/licenses/LICENSEREF-KDE-ACCEPTED-LGPL.txt
${CMAKE_SOURCE_DIR}/dist/licenses/MAGICKWAND.txt
${CMAKE_SOURCE_DIR}/dist/licenses/MIT.txt
${CMAKE_SOURCE_DIR}/dist/licenses/OPENSSL.txt
${CMAKE_SOURCE_DIR}/dist/licenses/PNG.txt
Expand Down
3 changes: 2 additions & 1 deletion common/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ add_subdirectory(aicore)
add_subdirectory(networking)
add_subdirectory(scriptcore)

target_link_libraries(common PUBLIC Qt5::Core Qt5::Network)
# Qt5::Gui for map images -- could be made optional
target_link_libraries(common PUBLIC Qt5::Core Qt5::Gui Qt5::Network)
target_link_libraries(common PRIVATE aicore networking)
target_link_libraries(common PUBLIC common_gen scriptcore)
Loading
Loading