7373 LLVM_OPT := llvm-
7474 endif
7575endif
76- # macOS can set `ARCH_TARGET=arm64` - intented for CI cross-compilation.
76+
77+ # macOS can set `ARCH_TARGET=arm64` for cross-compilation.
7778ifneq ($(ARCH_TARGET ) ,)
7879 ifneq ($(PLATFORM),macos)
7980 $(error ARCH_TARGET is only available on macOS)
80- else ifeq ($(ARCH_TARGET),arm64)
81- TARGET := -target arm64-apple-darwin
81+ endif
82+ ifeq ($(ARCH_TARGET),arm64)
83+ TARGET := -target arm64-apple-darwin -arch arm64
84+ else ifeq ($(ARCH_TARGET),x64)
85+ TARGET := -target x86_64-apple-darwin -arch x86_64
86+ else
87+ $(error Unsupported ARCH_TARGET: $(ARCH_TARGET). Use 'arm64' or 'x64'.)
8288 endif
8389endif
8490
@@ -104,19 +110,19 @@ endif
104110# Build macOS WKWebView
105111ifeq ($(shell uname) ,Darwin)
106112 @cd "$(BUILD_DIR)/debug" \
107- && echo "Build WebUI Objective-C WKWebKit ($(CC) $(TARGET)debug)..." \
113+ && echo "Build WebUI Objective-C WKWebKit ($(CC) $(TARGET) debug)..." \
108114 && $(CC) $(TARGET) $(WKWEBKIT_BUILD_FLAGS) -g -DWEBUI_LOG
109115endif
110116# Static with Debug info
111117 @cd "$(BUILD_DIR)/debug" \
112- && echo "Build WebUI library ($(CC) $(TARGET)debug static)..." \
118+ && echo "Build WebUI library ($(CC) $(TARGET) debug static)..." \
113119 && $(CC) $(TARGET) $(CIVETWEB_BUILD_FLAGS) $(CIVETWEB_DEFINE_FLAGS) -g \
114120 && $(CC) $(TARGET) $(WEBUI_BUILD_FLAGS) $(WARNING_LOG) -g -DWEBUI_LOG \
115121 && $(LLVM_OPT)ar rc $(LIB_STATIC_OUT) webui.o civetweb.o $(WEBKIT_OBJ) \
116122 && $(LLVM_OPT)ranlib $(LIB_STATIC_OUT)
117123# Dynamic with Debug info
118124 @cd "$(BUILD_DIR)/debug" \
119- && echo "Build WebUI library ($(CC) $(TARGET)debug dynamic)..." \
125+ && echo "Build WebUI library ($(CC) $(TARGET) debug dynamic)..." \
120126 && $(CC) $(TARGET) $(CIVETWEB_BUILD_FLAGS) $(CIVETWEB_DEFINE_FLAGS) -g -fPIC \
121127 && $(CC) $(TARGET) $(WEBUI_BUILD_FLAGS) $(WARNING_LOG) -g -fPIC -DWEBUI_LOG -DWEBUI_DYNAMIC \
122128 && $(CC) $(TARGET) -shared -o $(LIB_DYN_OUT) webui.o civetweb.o $(WEBKIT_OBJ) -g -L"$(WEBUI_TLS_LIB)" $(TLS_LDFLAG_DYNAMIC) $(LWS2_OPT) $(WKWEBKIT_LINK_FLAGS)
@@ -137,19 +143,19 @@ endif
137143# Build macOS WKWebView
138144ifeq ($(shell uname) ,Darwin)
139145 @cd "$(BUILD_DIR)" \
140- && echo "Build WebUI Objective-C WKWebKit ($(CC) $(TARGET)release)..." \
146+ && echo "Build WebUI Objective-C WKWebKit ($(CC) $(TARGET) release)..." \
141147 && $(CC) $(TARGET) $(WKWEBKIT_BUILD_FLAGS) -Os
142148endif
143149# Static Release
144150 @cd "$(BUILD_DIR)" \
145- && echo "Build WebUI library ($(CC) $(TARGET)release static)..." \
151+ && echo "Build WebUI library ($(CC) $(TARGET) release static)..." \
146152 && $(CC) $(TARGET) $(CIVETWEB_BUILD_FLAGS) $(CIVETWEB_DEFINE_FLAGS) -Os \
147153 && $(CC) $(TARGET) $(WEBUI_BUILD_FLAGS) $(WARNING_RELEASE) -Os \
148154 && $(LLVM_OPT)ar rc $(LIB_STATIC_OUT) webui.o civetweb.o $(WEBKIT_OBJ) \
149155 && $(LLVM_OPT)ranlib $(LIB_STATIC_OUT)
150156# Dynamic Release
151157 @cd "$(BUILD_DIR)" \
152- && echo "Build WebUI library ($(CC) $(TARGET)release dynamic)..." \
158+ && echo "Build WebUI library ($(CC) $(TARGET) release dynamic)..." \
153159 && $(CC) $(TARGET) $(CIVETWEB_BUILD_FLAGS) $(CIVETWEB_DEFINE_FLAGS) -Os -fPIC \
154160 && $(CC) $(TARGET) $(WEBUI_BUILD_FLAGS) $(WARNING_RELEASE) -O3 -fPIC -DWEBUI_DYNAMIC \
155161 && $(CC) $(TARGET) -shared -o $(LIB_DYN_OUT) webui.o civetweb.o $(WEBKIT_OBJ) -L"$(WEBUI_TLS_LIB)" $(TLS_LDFLAG_DYNAMIC) $(LWS2_OPT) $(WKWEBKIT_LINK_FLAGS)
0 commit comments