Skip to content

Commit

Permalink
pkg-config: add ${includedir}/SDL3_image to include path
Browse files Browse the repository at this point in the history
  • Loading branch information
@madebr
madebr committed Sep 29, 2023
1 parent 199a824 commit 0556b71
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion cmake/sdl3-image.pc.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ Requires: sdl3 >= @SDL_REQUIRED_VERSION@
Libs: -L${libdir} -lSDL3_image
Requires.private: @PC_REQUIRES@
Libs.private: @PC_LIBS@
Cflags: -I${includedir}
Cflags: -I${includedir} -I${includedir}/SDL3_image

5 comments on commit 0556b71

@sezero
Copy link
Contributor

@sezero sezero commented on 0556b71 Sep 29, 2023

Choose a reason for hiding this comment

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

This is reverting 37a4b80 for what reason? (You did this other libs too.)

@madebr
Copy link
Contributor Author

@madebr madebr commented on 0556b71 Sep 29, 2023

Choose a reason for hiding this comment

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

Oh shoot. Ryan did #include "SDL_net.h" and I assumed it was an oversight in the .pc files.

I wonder what would be best for the transition from SDL2 to SDL3 for users: we want to avoid including an SDL2_image header after SDL3.

Gotta revert 'em all?

@madebr
Copy link
Contributor Author

@madebr madebr commented on 0556b71 Sep 29, 2023

Choose a reason for hiding this comment

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

Btw, I've added a check in CMake that fails when users attempt to link SDL2 ànd SDL3 to the same target.

@sezero
Copy link
Contributor

@sezero sezero commented on 0556b71 Sep 29, 2023

Choose a reason for hiding this comment

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

Gotta revert 'em all?

Yes, looks like it

@madebr
Copy link
Contributor Author

@madebr madebr commented on 0556b71 Sep 29, 2023

Choose a reason for hiding this comment

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

I went around and also did the the cmake scripts.

I'm a bit curious what the fallout will be: there will be build failures because people are used to include SDL_image through #include "SDL_image.h" instead of #include <SDL3_image/SDL_image.h>.

Please sign in to comment.