diff options
| -rwxr-xr-x | .gitignore | 1 | ||||
| -rw-r--r-- | Makefile | 11 | ||||
| -rw-r--r-- | make-linux.mk (renamed from Makefile.linux) | 0 | ||||
| -rw-r--r-- | make-mac.mk (renamed from Makefile.mac) | 0 |
4 files changed, 11 insertions, 1 deletions
@@ -3,7 +3,6 @@ /zerotier-* /build-ZeroTierUI-* /ZeroTierUI/*.user -/Makefile *.o .DS_Store .Apple* diff --git a/Makefile b/Makefile new file mode 100644 index 00000000..ac50884c --- /dev/null +++ b/Makefile @@ -0,0 +1,11 @@ +# Common makefile -- loads make rules for each platform + +OSTYPE=$(shell uname -s) + +ifeq ($(OSTYPE),Darwin) + include make-mac.mk +endif + +ifeq ($(OSTYPE),Linux) + include make-linux.mk +endif diff --git a/Makefile.linux b/make-linux.mk index a432d912..a432d912 100644 --- a/Makefile.linux +++ b/make-linux.mk diff --git a/Makefile.mac b/make-mac.mk index f0f56810..f0f56810 100644 --- a/Makefile.mac +++ b/make-mac.mk |