Revert "let's NOT update SDL yet"

This reverts commit 290ffe1135.
This commit is contained in:
Splendide Imaginarius 2023-06-26 14:13:56 +00:00
parent 765d057a9d
commit 20c1f2fdf0
3 changed files with 27 additions and 34 deletions

View file

@ -184,19 +184,17 @@ $(DOWNLOADS)/libpng/configure:
# SDL2
sdl2: init_dirs $(LIBDIR)/libSDL2.a
$(LIBDIR)/libSDL2.a: $(DOWNLOADS)/sdl2/Makefile
$(LIBDIR)/libSDL2.a: $(DOWNLOADS)/sdl2/cmakebuild/Makefile
cd $(DOWNLOADS)/sdl2/cmakebuild; \
make -j$(NPROC); make install
$(DOWNLOADS)/sdl2/cmakebuild/Makefile: $(DOWNLOADS)/sdl2/CMakeLists.txt
cd $(DOWNLOADS)/sdl2; \
make -j$(NPROC); make install;
mkdir cmakebuild; cd cmakebuild; \
$(CMAKE) -DBUILD_SHARED_LIBS=no
$(DOWNLOADS)/sdl2/Makefile: $(DOWNLOADS)/sdl2/configure
cd $(DOWNLOADS)/sdl2; \
$(CONFIGURE) --enable-static=true --enable-shared=false $(SDL_FLAGS)
$(DOWNLOADS)/sdl2/configure: $(DOWNLOADS)/sdl2/autogen.sh
cd $(DOWNLOADS)/sdl2; ./autogen.sh
$(DOWNLOADS)/sdl2/autogen.sh:
$(CLONE) $(GITHUB)/mkxp-z/SDL $(DOWNLOADS)/sdl2 -b mkxp-z
$(DOWNLOADS)/sdl2/CMakeLists.txt:
$(CLONE) $(GITHUB)/mkxp-z/SDL $(DOWNLOADS)/sdl2 -b mkxp-z-2.26
# SDL_image
sdl2image: init_dirs sdl2 $(LIBDIR)/libSDL2_image.a

View file

@ -179,20 +179,17 @@ $(DOWNLOADS)/libpng/configure:
# SDL2
sdl2: init_dirs $(LIBDIR)/libSDL2.a
$(LIBDIR)/libSDL2.a: $(DOWNLOADS)/sdl2/Makefile
$(LIBDIR)/libSDL2.a: $(DOWNLOADS)/sdl2/cmakebuild/Makefile
cd $(DOWNLOADS)/sdl2/cmakebuild; \
make -j$(NPROC); make install
$(DOWNLOADS)/sdl2/cmakebuild/Makefile: $(DOWNLOADS)/sdl2/CMakeLists.txt
cd $(DOWNLOADS)/sdl2; \
make -j$(NPROC); make install;
mkdir cmakebuild; cd cmakebuild; \
$(CMAKE) -DBUILD_SHARED_LIBS=no
$(DOWNLOADS)/sdl2/Makefile: $(DOWNLOADS)/sdl2/configure
cd $(DOWNLOADS)/sdl2; \
$(CONFIGURE) --enable-static=true --enable-shared=false \
--enable-video-x11=false $(SDL_FLAGS)
$(DOWNLOADS)/sdl2/configure: $(DOWNLOADS)/sdl2/autogen.sh
cd $(DOWNLOADS)/sdl2; ./autogen.sh
$(DOWNLOADS)/sdl2/autogen.sh:
$(CLONE) $(GITHUB)/mkxp-z/SDL $(DOWNLOADS)/sdl2 -b mkxp-z
$(DOWNLOADS)/sdl2/CMakeLists.txt:
$(CLONE) $(GITHUB)/mkxp-z/SDL $(DOWNLOADS)/sdl2 -b mkxp-z-2.26
# SDL_image
sdl2image: init_dirs sdl2 $(LIBDIR)/libSDL2_image.a

View file

@ -169,19 +169,17 @@ $(DOWNLOADS)/uchardet/CMakeLists.txt:
# SDL2
sdl2: init_dirs $(LIBDIR)/libSDL2.a
$(LIBDIR)/libSDL2.a: $(DOWNLOADS)/sdl2/Makefile
$(LIBDIR)/libSDL2.a: $(DOWNLOADS)/sdl2/cmakebuild/Makefile
cd $(DOWNLOADS)/sdl2/cmakebuild; \
make -j$(NPROC); make install
$(DOWNLOADS)/sdl2/cmakebuild/Makefile: $(DOWNLOADS)/sdl2/CMakeLists.txt
cd $(DOWNLOADS)/sdl2; \
make -j$(NPROC); make install;
mkdir cmakebuild; cd cmakebuild; \
$(CMAKE) -DBUILD_SHARED_LIBS=no
$(DOWNLOADS)/sdl2/Makefile: $(DOWNLOADS)/sdl2/configure
cd $(DOWNLOADS)/sdl2; \
$(CONFIGURE) --enable-static=true --enable-shared=false $(SDL_FLAGS)
$(DOWNLOADS)/sdl2/configure: $(DOWNLOADS)/sdl2/autogen.sh
cd $(DOWNLOADS)/sdl2; ./autogen.sh
$(DOWNLOADS)/sdl2/autogen.sh:
$(CLONE) $(GITHUB)/mkxp-z/SDL $(DOWNLOADS)/sdl2 -b mkxp-z
$(DOWNLOADS)/sdl2/CMakeLists.txt:
$(CLONE) $(GITHUB)/mkxp-z/SDL $(DOWNLOADS)/sdl2 -b mkxp-z-2.26
# SDL_image
sdl2image: init_dirs sdl2 $(LIBDIR)/libSDL2_image.a