Patch Makefile
This commit is contained in:
parent
5916333723
commit
403398b7a1
7
Makefile
7
Makefile
|
@ -7,7 +7,6 @@ DEFAULT_GOAL: linux
|
|||
|
||||
all: linux android windows
|
||||
|
||||
<<<<<<< HEAD
|
||||
ARCH := $(shell uname -m)
|
||||
ARM_X_CC := aarch64-linux-gnu-gcc
|
||||
|
||||
|
@ -17,12 +16,8 @@ ifneq (,$(shell which $(ARM_X_CC)))
|
|||
LINUX_X_ARM = libCwtch.x.so
|
||||
endif
|
||||
|
||||
linux: EXPERIMENTS ?= serverExperiment
|
||||
linux: libCwtch.so $(LINUX_X_ARM)
|
||||
=======
|
||||
linux: EXPERIMENTS ?= groupsExperiment serverExperiment
|
||||
linux: libCwtch.so
|
||||
>>>>>>> 8e046b2 (Expose Search and new ServerList Functions)
|
||||
linux: libCwtch.so $(LINUX_X_ARM)
|
||||
|
||||
macos: EXPERIMENTS ?= groupsExperiment serverExperiment
|
||||
macos: libCwtch.x64.dylib libCwtch.arm64.dylib
|
||||
|
|
Loading…
Reference in New Issue