From f7169f3b09f97dbfa316caaf86b7d5acad9df7ed Mon Sep 17 00:00:00 2001
From: Anonymous Maarten <[EMAIL REDACTED]>
Date: Wed, 21 Jun 2023 23:11:48 +0200
Subject: [PATCH] Move sources and documentation in subfolders
---
.github/workflows/main.yml | 2 +-
Android.mk | 45 +-
CMakeLists.txt | 57 +-
Makefile.am | 72 ++-
Makefile.in | 571 +++++++++++++-----
Makefile.os2 | 16 +-
README.txt | 2 +-
VisualC-WinRT/SDL_image-UWP.vcxproj | 476 +++++++--------
VisualC-WinRT/SDL_image-UWP.vcxproj.filters | 156 ++---
VisualC/SDL_image.vcxproj | 478 +++++++--------
VisualC/SDL_image.vcxproj.filters | 178 +++---
Xcode/SDL_image.xcodeproj/project.pbxproj | 46 +-
.../test-versioning.sh | 10 +-
configure | 4 +-
configure.ac | 6 +-
.../README-emscripten.txt | 0
README-versions.md => docs/README-versions.md | 0
.../release_checklist.md | 10 +-
showanim.c => examples/showanim.c | 0
showimage.c => examples/showimage.c | 0
external/libwebp | 2 +-
external/zlib | 2 +-
SDL_image.h => include/SDL_image.h | 0
IMG.c => src/IMG.c | 0
IMG_ImageIO.m => src/IMG_ImageIO.m | 0
IMG_WIC.c => src/IMG_WIC.c | 0
IMG_avif.c => src/IMG_avif.c | 0
IMG_bmp.c => src/IMG_bmp.c | 0
IMG_gif.c => src/IMG_gif.c | 0
IMG_jpg.c => src/IMG_jpg.c | 0
IMG_jxl.c => src/IMG_jxl.c | 0
IMG_lbm.c => src/IMG_lbm.c | 0
IMG_pcx.c => src/IMG_pcx.c | 0
IMG_png.c => src/IMG_png.c | 0
IMG_pnm.c => src/IMG_pnm.c | 0
IMG_qoi.c => src/IMG_qoi.c | 0
IMG_stb.c => src/IMG_stb.c | 0
IMG_svg.c => src/IMG_svg.c | 0
IMG_tga.c => src/IMG_tga.c | 0
IMG_tif.c => src/IMG_tif.c | 0
IMG_webp.c => src/IMG_webp.c | 0
IMG_xcf.c => src/IMG_xcf.c | 0
IMG_xpm.c => src/IMG_xpm.c | 0
IMG_xv.c => src/IMG_xv.c | 0
IMG_xxx.c => src/IMG_xxx.c | 0
miniz.h => src/miniz.h | 0
nanosvg.h => src/nanosvg.h | 0
nanosvgrast.h => src/nanosvgrast.h | 0
qoi.h => src/qoi.h | 0
stb_image.h => src/stb_image.h | 0
tiny_jpeg.h => src/tiny_jpeg.h | 0
version.rc => src/version.rc | 0
test/Makefile.am | 2 +-
test/Makefile.in | 17 +-
54 files changed, 1226 insertions(+), 926 deletions(-)
rename test-versioning.sh => build-scripts/test-versioning.sh (94%)
rename README-emscripten.txt => docs/README-emscripten.txt (100%)
rename README-versions.md => docs/README-versions.md (100%)
rename release_checklist.md => docs/release_checklist.md (87%)
rename showanim.c => examples/showanim.c (100%)
rename showimage.c => examples/showimage.c (100%)
rename SDL_image.h => include/SDL_image.h (100%)
rename IMG.c => src/IMG.c (100%)
rename IMG_ImageIO.m => src/IMG_ImageIO.m (100%)
rename IMG_WIC.c => src/IMG_WIC.c (100%)
rename IMG_avif.c => src/IMG_avif.c (100%)
rename IMG_bmp.c => src/IMG_bmp.c (100%)
rename IMG_gif.c => src/IMG_gif.c (100%)
rename IMG_jpg.c => src/IMG_jpg.c (100%)
rename IMG_jxl.c => src/IMG_jxl.c (100%)
rename IMG_lbm.c => src/IMG_lbm.c (100%)
rename IMG_pcx.c => src/IMG_pcx.c (100%)
rename IMG_png.c => src/IMG_png.c (100%)
rename IMG_pnm.c => src/IMG_pnm.c (100%)
rename IMG_qoi.c => src/IMG_qoi.c (100%)
rename IMG_stb.c => src/IMG_stb.c (100%)
rename IMG_svg.c => src/IMG_svg.c (100%)
rename IMG_tga.c => src/IMG_tga.c (100%)
rename IMG_tif.c => src/IMG_tif.c (100%)
rename IMG_webp.c => src/IMG_webp.c (100%)
rename IMG_xcf.c => src/IMG_xcf.c (100%)
rename IMG_xpm.c => src/IMG_xpm.c (100%)
rename IMG_xv.c => src/IMG_xv.c (100%)
rename IMG_xxx.c => src/IMG_xxx.c (100%)
rename miniz.h => src/miniz.h (100%)
rename nanosvg.h => src/nanosvg.h (100%)
rename nanosvgrast.h => src/nanosvgrast.h (100%)
rename qoi.h => src/qoi.h (100%)
rename stb_image.h => src/stb_image.h (100%)
rename tiny_jpeg.h => src/tiny_jpeg.h (100%)
rename version.rc => src/version.rc (100%)
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index b4975f17..184fa5c2 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -104,7 +104,7 @@ jobs:
- name: Check that versioning is consistent
# We only need to run this once: arbitrarily use the Linux/CMake build
if: "runner.os == 'Linux' && matrix.platform.cmake"
- run: ./test-versioning.sh
+ run: ./build-scripts/test-versioning.sh
- name: Setup (CMake)
if: ${{ matrix.platform.cmake && !matrix.platform.msystem && !matrix.platform.msvc }}
diff --git a/Android.mk b/Android.mk
index 42588d08..7b65f586 100644
--- a/Android.mk
+++ b/Android.mk
@@ -71,27 +71,28 @@ include $(CLEAR_VARS)
LOCAL_MODULE := SDL2_image
LOCAL_SRC_FILES := \
- IMG.c \
- IMG_avif.c \
- IMG_bmp.c \
- IMG_gif.c \
- IMG_jpg.c \
- IMG_jxl.c \
- IMG_lbm.c \
- IMG_pcx.c \
- IMG_png.c \
- IMG_pnm.c \
- IMG_qoi.c \
- IMG_stb.c \
- IMG_svg.c \
- IMG_tga.c \
- IMG_tif.c \
- IMG_webp.c \
- IMG_WIC.c \
- IMG_xcf.c \
- IMG_xpm.c.arm \
- IMG_xv.c
-
+ src/IMG.c \
+ src/IMG_avif.c \
+ src/IMG_bmp.c \
+ src/IMG_gif.c \
+ src/IMG_jpg.c \
+ src/IMG_jxl.c \
+ src/IMG_lbm.c \
+ src/IMG_pcx.c \
+ src/IMG_png.c \
+ src/IMG_pnm.c \
+ src/IMG_qoi.c \
+ src/IMG_stb.c \
+ src/IMG_svg.c \
+ src/IMG_tga.c \
+ src/IMG_tif.c \
+ src/IMG_webp.c \
+ src/IMG_WIC.c \
+ src/IMG_xcf.c \
+ src/IMG_xpm.c.arm \
+ src/IMG_xv.c
+
+LOCAL_C_INCLUDES += $(LOCAL_PATH)/include $(LOCAL_PATH)/src
LOCAL_CFLAGS := -DLOAD_BMP -DLOAD_GIF -DLOAD_LBM -DLOAD_PCX -DLOAD_PNM \
-DLOAD_SVG -DLOAD_TGA -DLOAD_XCF -DLOAD_XPM -DLOAD_XV \
-DLOAD_QOI
@@ -147,7 +148,7 @@ ifeq ($(SUPPORT_WEBP),true)
LOCAL_STATIC_LIBRARIES += webp
endif
-LOCAL_EXPORT_C_INCLUDES += $(LOCAL_PATH)
+LOCAL_EXPORT_C_INCLUDES += $(LOCAL_PATH)/include
include $(BUILD_SHARED_LIBRARY)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 534da8ef..02ef8bc2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -189,31 +189,34 @@ if(NOT DEFINED OpenGL_GL_PREFERENCE)
endif()
add_library(SDL2_image
- IMG.c
- IMG_WIC.c
- IMG_avif.c
- IMG_bmp.c
- IMG_gif.c
- IMG_jpg.c
- IMG_jxl.c
- IMG_lbm.c
- IMG_pcx.c
- IMG_png.c
- IMG_pnm.c
- IMG_qoi.c
- IMG_stb.c
- IMG_svg.c
- IMG_tga.c
- IMG_tif.c
- IMG_webp.c
- IMG_xcf.c
- IMG_xpm.c
- IMG_xv.c
+ src/IMG.c
+ src/IMG_WIC.c
+ src/IMG_avif.c
+ src/IMG_bmp.c
+ src/IMG_gif.c
+ src/IMG_jpg.c
+ src/IMG_jxl.c
+ src/IMG_lbm.c
+ src/IMG_pcx.c
+ src/IMG_png.c
+ src/IMG_pnm.c
+ src/IMG_qoi.c
+ src/IMG_stb.c
+ src/IMG_svg.c
+ src/IMG_tga.c
+ src/IMG_tif.c
+ src/IMG_webp.c
+ src/IMG_xcf.c
+ src/IMG_xpm.c
+ src/IMG_xv.c
)
add_library(SDL2_image::${sdl2_image_export_name} ALIAS SDL2_image)
target_include_directories(SDL2_image PUBLIC
- "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>"
- "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/SDL2>"
+ "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
+ "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
+ "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/SDL2>"
+ PRIVATE
+ "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>/src"
)
target_compile_definitions(SDL2_image PRIVATE
BUILD_SDL
@@ -224,7 +227,7 @@ target_compile_definitions(SDL2_image PRIVATE
target_link_libraries(SDL2_image PRIVATE $<BUILD_INTERFACE:${sdl2_target_name}>)
if(WIN32 AND SDL2IMAGE_BUILD_SHARED_LIBS)
target_sources(SDL2_image PRIVATE
- version.rc
+ src/version.rc
)
endif()
set_target_properties(SDL2_image PROPERTIES
@@ -309,7 +312,7 @@ if(APPLE)
target_link_libraries(SDL2_image PRIVATE -Wl,-framework,ApplicationServices)
target_link_libraries(SDL2_image PRIVATE objc)
target_sources(SDL2_image PRIVATE
- IMG_ImageIO.m
+ src/IMG_ImageIO.m
)
if (SDL2IMAGE_PNG AND NOT SDL2IMAGE_BACKEND_STB)
@@ -690,7 +693,7 @@ if(SDL2IMAGE_INSTALL)
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT library
)
install(
- FILES "${CMAKE_CURRENT_SOURCE_DIR}/SDL_image.h"
+ FILES "${CMAKE_CURRENT_SOURCE_DIR}/include/SDL_image.h"
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/SDL2" COMPONENT DEVEL
)
@@ -780,8 +783,8 @@ if(SDL2IMAGE_INSTALL)
endif()
if(SDL2IMAGE_SAMPLES)
- add_executable(showanim showanim.c)
- add_executable(showimage showimage.c)
+ add_executable(showanim examples/showanim.c)
+ add_executable(showimage examples/showimage.c)
find_package(SDL2main)
diff --git a/Makefile.am b/Makefile.am
index 0390416c..56f5ce1d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,51 +5,51 @@ lib_LTLIBRARIES = libSDL2_image.la
libSDL2_imageincludedir = $(includedir)/SDL2
libSDL2_imageinclude_HEADERS = \
- SDL_image.h
+ include/SDL_image.h
if USE_IMAGEIO
-IMAGEIO_SOURCE = IMG_ImageIO.m
+IMAGEIO_SOURCE = src/IMG_ImageIO.m
endif
libSDL2_image_la_SOURCES = \
- IMG.c \
- IMG_avif.c \
- IMG_bmp.c \
- IMG_gif.c \
- IMG_jpg.c \
- IMG_jxl.c \
- IMG_lbm.c \
- IMG_pcx.c \
- IMG_png.c \
- IMG_pnm.c \
- IMG_qoi.c \
- IMG_svg.c \
- IMG_stb.c \
- IMG_tga.c \
- IMG_tif.c \
- IMG_xcf.c \
- IMG_xpm.c \
- IMG_xv.c \
- IMG_webp.c \
- IMG_WIC.c \
+ src/IMG.c \
+ src/IMG_avif.c \
+ src/IMG_bmp.c \
+ src/IMG_gif.c \
+ src/IMG_jpg.c \
+ src/IMG_jxl.c \
+ src/IMG_lbm.c \
+ src/IMG_pcx.c \
+ src/IMG_png.c \
+ src/IMG_pnm.c \
+ src/IMG_qoi.c \
+ src/IMG_svg.c \
+ src/IMG_stb.c \
+ src/IMG_tga.c \
+ src/IMG_tif.c \
+ src/IMG_xcf.c \
+ src/IMG_xpm.c \
+ src/IMG_xv.c \
+ src/IMG_webp.c \
+ src/IMG_WIC.c \
$(IMAGEIO_SOURCE) \
- miniz.h \
- nanosvg.h \
- nanosvgrast.h \
- qoi.h \
- stb_image.h \
- tiny_jpeg.h
+ src/miniz.h \
+ src/nanosvg.h \
+ src/nanosvgrast.h \
+ src/qoi.h \
+ src/stb_image.h \
+ src/tiny_jpeg.h
EXTRA_DIST = \
.gitmodules \
Android.mk \
CHANGES.txt \
CMakeLists.txt \
- IMG_ImageIO.m \
- IMG_xxx.c \
+ src/IMG_ImageIO.m \
+ src/IMG_xxx.c \
LICENSE.txt \
Makefile.os2 \
- README-emscripten.txt \
+ docs/README-emscripten.txt \
README.txt \
SDL2_image.spec \
SDL2_imageConfig.cmake.in \
@@ -60,16 +60,17 @@ EXTRA_DIST = \
cmake \
external \
mingw \
- version.rc
+ src/version.rc
+libSDL2_image_la_CPPFLAGS = -I$(srcdir)/include
libSDL2_image_la_LDFLAGS = \
-no-undefined \
-release $(LT_RELEASE) \
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LT_EXTRA)
libSDL2_image_la_LIBADD = $(IMG_LIBS)
if USE_VERSION_RC
-libSDL2_image_la_DEPENDENCIES = version.o
+libSDL2_image_la_DEPENDENCIES = src/version.o
endif
pkgconfigdir = $(libdir)/pkgconfig
@@ -80,7 +81,12 @@ pkgconfig_DATA = SDL2_image.pc
noinst_PROGRAMS = showimage showanim
+showimage_SOURCES = examples/showimage.c
+showimage_CPPFLAGS = -I$(srcdir)/include
showimage_LDADD = libSDL2_image.la
+
+showanim_SOURCES = examples/showanim.c
+showanim_CPPFLAGS = -I$(srcdir)/include
showanim_LDADD = libSDL2_image.la
SUBDIRS = .
diff --git a/Makefile.in b/Makefile.in
index 17b82847..1cdc27c1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -151,18 +151,35 @@ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" \
"$(DESTDIR)$(libSDL2_imageincludedir)"
LTLIBRARIES = $(lib_LTLIBRARIES)
am__DEPENDENCIES_1 =
-am__libSDL2_image_la_SOURCES_DIST = IMG.c IMG_avif.c IMG_bmp.c \
- IMG_gif.c IMG_jpg.c IMG_jxl.c IMG_lbm.c IMG_pcx.c IMG_png.c \
- IMG_pnm.c IMG_qoi.c IMG_svg.c IMG_stb.c IMG_tga.c IMG_tif.c \
- IMG_xcf.c IMG_xpm.c IMG_xv.c IMG_webp.c IMG_WIC.c \
- IMG_ImageIO.m miniz.h nanosvg.h nanosvgrast.h qoi.h \
- stb_image.h tiny_jpeg.h
-@USE_IMAGEIO_TRUE@am__objects_1 = IMG_ImageIO.lo
-am_libSDL2_image_la_OBJECTS = IMG.lo IMG_avif.lo IMG_bmp.lo IMG_gif.lo \
- IMG_jpg.lo IMG_jxl.lo IMG_lbm.lo IMG_pcx.lo IMG_png.lo \
- IMG_pnm.lo IMG_qoi.lo IMG_svg.lo IMG_stb.lo IMG_tga.lo \
- IMG_tif.lo IMG_xcf.lo IMG_xpm.lo IMG_xv.lo IMG_webp.lo \
- IMG_WIC.lo $(am__objects_1)
+am__libSDL2_image_la_SOURCES_DIST = src/IMG.c src/IMG_avif.c \
+ src/IMG_bmp.c src/IMG_gif.c src/IMG_jpg.c src/IMG_jxl.c \
+ src/IMG_lbm.c src/IMG_pcx.c src/IMG_png.c src/IMG_pnm.c \
+ src/IMG_qoi.c src/IMG_svg.c src/IMG_stb.c src/IMG_tga.c \
+ src/IMG_tif.c src/IMG_xcf.c src/IMG_xpm.c src/IMG_xv.c \
+ src/IMG_webp.c src/IMG_WIC.c src/IMG_ImageIO.m src/miniz.h \
+ src/nanosvg.h src/nanosvgrast.h src/qoi.h src/stb_image.h \
+ src/tiny_jpeg.h
+am__dirstamp = $(am__leading_dot)dirstamp
+@USE_IMAGEIO_TRUE@am__objects_1 = src/libSDL2_image_la-IMG_ImageIO.lo
+am_libSDL2_image_la_OBJECTS = src/libSDL2_image_la-IMG.lo \
+ src/libSDL2_image_la-IMG_avif.lo \
+ src/libSDL2_image_la-IMG_bmp.lo \
+ src/libSDL2_image_la-IMG_gif.lo \
+ src/libSDL2_image_la-IMG_jpg.lo \
+ src/libSDL2_image_la-IMG_jxl.lo \
+ src/libSDL2_image_la-IMG_lbm.lo \
+ src/libSDL2_image_la-IMG_pcx.lo \
+ src/libSDL2_image_la-IMG_png.lo \
+ src/libSDL2_image_la-IMG_pnm.lo \
+ src/libSDL2_image_la-IMG_qoi.lo \
+ src/libSDL2_image_la-IMG_svg.lo \
+ src/libSDL2_image_la-IMG_stb.lo \
+ src/libSDL2_image_la-IMG_tga.lo \
+ src/libSDL2_image_la-IMG_tif.lo \
+ src/libSDL2_image_la-IMG_xcf.lo \
+ src/libSDL2_image_la-IMG_xpm.lo src/libSDL2_image_la-IMG_xv.lo \
+ src/libSDL2_image_la-IMG_webp.lo \
+ src/libSDL2_image_la-IMG_WIC.lo $(am__objects_1)
libSDL2_image_la_OBJECTS = $(am_libSDL2_image_la_OBJECTS)
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
@@ -171,11 +188,11 @@ am__v_lt_1 =
libSDL2_image_la_LINK = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(OBJCLD) $(AM_OBJCFLAGS) \
$(OBJCFLAGS) $(libSDL2_image_la_LDFLAGS) $(LDFLAGS) -o $@
-showanim_SOURCES = showanim.c
-showanim_OBJECTS = showanim.$(OBJEXT)
+am_showanim_OBJECTS = examples/showanim-showanim.$(OBJEXT)
+showanim_OBJECTS = $(am_showanim_OBJECTS)
showanim_DEPENDENCIES = libSDL2_image.la
-showimage_SOURCES = showimage.c
-showimage_OBJECTS = showimage.$(OBJEXT)
+am_showimage_OBJECTS = examples/showimage-showimage.$(OBJEXT)
+showimage_OBJECTS = $(am_showimage_OBJECTS)
showimage_DEPENDENCIES = libSDL2_image.la
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
@@ -192,18 +209,29 @@ am__v_at_1 =
DEFAULT_INCLUDES = -I.@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__maybe_remake_depfiles = depfiles
-am__depfiles_remade = ./$(DEPDIR)/IMG.Plo ./$(DEPDIR)/IMG_ImageIO.Plo \
- ./$(DEPDIR)/IMG_WIC.Plo ./$(DEPDIR)/IMG_avif.Plo \
- ./$(DEPDIR)/IMG_bmp.Plo ./$(DEPDIR)/IMG_gif.Plo \
- ./$(DEPDIR)/IMG_jpg.Plo ./$(DEPDIR)/IMG_jxl.Plo \
- ./$(DEPDIR)/IMG_lbm.Plo ./$(DEPDIR)/IMG_pcx.Plo \
- ./$(DEPDIR)/IMG_png.Plo ./$(DEPDIR)/IMG_pnm.Plo \
- ./$(DEPDIR)/IMG_qoi.Plo ./$(DEPDIR)/IMG_stb.Plo \
- ./$(DEPDIR)/IMG_svg.Plo ./$(DEPDIR)/IMG_tga.Plo \
- ./$(DEPDIR)/IMG_tif.Plo ./$(DEPDIR)/IMG_webp.Plo \
- ./$(DEPDIR)/IMG_xcf.Plo ./$(DEPDIR)/IMG_xpm.Plo \
- ./$(DEPDIR)/IMG_xv.Plo ./$(DEPDIR)/showanim.Po \
- ./$(DEPDIR)/showimage.Po
+am__depfiles_remade = examples/$(DEPDIR)/showanim-showanim.Po \
+ examples/$(DEPDIR)/showimage-showimage.Po \
+ src/$(DEPDIR)/libSDL2_image_la-IMG.Plo \
+ src/$(DEPDIR)/libSDL2_image_la-IMG_ImageIO.Plo \
+ src/$(DEPDIR)/libSDL2_image_la-IMG_WIC.Plo \
+ src/$(DEPDIR)/libSDL2_image_la-IMG_avif.Plo \
+ src/$(DEPDIR)/libSDL2_image_la-IMG_bmp.Plo \
+ src/$(DEPDIR)/libSDL2_image_la-IMG_gif.Plo \
+ src/$(DEPDIR)/libSDL2_image_la-IMG_jpg.Plo \
+ src/$(DEPDIR)/libSDL2_image_la-IMG_jxl.Plo \
+ src/$(DEPDIR)/libSDL2_image_la-IMG_lbm.Plo \
+ src/$(DEPDIR)/libSDL2_image_la-IMG_pcx.Plo \
+ src/$(DEPDIR)/libSDL2_image_la-IMG_png.Plo \
+ src/$(DEPDIR)/libSDL2_image_la-IMG_pnm.Plo \
+ src/$(DEPDIR)/libSDL2_image_la-IMG_qoi.Plo \
+ src/$(DEPDIR)/libSDL2_image_la-IMG_stb.Plo \
+ src/$(DEPDIR)/libSDL2_image_la-IMG_svg.Plo \
+ src/$(DEPDIR)/libSDL2_image_la-IMG_tga.Plo \
+ src/$(DEPDIR)/libSDL2_image_la-IMG_tif.Plo \
+ src/$(DEPDIR)/libSDL2_image_la-IMG_webp.Plo \
+ src/$(DEPDIR)/libSDL2_image_la-IMG_xcf.Plo \
+ src/$(DEPDIR)/libSDL2_image_la-IMG_xpm.Plo \
+ src/$(DEPDIR)/libSDL2_image_la-IMG_xv.Plo
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -241,9 +269,10 @@ AM_V_OBJCLD = $(am__v_OBJCLD_@AM_V@)
am__v_OBJCLD_ = $(am__v_OBJCLD_@AM_DEFAULT_V@)
am__v_OBJCLD_0 = @echo " OBJCLD " $@;
am__v_OBJCLD_1 =
-SOURCES = $(libSDL2_image_la_SOURCES) showanim.c showimage.c
-DIST_SOURCES = $(am__libSDL2_image_la_SOURCES_DIST) showanim.c \
- showimage.c
+SOURCES = $(libSDL2_image_la_SOURCES) $(showanim_SOURCES) \
+ $(showimage_SOURCES)
+DIST_SOURCES = $(am__libSDL2_image_la_SOURCES_DIST) \
+ $(showanim_SOURCES) $(showimage_SOURCES)
RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
ctags-recursive dvi-recursive html-recursive info-recursive \
install-data-recursive install-dvi-recursive \
@@ -518,48 +547,48 @@ ACLOCAL_AMFLAGS = -I acinclude
lib_LTLIBRARIES = libSDL2_image.la
libSDL2_imageincludedir = $(includedir)/SDL2
libSDL2_imageinclude_HEADERS = \
- SDL_image.h
+ include/SDL_image.h
-@USE_IMAGEIO_TRUE@IMAGEIO_SOURCE = IMG_ImageIO.m
+@USE_IMAGEIO_TRUE@IMAGEIO_SOURCE = src/IMG_ImageIO.m
libSDL2_image_la_SOURCES = \
- IMG.c \
- IMG_avif.c \
- IMG_bmp.c \
- IMG_gif.c \
- IMG_jpg.c \
- IMG_jxl.c \
- IMG_lbm.c \
- IMG_pcx.c \
- IMG_png.c \
- IMG_pnm.c \
- IMG_qoi.c \
- IMG_svg.c \
- IMG_stb.c \
- IMG_tga.c \
- IMG_tif.c \
- IMG_xcf.c \
- IMG_xpm.c \
- IMG_xv.c \
- IMG_webp.c \
- IMG_WIC.c \
+ src/IMG.c \
+ src/IMG_avif.c \
+ src/IMG_bmp.c \
+ src/IMG_gif.c \
+ src/IMG_jpg.c \
+ src/IMG_jxl.c \
+ src/IMG_lbm.c \
+ src/IMG_pcx.c \
+ src/IMG_png.c \
+ src/IMG_pnm.c \
+ src/IMG_qoi.c \
+ src/IMG_svg.c \
+ src/IMG_stb.c \
+ src/IMG_tga.c \
+ src/IMG_tif.c \
+ src/IMG_xcf.c \
+ src/IMG_xpm.c \
+ src/IMG_xv.c \
+ src/IMG_webp.c \
+ src/IMG_WIC.c \
$(IMAGEIO_SOURCE) \
- miniz.h \
- nanosvg.h \
- nanosvgrast.h \
- qoi.h \
- stb_image.h \
- tiny_jpeg.h
+ src/miniz.h \
+ src/nanosvg.h \
+ src/nanosvgrast.h \
+ src/qoi.h \
+ src/stb_image.h \
+ src/tiny_jpeg.h
EXTRA_DIST = \
.gitmodules \
Android.mk \
CHANGES.txt \
CMakeLists.txt \
- IMG_ImageIO.m \
- IMG_xxx.c \
+ src/IMG_ImageIO.m \
+ src/IMG_xxx.c \
LICENSE.txt \
Makefile.os2 \
- README-emscripten.txt \
+ docs/README-emscripten.txt \
README.txt \
SDL2_image.spec \
SDL2_imageConfig.cmake.in \
@@ -570,18 +599,23 @@ EXTRA_DIST = \
cmake \
external \
mingw \
- version.rc
+ src/version.rc
+libSDL2_image_la_CPPFLAGS = -I$(srcdir)/include
libSDL2_image_la_LDFLAGS = \
-no-undefined \
-release $(LT_RELEASE) \
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LT_EXTRA)
libSDL2_image_la_LIBADD = $(IMG_LIBS)
-@USE_VERSION_RC_TRUE@libSDL2_image_la_DEPENDENCIES = version.o
+@USE_VERSION_RC_TRUE@libSDL2_image_la_DEPENDENCIES = src/version.o
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = SDL2_image.pc
+showimage_SOURCES = examples/showimage.c
+showimage_CPPFLAGS = -I$(srcdir)/include
showimage_LDADD = libSDL2_image.la
+showanim_SOURCES = examples/showanim.c
+showanim_CPPFLAGS = -I$(srcdir)/include
showanim_LDADD = libSDL2_image.la
SUBDIRS = . $(am__append_1)
all: all-recursive
@@ -673,13 +707,71 @@ clean-libLTLIBRARIES:
echo rm -f $${locs}; \
rm -f $${locs}; \
}
+src/$(am__dirstamp):
+ @$(MKDIR_P) src
+ @: > src/$(am__dirstamp)
+src/$(DEPDIR)/$(am__dirstamp):
+ @$(MKDIR_P) src/$(DEPDIR)
+ @: > src/$(DEPDIR)/$(am__dirstamp)
+src/libSDL2_image_la-IMG.lo: src/$(am__dirstamp) \
+ src/$(DEPDIR)/$(am__dirstamp)
+src/libSDL2_image_la-IMG_avif.lo: src/$(am__dirstamp) \
+ src/$(DEPDIR)/$(am__dirstamp)
+src/libSDL2_image_la-IMG_bmp.lo: src/$(am__dirstamp) \
+ src/$(DEPDIR)/$(am__dirstamp)
+src/libSDL2_image_la-IMG_gif.lo: src/$(am__dirstamp) \
+ src/$(DEPDIR)/$(am__dirstamp)
+src/libSDL2_image_la-IMG_jpg.lo: src/$(am__dirstamp) \
+ src/$(DEPDIR)/$(am__dirstamp)
+src/libSDL2_image_la-IMG_jxl.lo: src/$(am__dirstamp) \
+ src/$(DEPDIR)/$(am__dirstamp)
+src/libSDL2_image_la-IMG_lbm.lo: src/$(am__dirstamp) \
+ src/$(DEPDIR)/$(am__dirstamp)
+src/libSDL2_image_la-IMG_pcx.lo: src/$(am__dirstamp) \
+ src/$(DEPDIR)/$(am__dirstamp)
+src/libSDL2_image_la-IMG_png.lo: src/$(am__dirstamp) \
+ src/$(DEPDIR)/$(am__dirstamp)
+src/libSDL2_image_la-IMG_pnm.lo: src/$(am__dirstamp) \
+ src/$(DEPDIR)/$(am__dirstamp)
+src/libSDL2_image_la-IMG_qoi.lo: src/$(am__dirstamp) \
+ src/$(DEPDIR)/$(am__dirstamp)
+src/libSDL2_image_la-IMG_svg.lo: src/$(am__dirstamp) \
+ src/$(DEPDIR)/$(am__dirstamp)
+src/libSDL2_image_la-IMG_stb.lo: src/$(am__dirstamp) \
+ src/$(DEPDIR)/$(am__dirstamp)
+src/libSDL2_image_la-IMG_tga.lo: src/$(am__dirstamp) \
+ src/$(DEPDIR)/$(am__dirstamp)
+src/libSDL2_image_la-IMG_tif.lo: src/$(am__dirstamp) \
+ src/$(DEPDIR)/$(am__dirstamp)
+src/libSDL2_image_la-IMG_xcf.lo: src/$(am__dirstamp) \
+ src/$(DEPDIR)/$(am__dirstamp)
+src/libSDL2_image_la-IMG_xpm.lo: src/$(am__dirstamp) \
+ src/$(DEPDIR)/$(am__dirstamp)
+src/libSDL2_image_la-IMG_xv.lo: src/$(am__dirstamp) \
+ src/$(DEPDIR)/$(am__dirstamp)
+src/libSDL2_image_la-IMG_webp.lo: src/$(am__dirstamp) \
+ src/$(DEPDIR)/$(am__dirstamp)
+src/libSDL2_image_la-IMG_WIC.lo: src/$(am__dirstamp) \
+ src/$(DEPDIR)/$(am__dirstamp)
+src/libSDL2_image_la-IMG_ImageIO.lo: src/$(am__dirstamp) \
+ src/$(DEPDIR)/$(am__dirstamp)
libSDL2_image.la: $(libSDL2_image_la_OBJECTS) $(libSDL2_image_la_DEPENDENCIES) $(EXTRA_libSDL2_image_la_DEPENDENCIES)
$(AM_V_OBJCLD)$(libSDL2_image_la_LINK) -rpath $(libdir) $(libSDL2_image_la_OBJECTS) $(libSDL2_image_la_LIBADD) $(LIBS)
+examples/$(am__dirstamp):
+ @$(MKDIR_P) examples
+ @: > examples/$(am__dirstamp)
+examples/$(DEPDIR)/$(am__dirstamp):
+ @$(MKDIR_P) examples/$(DEPDIR)
+ @: > examples/$(DEPDIR)/$(am__dirstamp)
+examples/showanim-showanim.$(OBJEXT): examples/$(am__dirstamp) \
+ examples/$(DEPDIR)/$(am__dirstamp)
showanim$(EXEEXT): $(showanim_OBJECTS) $(showanim_DEPENDENCIES) $(EXTRA_showanim_DEPENDENCIES)
@rm -f showanim$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(showanim_OBJECTS) $(showanim_LDADD) $(LIBS)
+examples/showimage-showimage.$(OBJEXT): examples/$(am__dirstamp) \
+ examples/$(DEPDIR)/$(am__dirstamp)
showimage$(EXEEXT): $(showimage_OBJECTS) $(showimage_DEPENDENCIES) $(EXTRA_showimage_DEPENDENCIES)
@rm -f showimage$(EXEEXT)
@@ -687,33 +779,36 @@ showimage$(EXEEXT): $(showimage_OBJECTS) $(showimage_DEPENDENCIES) $(EXTRA_showi
mostlyclean-compile:
-rm -f *.$(OBJEXT)
+ -rm -f examples/*.$(OBJEXT)
+ -rm -f src/*.$(OBJEXT)
+ -rm -f src/*.lo
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMG.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMG_ImageIO.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMG_WIC.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMG_avif.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMG_bmp.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMG_gif.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMG_jpg.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMG_jxl.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMG_lbm.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMG_pcx.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMG_png.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMG_pnm.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMG_qoi.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMG_stb.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMG_svg.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMG_tga.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMG_tif.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMG_webp.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMG_xcf.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMG_xpm.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMG_xv.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/showanim.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/showimage.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@examples/$(DEPDIR)/showanim-showanim.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@examples/$(DEPDIR)/showimage-showimage.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libSDL2_image_la-IMG.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libSDL2_image_la-IMG_ImageIO.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libSDL2_image_la-IMG_WIC.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libSDL2_image_la-IMG_avif.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libSDL2_image_la-IMG_bmp.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libSDL2_image_la-IMG_gif.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libSDL2_image_la-IMG_jpg.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libSDL2_image_la-IMG_jxl.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libSDL2_image_la-IMG_lbm.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libSDL2_image_la-IMG_pcx.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libSDL2_image_la-IMG_png.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libSDL2_image_la-IMG_pnm.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libSDL2_image_la-IMG_qoi.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libSDL2_image_la-IMG_stb.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libSDL2_image_la-IMG_svg.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libSDL2_image_la-IMG_tga.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libSDL2_image_la-IMG_tif.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libSDL2_image_la-IMG_webp.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libSDL2_image_la-IMG_xcf.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libSDL2_image_la-IMG_xpm.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libSDL2_image_la-IMG_xv.Plo@am__quote@ # am--include-marker
$(am__depfiles_remade):
@$(MKDIR_P) $(@D)
@@ -722,52 +817,234 @@ $(am__depfiles_remade):
am--depfiles: $(am__depfiles_remade)
.c.o:
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
.c.obj:
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
.c.lo:
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+src/libSDL2_image_la-IMG.lo: src/IMG.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSDL2_image_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libSDL2_image_la-IMG.lo -MD -MP -MF src/$(DEPDIR)/libSDL2_image_la-IMG.Tpo -c -o src/libSDL2_image_la-IMG.lo `test -f 'src/IMG.c' || echo '$(srcdir)/'`src/IMG.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/$(DEPDIR)/libSDL2_image_la-IMG.Tpo src/$(DEPDIR)/libSDL2_image_la-IMG.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/IMG.c' object='src/libSDL2_image_la-IMG.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS)
(Patch may be truncated, please check the link at the top of this post.)