Skip to content

Replace devIL with SDL2_image #344

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

Merged
luciusDXL merged 10 commits into from
Sep 29, 2023
Merged

Replace devIL with SDL2_image #344

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
951b3f2
Use SDL_Image instead of devIL
mlauss2 Sep 28, 2023
b88f09c
Let SDL_image do the scaling of the save screenshot
mlauss2 Sep 29, 2023
9817b64
Fix screenshot image orientation
mlauss2 Sep 29, 2023
ea082ef
SDL_Image: replace "struct Image" with SDL_Surface
mlauss2 Sep 29, 2023
16a0475
README.md: Linux: mention updated requirements
mlauss2 Sep 29, 2023
d2a209e
SDL-image: fix up editor
mlauss2 Sep 29, 2023
757c7e1
Fix braino in vertical flip
mlauss2 Sep 29, 2023
59a73ec
fix whitespace issue
mlauss2 Sep 29, 2023
4935ce2
Even more tydings
mlauss2 Sep 29, 2023
268eddd
saveGame: write zero sized PNG if pixmem alloc fails
mlauss2 Sep 29, 2023
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
8 changes: 3 additions & 5 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,9 @@ set_target_properties(tfe PROPERTIES OUTPUT_NAME "theforceengine")
if(LINUX)
find_package(PkgConfig REQUIRED)
find_package(Threads REQUIRED)
pkg_check_modules(SDL2 REQUIRED sdl2)
find_package(SDL2 2.24 REQUIRED)
pkg_check_modules(SDL2_IMAGE REQUIRED SDL2_image)
pkg_check_modules(GLEW REQUIRED glew)
pkg_check_modules(IL REQUIRED IL)
pkg_check_modules(ILU REQUIRED ILU)
set(OpenGL_GL_PREFERENCE GLVND)
find_package(OpenGL REQUIRED)
target_include_directories(tfe PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
Expand All @@ -59,8 +58,7 @@ if(LINUX)
${OPENGL_LIBRARIES}
${GLEW_LIBRARIES}
${SDL2_LIBRARIES}
${IL_LIBRARIES}
${ILU_LIBRARIES}
${SDL2_IMAGE_LIBRARIES}
)

if(NOT DISABLE_SYSMIDI)
Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ Runtime data like Savegames, Configuration, Mods, ... are by default stored at _
This can be overridden by defining the "__TFE_DATA_HOME__" environment variable.

### Required Libraries
* [SDL2](TheForceEngine/TFE_FrontEndUI/frontEndUi.cpp) 2.24 or higher
* [devIL](https://openil.sourceforge.net)
* [SDL2](http://libsdl.org) Version 2.24
* [SDL2-image](https://github.com/libsdl-org/SDL_image) Version 2.6.3
* [GLEW](http://glew.sourceforge.net/) 2.2.0
* OpenGL 3.3 capable driver (latest [mesa](https://www.mesa3d.org) or nvidia proprietary driver recommended)
* [RtMidi](https://www.music.mcgill.ca/~gary/rtmidi/) 5.0.0 or higher for external MIDI Synthesizer support
Expand Down
Loading