mirrors/mkxp-z
1
0
Fork 0
mirror of https://github.com/mkxp-z/mkxp-z.git synced 2025-08-23 23:33:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

updated SDL_image

Browse source
This commit is contained in:
Snowdream 2022-07-18 00:04:28 -04:00
parent ba49af5ad7
commit ff74f08fc0
3 changed files with 53 additions and 98 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
linux/Makefile
View file

@ -29,6 +29,7 @@ CONFIGURE_ARGS := --prefix="$(BUILD_PREFIX)"
CMAKE_ARGS := \ CMAKE_ARGS := \
-DCMAKE_INSTALL_PREFIX="$(BUILD_PREFIX)" \ -DCMAKE_INSTALL_PREFIX="$(BUILD_PREFIX)" \
-DCMAKE_PREFIX_PATH="$(BUILD_PREFIX)" \
-DCMAKE_C_FLAGS="$(CFLAGS)" -DCMAKE_C_FLAGS="$(CFLAGS)"
RUBY_CONFIGURE_ARGS := \ RUBY_CONFIGURE_ARGS := \
@ -181,20 +182,6 @@ $(DOWNLOADS)/libpng/Makefile: $(DOWNLOADS)/libpng/configure
$(DOWNLOADS)/libpng/configure: $(DOWNLOADS)/libpng/configure:
$(CLONE) $(GITLAB)/mkxp-z/libpng $(DOWNLOADS)/libpng $(CLONE) $(GITLAB)/mkxp-z/libpng $(DOWNLOADS)/libpng
# libjpeg
libjpeg: init_dirs $(LIBDIR)/libjpeg.a
$(LIBDIR)/libjpeg.a: $(DOWNLOADS)/libjpeg/cmakebuild/Makefile
cd $(DOWNLOADS)/libjpeg/cmakebuild; \
make -j$(NPROC); make install
$(DOWNLOADS)/libjpeg/cmakebuild/Makefile: $(DOWNLOADS)/libjpeg/CMakeLists.txt
cd $(DOWNLOADS)/libjpeg; mkdir -p cmakebuild; cd cmakebuild; \
$(CMAKE) -DENABLE_SHARED=no -DENABLE_STATIC=yes
$(DOWNLOADS)/libjpeg/CMakeLists.txt:
$(CLONE) $(GITLAB)/mkxp-z/libjpeg-turbo $(DOWNLOADS)/libjpeg
# SDL2 # SDL2
sdl2: init_dirs $(LIBDIR)/libSDL2.a sdl2: init_dirs $(LIBDIR)/libSDL2.a
@ -212,26 +199,24 @@ $(DOWNLOADS)/sdl2/configure: $(DOWNLOADS)/sdl2/autogen.sh
$(DOWNLOADS)/sdl2/autogen.sh: $(DOWNLOADS)/sdl2/autogen.sh:
$(CLONE) $(GITLAB)/mkxp-z/SDL $(DOWNLOADS)/sdl2 -b mkxp-z; cd $(DOWNLOADS)/sdl2 $(CLONE) $(GITLAB)/mkxp-z/SDL $(DOWNLOADS)/sdl2 -b mkxp-z; cd $(DOWNLOADS)/sdl2
# SDL2 (Image) # SDL_image
sdl2image: init_dirs sdl2 libpng libjpeg $(LIBDIR)/libSDL2_image.a sdl2image: init_dirs sdl2 $(LIBDIR)/libSDL2_image.a
$(LIBDIR)/libSDL2_image.a: $(DOWNLOADS)/sdl2_image/Makefile $(LIBDIR)/libSDL2_image.a: $(DOWNLOADS)/sdl2_image/cmakebuild/Makefile
cd $(DOWNLOADS)/sdl2_image; \ cd $(DOWNLOADS)/sdl2_image/cmakebuild; \
make -j$(NPROC); make install make -j$(NPROC); make install
$(DOWNLOADS)/sdl2_image/Makefile: $(DOWNLOADS)/sdl2_image/configure $(DOWNLOADS)/sdl2_image/cmakebuild/Makefile: $(DOWNLOADS)/sdl2_image/CMakeLists.txt
cd $(DOWNLOADS)/sdl2_image; \ cd $(DOWNLOADS)/sdl2_image; mkdir -p cmakebuild; cd cmakebuild; \
LIBPNG_LIBS="-L$(LIBDIR) -lpng" LIBPNG_CFLAGS="-I$(INCLUDEDIR)" \ $(CMAKE) \
$(CONFIGURE) --enable-static=true --enable-shared=false \ -DBUILD_SHARED_LIBS=no \
--disable-imageio \ -DSDL2IMAGE_JPG_SAVE=yes \
--enable-png=yes --enable-png-shared=no \ -DSDL2IMAGE_PNG_SAVE=yes \
--enable-jpg=yes --enable-jpg-shared=no \ -DSDL2IMAGE_PNG_SHARED=no \
--enable-webp=no $(SDL2_IMAGE_FLAGS) -DSDL2IMAGE_JPG_SHARED=no
$(DOWNLOADS)/sdl2_image/configure: $(DOWNLOADS)/sdl2_image/autogen.sh $(DOWNLOADS)/sdl2_image/CMakeLists.txt:
cd $(DOWNLOADS)/sdl2_image; ./autogen.sh
$(DOWNLOADS)/sdl2_image/autogen.sh:
$(CLONE) $(GITLAB)/mkxp-z/SDL_image $(DOWNLOADS)/sdl2_image -b mkxp-z $(CLONE) $(GITLAB)/mkxp-z/SDL_image $(DOWNLOADS)/sdl2_image -b mkxp-z
# SDL_sound # SDL_sound
@ -351,5 +336,5 @@ powerwash: clean-downloads
clean-downloads: clean-downloads:
-rm -rf downloads -rm -rf downloads
deps-core: libtheora libvorbis pixman libpng libjpeg physfs sdl2 sdl2image sdlsound sdl2ttf openal openssl fluidsynth uchardet iconv deps-core: libtheora libvorbis pixman libpng physfs sdl2 sdl2image sdlsound sdl2ttf openal openssl fluidsynth uchardet iconv
everything: deps-core ruby everything: deps-core autoconf ruby

53
macos/Dependencies/dependencies.make
View file

@ -34,6 +34,7 @@ CONFIGURE_ARGS := \
CMAKE_ARGS := \ CMAKE_ARGS := \
-DCMAKE_INSTALL_PREFIX="$(BUILD_PREFIX)" \ -DCMAKE_INSTALL_PREFIX="$(BUILD_PREFIX)" \
-DCMAKE_PREFIX_PATH="$(BUILD_PREFIX)" \
-DCMAKE_OSX_SYSROOT=$(SDKROOT) \ -DCMAKE_OSX_SYSROOT=$(SDKROOT) \
-DCMAKE_OSX_ARCHITECTURES=$(ARCH) \ -DCMAKE_OSX_ARCHITECTURES=$(ARCH) \
-DCMAKE_OSX_DEPLOYMENT_TARGET=$(MINIMUM_REQUIRED) \ -DCMAKE_OSX_DEPLOYMENT_TARGET=$(MINIMUM_REQUIRED) \
@ -176,20 +177,6 @@ $(DOWNLOADS)/libpng/Makefile: $(DOWNLOADS)/libpng/configure
$(DOWNLOADS)/libpng/configure: $(DOWNLOADS)/libpng/configure:
$(CLONE) $(GITLAB)/mkxp-z/libpng $(DOWNLOADS)/libpng $(CLONE) $(GITLAB)/mkxp-z/libpng $(DOWNLOADS)/libpng
# libjpeg
libjpeg: init_dirs $(LIBDIR)/libjpeg.a
$(LIBDIR)/libjpeg.a: $(DOWNLOADS)/libjpeg/cmakebuild/Makefile
cd $(DOWNLOADS)/libjpeg/cmakebuild; \
make -j$(NPROC); make install
$(DOWNLOADS)/libjpeg/cmakebuild/Makefile: $(DOWNLOADS)/libjpeg/CMakeLists.txt
cd $(DOWNLOADS)/libjpeg; mkdir -p cmakebuild; cd cmakebuild; \
$(CMAKE) -DENABLE_SHARED=no -DENABLE_STATIC=yes
$(DOWNLOADS)/libjpeg/CMakeLists.txt:
$(CLONE) $(GITLAB)/mkxp-z/libjpeg-turbo $(DOWNLOADS)/libjpeg
# SDL2 # SDL2
sdl2: init_dirs $(LIBDIR)/libSDL2.a sdl2: init_dirs $(LIBDIR)/libSDL2.a
@ -207,28 +194,26 @@ $(DOWNLOADS)/sdl2/configure: $(DOWNLOADS)/sdl2/autogen.sh
$(DOWNLOADS)/sdl2/autogen.sh: $(DOWNLOADS)/sdl2/autogen.sh:
$(CLONE) $(GITLAB)/mkxp-z/SDL $(DOWNLOADS)/sdl2 -b mkxp-z; cd $(DOWNLOADS)/sdl2 $(CLONE) $(GITLAB)/mkxp-z/SDL $(DOWNLOADS)/sdl2 -b mkxp-z; cd $(DOWNLOADS)/sdl2
# SDL_image
sdl2image: init_dirs sdl2 $(LIBDIR)/libSDL2_image.a
# SDL2 (Image) $(LIBDIR)/libSDL2_image.a: $(DOWNLOADS)/sdl2_image/cmakebuild/Makefile
sdl2image: init_dirs sdl2 libpng libjpeg $(LIBDIR)/libSDL2_image.a cd $(DOWNLOADS)/sdl2_image/cmakebuild; \
$(LIBDIR)/libSDL2_image.a: $(DOWNLOADS)/sdl2_image/Makefile
cd $(DOWNLOADS)/sdl2_image; \
make -j$(NPROC); make install make -j$(NPROC); make install
$(DOWNLOADS)/sdl2_image/Makefile: $(DOWNLOADS)/sdl2_image/configure $(DOWNLOADS)/sdl2_image/cmakebuild/Makefile: $(DOWNLOADS)/sdl2_image/CMakeLists.txt
cd $(DOWNLOADS)/sdl2_image; \ cd $(DOWNLOADS)/sdl2_image; mkdir -p cmakebuild; cd cmakebuild; \
LIBPNG_LIBS="-L$(LIBDIR)/libpng.a -lpng" LIBPNG_CFLAGS="-I$(INCLUDEDIR)" \ $(CMAKE) \
$(CONFIGURE) --enable-static=true --enable-shared=false \ -DBUILD_SHARED_LIBS=no \
--disable-imageio \ -DSDL2IMAGE_JPG_SAVE=yes \
--enable-png=yes --enable-png-shared=no \ -DSDL2IMAGE_PNG_SAVE=yes \
--enable-jpg=yes --enable-jpg-shared=no \ -DSDL2IMAGE_PNG_SHARED=no \
--enable-webp=no --enable-tif=no \ -DSDL2IMAGE_JPG_SHARED=no \
$(SDL2_IMAGE_FLAGS) -DSDL2IMAGE_BACKEND_IMAGEIO=no
$(DOWNLOADS)/sdl2_image/configure: $(DOWNLOADS)/sdl2_image/autogen.sh $(DOWNLOADS)/sdl2_image/CMakeLists.txt:
cd $(DOWNLOADS)/sdl2_image; ./autogen.sh
$(DOWNLOADS)/sdl2_image/autogen.sh:
$(CLONE) $(GITLAB)/mkxp-z/SDL_image $(DOWNLOADS)/sdl2_image -b mkxp-z $(CLONE) $(GITLAB)/mkxp-z/SDL_image $(DOWNLOADS)/sdl2_image -b mkxp-z
@ -347,5 +332,5 @@ clean-downloads:
clean-compiled: clean-compiled:
-rm -rf build-$(SDK)-$(ARCH) -rm -rf build-$(SDK)-$(ARCH)
deps-core: libtheora libvorbis pixman libpng libjpeg physfs uchardet sdl2 sdl2image sdlsound sdl2ttf openal openssl deps-core: libtheora libvorbis pixman libpng physfs uchardet sdl2 sdl2image sdlsound sdl2ttf openal openssl
everything: deps-core ruby everything: deps-core autoconf ruby

49
windows/Makefile
View file

@ -30,6 +30,7 @@ CONFIGURE_ARGS := --prefix="$(BUILD_PREFIX)"
CMAKE_ARGS := \ CMAKE_ARGS := \
-DCMAKE_INSTALL_PREFIX="$(BUILD_PREFIX)" \ -DCMAKE_INSTALL_PREFIX="$(BUILD_PREFIX)" \
-DCMAKE_PREFIX_PATH="$(BUILD_PREFIX)" \
-DCMAKE_C_FLAGS="$(CFLAGS)" \ -DCMAKE_C_FLAGS="$(CFLAGS)" \
-G "MSYS Makefiles" -G "MSYS Makefiles"
@ -149,20 +150,6 @@ $(DOWNLOADS)/libpng/Makefile: $(DOWNLOADS)/libpng/configure
$(DOWNLOADS)/libpng/configure: $(DOWNLOADS)/libpng/configure:
$(CLONE) $(GITLAB)/mkxp-z/libpng $(DOWNLOADS)/libpng $(CLONE) $(GITLAB)/mkxp-z/libpng $(DOWNLOADS)/libpng
# libjpeg
libjpeg: init_dirs $(LIBDIR)/libjpeg.a
$(LIBDIR)/libjpeg.a: $(DOWNLOADS)/libjpeg/cmakebuild/Makefile
cd $(DOWNLOADS)/libjpeg/cmakebuild; \
make -j$(NPROC); make install
$(DOWNLOADS)/libjpeg/cmakebuild/Makefile: $(DOWNLOADS)/libjpeg/CMakeLists.txt
cd $(DOWNLOADS)/libjpeg; mkdir -p cmakebuild; cd cmakebuild; \
$(CMAKE) -DENABLE_SHARED=no -DENABLE_STATIC=yes
$(DOWNLOADS)/libjpeg/CMakeLists.txt:
$(CLONE) $(GITLAB)/mkxp-z/libjpeg-turbo $(DOWNLOADS)/libjpeg
# uchardet # uchardet
uchardet: init_dirs $(LIBDIR)/libuchardet.a uchardet: init_dirs $(LIBDIR)/libuchardet.a
@ -195,26 +182,24 @@ $(DOWNLOADS)/sdl2/configure: $(DOWNLOADS)/sdl2/autogen.sh
$(DOWNLOADS)/sdl2/autogen.sh: $(DOWNLOADS)/sdl2/autogen.sh:
$(CLONE) $(GITLAB)/mkxp-z/SDL $(DOWNLOADS)/sdl2 -b mkxp-z; cd $(DOWNLOADS)/sdl2 $(CLONE) $(GITLAB)/mkxp-z/SDL $(DOWNLOADS)/sdl2 -b mkxp-z; cd $(DOWNLOADS)/sdl2
# SDL2 (Image) # SDL_image
sdl2image: init_dirs sdl2 libpng libjpeg $(LIBDIR)/libSDL2_image.a sdl2image: init_dirs sdl2 $(LIBDIR)/libSDL2_image.a
$(LIBDIR)/libSDL2_image.a: $(DOWNLOADS)/sdl2_image/Makefile $(LIBDIR)/libSDL2_image.a: $(DOWNLOADS)/sdl2_image/cmakebuild/Makefile
cd $(DOWNLOADS)/sdl2_image; \ cd $(DOWNLOADS)/sdl2_image/cmakebuild; \
make -j$(NPROC); make install make -j$(NPROC); make install
$(DOWNLOADS)/sdl2_image/Makefile: $(DOWNLOADS)/sdl2_image/configure $(DOWNLOADS)/sdl2_image/cmakebuild/Makefile: $(DOWNLOADS)/sdl2_image/CMakeLists.txt
cd $(DOWNLOADS)/sdl2_image; \ cd $(DOWNLOADS)/sdl2_image; mkdir -p cmakebuild; cd cmakebuild; \
LIBPNG_LIBS="-L$(LIBDIR) -lpng" LIBPNG_CFLAGS="-I$(INCLUDEDIR)" \ $(CMAKE) \
$(CONFIGURE) --enable-static=true --enable-shared=false \ -DBUILD_SHARED_LIBS=no \
--disable-imageio \ -DSDL2IMAGE_JPG_SAVE=yes \
--enable-png=yes --enable-png-shared=no \ -DSDL2IMAGE_PNG_SAVE=yes \
--enable-jpg=yes --enable-jpg-shared=no \ -DSDL2IMAGE_PNG_SHARED=no \
--enable-webp=no $(SDL2_IMAGE_FLAGS) -DSDL2IMAGE_JPG_SHARED=no
$(DOWNLOADS)/sdl2_image/configure: $(DOWNLOADS)/sdl2_image/autogen.sh $(DOWNLOADS)/sdl2_image/CMakeLists.txt:
cd $(DOWNLOADS)/sdl2_image; ./autogen.sh
$(DOWNLOADS)/sdl2_image/autogen.sh:
$(CLONE) $(GITLAB)/mkxp-z/SDL_image $(DOWNLOADS)/sdl2_image -b mkxp-z $(CLONE) $(GITLAB)/mkxp-z/SDL_image $(DOWNLOADS)/sdl2_image -b mkxp-z
# SDL_sound # SDL_sound
@ -337,5 +322,5 @@ powerwash: clean-downloads
clean-downloads: clean-downloads:
-rm -rf downloads -rm -rf downloads
deps-core: libtheora libvorbis pixman libpng libjpeg physfs sdl2 sdl2image sdlsound sdl2ttf openal openssl fluidsynth uchardet deps-core: libtheora libvorbis pixman libpng physfs sdl2 sdl2image sdlsound sdl2ttf openal openssl fluidsynth uchardet
everything: deps-core ruby everything: deps-core autoconf ruby