Browse Source

Dragging adam into CMake kicking and screaming :)

Grant Limberg 6 years ago
parent
commit
cb4ebfdbd2
7 changed files with 34 additions and 23 deletions
  1. 6 23
      Makefile
  2. 28 0
      attic/Makefile
  3. 0 0
      attic/make-bsd.mk
  4. 0 0
      attic/make-linux.mk
  5. 0 0
      attic/make-mac.mk
  6. 0 0
      attic/make-netbsd.mk
  7. 0 0
      attic/objects.mk

+ 6 - 23
Makefile

@@ -1,28 +1,11 @@
 # Common makefile -- loads make rules for each platform
 
-OSTYPE=$(shell uname -s)
+BUILDDIR := build
 
-ifeq ($(OSTYPE),Darwin)
-	include make-mac.mk
-endif
+.PHONY: all
 
-ifeq ($(OSTYPE),Linux)
-	include make-linux.mk
-endif
+all:
+	mkdir -p ${BUILDDIR} && cd ${BUILDDIR} && cmake .. && $(MAKE)
 
-ifeq ($(OSTYPE),FreeBSD)
-	CC=clang
-	CXX=clang++
-	ZT_BUILD_PLATFORM=7
-	include make-bsd.mk
-endif
-ifeq ($(OSTYPE),OpenBSD)
-	CC=egcc
-	CXX=eg++
-	ZT_BUILD_PLATFORM=9
-	include make-bsd.mk
-endif
-
-ifeq ($(OSTYPE),NetBSD)
-	include make-netbsd.mk
-endif
+clean:
+	rm -rf ${BUILDDIR}

+ 28 - 0
attic/Makefile

@@ -0,0 +1,28 @@
+# 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
+
+ifeq ($(OSTYPE),FreeBSD)
+	CC=clang
+	CXX=clang++
+	ZT_BUILD_PLATFORM=7
+	include make-bsd.mk
+endif
+ifeq ($(OSTYPE),OpenBSD)
+	CC=egcc
+	CXX=eg++
+	ZT_BUILD_PLATFORM=9
+	include make-bsd.mk
+endif
+
+ifeq ($(OSTYPE),NetBSD)
+	include make-netbsd.mk
+endif

+ 0 - 0
make-bsd.mk → attic/make-bsd.mk


+ 0 - 0
make-linux.mk → attic/make-linux.mk


+ 0 - 0
make-mac.mk → attic/make-mac.mk


+ 0 - 0
make-netbsd.mk → attic/make-netbsd.mk


+ 0 - 0
objects.mk → attic/objects.mk