diff --git a/linux/Makefile b/linux/Makefile index 46965e6..1b8f583 100644 --- a/linux/Makefile +++ b/linux/Makefile @@ -198,17 +198,19 @@ $(DOWNLOADS)/libjpeg/CMakeLists.txt: # SDL2 sdl2: init_dirs $(LIBDIR)/libSDL2.a -$(LIBDIR)/libSDL2.a: $(DOWNLOADS)/sdl2/cmakebuild/Makefile - cd $(DOWNLOADS)/sdl2/cmakebuild; \ - make -j$(NPROC); make install - -$(DOWNLOADS)/sdl2/cmakebuild/Makefile: $(DOWNLOADS)/sdl2/CMakeLists.txt +$(LIBDIR)/libSDL2.a: $(DOWNLOADS)/sdl2/Makefile cd $(DOWNLOADS)/sdl2; \ - mkdir cmakebuild; cd cmakebuild; \ - $(CMAKE) -DBUILD_SHARED_LIBS=no + make -j$(NPROC); make install; -$(DOWNLOADS)/sdl2/CMakeLists.txt: - $(CLONE) $(GITHUB)/mkxp-z/SDL $(DOWNLOADS)/sdl2 -b mkxp-z-2.26 +$(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 # SDL2 (Image) sdl2image: init_dirs sdl2 libpng libjpeg $(LIBDIR)/libSDL2_image.a diff --git a/macos/Dependencies/common.make b/macos/Dependencies/common.make index ba9c677..3c615a2 100644 --- a/macos/Dependencies/common.make +++ b/macos/Dependencies/common.make @@ -179,17 +179,20 @@ $(DOWNLOADS)/libpng/configure: # SDL2 sdl2: init_dirs $(LIBDIR)/libSDL2.a -$(LIBDIR)/libSDL2.a: $(DOWNLOADS)/sdl2/cmakebuild/Makefile - cd $(DOWNLOADS)/sdl2/cmakebuild; \ - make -j$(NPROC); make install - -$(DOWNLOADS)/sdl2/cmakebuild/Makefile: $(DOWNLOADS)/sdl2/CMakeLists.txt +$(LIBDIR)/libSDL2.a: $(DOWNLOADS)/sdl2/Makefile cd $(DOWNLOADS)/sdl2; \ - mkdir cmakebuild; cd cmakebuild; \ - $(CMAKE) -DBUILD_SHARED_LIBS=no + make -j$(NPROC); make install; -$(DOWNLOADS)/sdl2/CMakeLists.txt: - $(CLONE) $(GITHUB)/mkxp-z/SDL $(DOWNLOADS)/sdl2 -b mkxp-z-2.26 +$(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 # SDL_image sdl2image: init_dirs sdl2 $(LIBDIR)/libSDL2_image.a diff --git a/windows/Makefile b/windows/Makefile index 47dbe41..8dc30f7 100755 --- a/windows/Makefile +++ b/windows/Makefile @@ -183,17 +183,19 @@ $(DOWNLOADS)/uchardet/CMakeLists.txt: # SDL2 sdl2: init_dirs $(LIBDIR)/libSDL2.a -$(LIBDIR)/libSDL2.a: $(DOWNLOADS)/sdl2/cmakebuild/Makefile - cd $(DOWNLOADS)/sdl2/cmakebuild; \ - make -j$(NPROC); make install - -$(DOWNLOADS)/sdl2/cmakebuild/Makefile: $(DOWNLOADS)/sdl2/CMakeLists.txt +$(LIBDIR)/libSDL2.a: $(DOWNLOADS)/sdl2/Makefile cd $(DOWNLOADS)/sdl2; \ - mkdir cmakebuild; cd cmakebuild; \ - $(CMAKE) -DBUILD_SHARED_LIBS=no + make -j$(NPROC); make install; -$(DOWNLOADS)/sdl2/CMakeLists.txt: - $(CLONE) $(GITHUB)/mkxp-z/SDL $(DOWNLOADS)/sdl2 -b mkxp-z-2.26 +$(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 # SDL2 (Image) sdl2image: init_dirs sdl2 libpng libjpeg $(LIBDIR)/libSDL2_image.a