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

add -O3 to CFLAGS for dependencies

Browse source
This commit is contained in:
Snowdream 2022-07-18 21:26:47 -04:00
parent ff74f08fc0
commit 79bae839de
3 changed files with 70 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
linux/Makefile
View file

@ -12,7 +12,7 @@ LIBDIR := $(BUILD_PREFIX)/lib
INCLUDEDIR := $(BUILD_PREFIX)/include INCLUDEDIR := $(BUILD_PREFIX)/include
DOWNLOADS := ${PWD}/downloads/$(ARCH) DOWNLOADS := ${PWD}/downloads/$(ARCH)
NPROC := $(shell nproc) NPROC := $(shell nproc)
CFLAGS := -I$(INCLUDEDIR) -flax-vector-conversions CFLAGS := -I$(INCLUDEDIR) -flax-vector-conversions -O3
LDFLAGS := -L$(LIBDIR) LDFLAGS := -L$(LIBDIR)
CC := gcc CC := gcc
PKG_CONFIG_LIBDIR := $(BUILD_PREFIX)/lib/pkgconfig PKG_CONFIG_LIBDIR := $(BUILD_PREFIX)/lib/pkgconfig
@ -30,7 +30,8 @@ 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_PREFIX_PATH="$(BUILD_PREFIX)" \
-DCMAKE_C_FLAGS="$(CFLAGS)" -DCMAKE_C_FLAGS="$(CFLAGS)" \
-DCMAKE_BUILD_TYPE=Release
RUBY_CONFIGURE_ARGS := \ RUBY_CONFIGURE_ARGS := \
--enable-install-static-library \ --enable-install-static-library \
@ -182,6 +183,20 @@ $(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
@ -199,25 +214,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 # SDL2 (Image)
sdl2image: init_dirs sdl2 $(LIBDIR)/libSDL2_image.a sdl2image: init_dirs sdl2 libpng libjpeg $(LIBDIR)/libSDL2_image.a
$(LIBDIR)/libSDL2_image.a: $(DOWNLOADS)/sdl2_image/cmakebuild/Makefile $(LIBDIR)/libSDL2_image.a: $(DOWNLOADS)/sdl2_image/Makefile
cd $(DOWNLOADS)/sdl2_image/cmakebuild; \ cd $(DOWNLOADS)/sdl2_image; \
make -j$(NPROC); make install make -j$(NPROC); make install
$(DOWNLOADS)/sdl2_image/cmakebuild/Makefile: $(DOWNLOADS)/sdl2_image/CMakeLists.txt $(DOWNLOADS)/sdl2_image/Makefile: $(DOWNLOADS)/sdl2_image/configure
cd $(DOWNLOADS)/sdl2_image; mkdir -p cmakebuild; cd cmakebuild; \ cd $(DOWNLOADS)/sdl2_image; \
$(CMAKE) \ LIBPNG_LIBS="-L$(LIBDIR) -lpng" LIBPNG_CFLAGS="-I$(INCLUDEDIR)" \
-DBUILD_SHARED_LIBS=no \ $(CONFIGURE) --enable-static=true --enable-shared=false \
-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/CMakeLists.txt: $(DOWNLOADS)/sdl2_image/configure: $(DOWNLOADS)/sdl2_image/autogen.sh
$(CLONE) $(GITLAB)/mkxp-z/SDL_image $(DOWNLOADS)/sdl2_image -b mkxp-z cd $(DOWNLOADS)/sdl2_image; ./autogen.sh
$(DOWNLOADS)/sdl2_image/autogen.sh:
$(CLONE) $(GITLAB)/mkxp-z/SDL_image_old $(DOWNLOADS)/sdl2_image -b mkxp-z
# SDL_sound # SDL_sound
sdlsound: init_dirs sdl2 libogg libvorbis $(LIBDIR)/libSDL2_sound.a sdlsound: init_dirs sdl2 libogg libvorbis $(LIBDIR)/libSDL2_sound.a
@ -336,5 +352,5 @@ powerwash: clean-downloads
clean-downloads: clean-downloads:
-rm -rf downloads -rm -rf downloads
deps-core: libtheora libvorbis pixman libpng physfs sdl2 sdl2image sdlsound sdl2ttf openal openssl fluidsynth uchardet iconv deps-core: libtheora libvorbis pixman libpng libjpeg physfs sdl2 sdl2image sdlsound sdl2ttf openal openssl fluidsynth uchardet iconv
everything: deps-core autoconf ruby everything: deps-core autoconf ruby

5
macos/Dependencies/dependencies.make
View file

@ -6,7 +6,7 @@ LIBDIR := $(BUILD_PREFIX)/lib
INCLUDEDIR := $(BUILD_PREFIX)/include INCLUDEDIR := $(BUILD_PREFIX)/include
DOWNLOADS := ${PWD}/downloads/$(HOST) DOWNLOADS := ${PWD}/downloads/$(HOST)
NPROC := $(shell sysctl -n hw.ncpu) NPROC := $(shell sysctl -n hw.ncpu)
CFLAGS := -I$(INCLUDEDIR) $(TARGETFLAGS) $(DEFINES) CFLAGS := -I$(INCLUDEDIR) $(TARGETFLAGS) $(DEFINES) -O3
LDFLAGS := -L$(LIBDIR) LDFLAGS := -L$(LIBDIR)
CC := xcrun -sdk $(SDK) clang -arch $(ARCH) -isysroot $(SDKROOT) CC := xcrun -sdk $(SDK) clang -arch $(ARCH) -isysroot $(SDKROOT)
PKG_CONFIG_LIBDIR := $(BUILD_PREFIX)/lib/pkgconfig PKG_CONFIG_LIBDIR := $(BUILD_PREFIX)/lib/pkgconfig
@ -38,7 +38,8 @@ CMAKE_ARGS := \
-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) \
-DCMAKE_C_FLAGS="$(CFLAGS)" -DCMAKE_C_FLAGS="$(CFLAGS)" \
-DCMAKE_BUILD_TYPE=Release
# Ruby won't think it's cross-compiling unless # Ruby won't think it's cross-compiling unless

50
windows/Makefile
View file

@ -13,7 +13,7 @@ LIBDIR := $(BUILD_PREFIX)/lib
INCLUDEDIR := $(BUILD_PREFIX)/include INCLUDEDIR := $(BUILD_PREFIX)/include
DOWNLOADS := ${PWD}/downloads/$(ARCH) DOWNLOADS := ${PWD}/downloads/$(ARCH)
NPROC := $(shell nproc) NPROC := $(shell nproc)
CFLAGS := -I$(INCLUDEDIR) CFLAGS := -I$(INCLUDEDIR) -O3
LDFLAGS := -L$(LIBDIR) LDFLAGS := -L$(LIBDIR)
CC := gcc CC := gcc
PKG_CONFIG_LIBDIR := $(BUILD_PREFIX)/lib/pkgconfig PKG_CONFIG_LIBDIR := $(BUILD_PREFIX)/lib/pkgconfig
@ -32,6 +32,7 @@ CMAKE_ARGS := \
-DCMAKE_INSTALL_PREFIX="$(BUILD_PREFIX)" \ -DCMAKE_INSTALL_PREFIX="$(BUILD_PREFIX)" \
-DCMAKE_PREFIX_PATH="$(BUILD_PREFIX)" \ -DCMAKE_PREFIX_PATH="$(BUILD_PREFIX)" \
-DCMAKE_C_FLAGS="$(CFLAGS)" \ -DCMAKE_C_FLAGS="$(CFLAGS)" \
-DCMAKE_BUILD_TYPE=Release \
-G "MSYS Makefiles" -G "MSYS Makefiles"
RUBY_CONFIGURE_ARGS := \ RUBY_CONFIGURE_ARGS := \
@ -150,6 +151,20 @@ $(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
@ -182,25 +197,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 # SDL2 (Image)
sdl2image: init_dirs sdl2 $(LIBDIR)/libSDL2_image.a sdl2image: init_dirs sdl2 libpng libjpeg $(LIBDIR)/libSDL2_image.a
$(LIBDIR)/libSDL2_image.a: $(DOWNLOADS)/sdl2_image/cmakebuild/Makefile $(LIBDIR)/libSDL2_image.a: $(DOWNLOADS)/sdl2_image/Makefile
cd $(DOWNLOADS)/sdl2_image/cmakebuild; \ cd $(DOWNLOADS)/sdl2_image; \
make -j$(NPROC); make install make -j$(NPROC); make install
$(DOWNLOADS)/sdl2_image/cmakebuild/Makefile: $(DOWNLOADS)/sdl2_image/CMakeLists.txt $(DOWNLOADS)/sdl2_image/Makefile: $(DOWNLOADS)/sdl2_image/configure
cd $(DOWNLOADS)/sdl2_image; mkdir -p cmakebuild; cd cmakebuild; \ cd $(DOWNLOADS)/sdl2_image; \
$(CMAKE) \ LIBPNG_LIBS="-L$(LIBDIR) -lpng" LIBPNG_CFLAGS="-I$(INCLUDEDIR)" \
-DBUILD_SHARED_LIBS=no \ $(CONFIGURE) --enable-static=true --enable-shared=false \
-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/CMakeLists.txt: $(DOWNLOADS)/sdl2_image/configure: $(DOWNLOADS)/sdl2_image/autogen.sh
$(CLONE) $(GITLAB)/mkxp-z/SDL_image $(DOWNLOADS)/sdl2_image -b mkxp-z cd $(DOWNLOADS)/sdl2_image; ./autogen.sh
$(DOWNLOADS)/sdl2_image/autogen.sh:
$(CLONE) $(GITLAB)/mkxp-z/SDL_image_old $(DOWNLOADS)/sdl2_image -b mkxp-z
# SDL_sound # SDL_sound
sdlsound: init_dirs sdl2 libogg libvorbis $(LIBDIR)/libSDL2_sound.a sdlsound: init_dirs sdl2 libogg libvorbis $(LIBDIR)/libSDL2_sound.a
@ -322,5 +338,5 @@ powerwash: clean-downloads
clean-downloads: clean-downloads:
-rm -rf downloads -rm -rf downloads
deps-core: libtheora libvorbis pixman libpng physfs sdl2 sdl2image sdlsound sdl2ttf openal openssl fluidsynth uchardet deps-core: libtheora libvorbis pixman libpng libjpeg physfs sdl2 sdl2image sdlsound sdl2ttf openal openssl fluidsynth uchardet
everything: deps-core autoconf ruby everything: deps-core autoconf ruby