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

Merge branch 'misc-fixes' into libretro

Browse source
This commit is contained in:
刘皓 2025-05-02 14:56:47 -04:00
commit bcfcd6df8a
No known key found for this signature in database
GPG key ID: 7901753DB465B711
3 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
linux/Makefile
View file

@ -24,6 +24,7 @@ CLONE := $(GIT) clone -q
GITHUB := https://github.com
CONFIGURE_ENV := \
CMAKE_POLICY_VERSION_MINIMUM=3.10 \
PKG_CONFIG_LIBDIR=$(PKG_CONFIG_LIBDIR) \
CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"

5
macos/Dependencies/common.make
View file

@ -5,7 +5,8 @@ LIBDIR := $(BUILD_PREFIX)/lib
INCLUDEDIR := $(BUILD_PREFIX)/include
DOWNLOADS := ${PWD}/downloads/$(HOST)
NPROC := $(shell sysctl -n hw.ncpu)
CFLAGS := -I$(INCLUDEDIR) $(TARGETFLAGS) $(DEFINES) -O3
# Explicitly including freetype2 dir for now. macOS is having weird issues with ft2build.h
CFLAGS := -I$(INCLUDEDIR) -I$(INCLUDEDIR)/freetype2 $(TARGETFLAGS) $(DEFINES) -O3
LDFLAGS := -L$(LIBDIR)
CC := clang -arch $(ARCH)
PKG_CONFIG_LIBDIR := $(BUILD_PREFIX)/lib/pkgconfig
@ -23,6 +24,7 @@ endif
CONFIGURE_ENV := \
$(DEPLOYMENT_TARGET_ENV) \
CMAKE_POLICY_VERSION_MINIMUM=3.10 \
PKG_CONFIG_LIBDIR=$(PKG_CONFIG_LIBDIR) \
CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
@ -317,6 +319,7 @@ $(DOWNLOADS)/ruby/configure: $(DOWNLOADS)/ruby/configure.ac
$(DOWNLOADS)/ruby/configure.ac:
$(CLONE) $(GITHUB)/mkxp-z/ruby $(DOWNLOADS)/ruby --single-branch -b mkxp-z-3.1.3 --depth 1;
sed -i '' '/: $${PRELOADENV=DYLD_INSERT_LIBRARIES}/g' $(DOWNLOADS)/ruby/configure.ac
# ====
init_dirs:

1
windows/Makefile
View file

@ -23,6 +23,7 @@ CLONE := $(GIT) clone -q
GITHUB := https://github.com
CONFIGURE_ENV := \
CMAKE_POLICY_VERSION_MINIMUM=3.10 \
PKG_CONFIG_LIBDIR=$(PKG_CONFIG_LIBDIR) \
CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"