Skip to content

Commit cfe137d

Browse files
committed
fix support for macOS Mojave (10.14)
1 parent 84c7223 commit cfe137d

5 files changed

Lines changed: 13 additions & 12 deletions

File tree

tools/cgcomp/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,11 @@ ifneq (,$(findstring CYGWIN,$(UNAME)))
4545
endif
4646

4747
ifneq (,$(findstring Darwin,$(UNAME)))
48-
SDK := /Developer/SDKs/MacOSX10.4u.sdk
49-
OSXCFLAGS := -mmacosx-version-min=10.4 -arch i386
48+
SDK := /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk
49+
OSXCFLAGS := -mmacosx-version-min=10.14 -arch x86_64
5050
OSXCXXFLAGS := $(OSXCFLAGS)
5151
CXXFLAGS += -fvisibility=hidden
52-
LDFLAGS += -mmacosx-version-min=10.4 -arch i386 -Wl,-syslibroot,$(SDK)
52+
LDFLAGS += -mmacosx-version-min=10.14 -arch x86_64 -Wl,-syslibroot,$(SDK)
5353
endif
5454

5555
ifneq (,$(findstring Linux,$(UNAME)))

tools/generic/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ ifneq (,$(findstring CYGWIN,$(UNAME)))
2828
endif
2929

3030
ifneq (,$(findstring Darwin,$(shell uname -s)))
31-
SDK := /Developer/SDKs/MacOSX10.4u.sdk
32-
CFLAGS += -mmacosx-version-min=10.4 -isysroot $(SDK) -Wl,-syslibroot,$(SDK) -arch i386 -arch ppc
31+
SDK := /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk
32+
CFLAGS += -mmacosx-version-min=10.14 -isysroot $(SDK) -Wl,-syslibroot,$(SDK) -arch x86_64
3333
endif
3434

3535
TARGETS := $(patsubst %.c,%$(exeext),$(wildcard *.c)) \

tools/geohot/Makefile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,12 @@ ifneq (,$(findstring CYGWIN,$(UNAME)))
3333
endif
3434

3535
ifneq (,$(findstring Darwin,$(UNAME)))
36-
SDK := /Developer/SDKs/MacOSX10.4u.sdk
37-
OSXCFLAGS := -mmacosx-version-min=10.4 -arch i386
36+
SDK := /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk
37+
OSXCFLAGS := -mmacosx-version-min=10.14 -arch x86_64
3838
OSXCXXFLAGS := $(OSXCFLAGS)
3939
CXXFLAGS += -fvisibility=hidden
40-
LDFLAGS += -mmacosx-version-min=10.4 -arch i386 -Wl,-syslibroot,$(SDK) -L/opt/local/lib -lgmp -lcrypto -lz
40+
CFLAGS += -I/usr/local/include -I/usr/local/opt/libelf/include/libelf -I/usr/local/opt/openssl/include
41+
LDFLAGS += -mmacosx-version-min=10.14 -arch x86_64 -Wl,-syslibroot,$(SDK) -L/opt/local/lib -L/usr/local/opt/openssl/lib -lgmp -lcrypto -lz
4142
endif
4243

4344
ifneq (,$(findstring BSD,$(UNAME)))

tools/ps3load/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@ ifneq (,$(findstring MINGW,$(UNAME)))
3838
endif
3939

4040
ifneq (,$(findstring Darwin,$(shell uname -s)))
41-
SDK := /Developer/SDKs/MacOSX10.4u.sdk
42-
OSXCFLAGS := -mmacosx-version-min=10.4 -isysroot $(SDK) -arch i386 -arch ppc
41+
SDK := /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk
42+
OSXCFLAGS := -mmacosx-version-min=10.14 -isysroot $(SDK) -arch x86_64
4343
OSXCXXFLAGS := $(OSXCFLAGS)
4444
CXXFLAGS += -fvisibility=hidden
45-
LDFLAGS += -mmacosx-version-min=10.4 -arch i386 -arch ppc -Wl,-syslibroot,$(SDK)
45+
LDFLAGS += -mmacosx-version-min=10.14 -arch x86_64 -Wl,-syslibroot,$(SDK)
4646
endif
4747

4848
ifneq (,$(findstring SunOS,$(UNAME)))

tools/sprxlinker/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ ifneq (,$(findstring CYGWIN,$(UNAME)))
3131
endif
3232

3333
ifneq (,$(findstring Darwin,$(UNAME)))
34-
CFLAGS += -I/opt/local/include
34+
CFLAGS += -I/opt/local/include -I/usr/local/opt/libelf/include/libelf
3535
LDFLAGS += -L/opt/local/lib -lelf
3636
OS := Mac
3737
endif

0 commit comments

Comments
 (0)