diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2017-03-17 12:37:23 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2017-03-17 12:37:23 -0700 |
| commit | df3025554213570aca6259b30d2bd314f3628659 (patch) | |
| tree | 06851506e7a8c3a1b03630e3e92e3d822964d2f2 /Makefile | |
| parent | e3feaf3f5d5e519aad33623f730b39b69a7e4fd4 (diff) | |
| parent | d5102539dd700f8dcf3b46867d93be5adfb68d71 (diff) | |
| download | infinitytier-df3025554213570aca6259b30d2bd314f3628659.tar.gz infinitytier-df3025554213570aca6259b30d2bd314f3628659.zip | |
Merge branch 'master' into dev
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -11,8 +11,8 @@ ifeq ($(OSTYPE),Linux) endif ifeq ($(OSTYPE),FreeBSD) - CC=gcc - CXX=g++ + CC=clang + CXX=clang++ ZT_BUILD_PLATFORM=7 include make-bsd.mk endif |