aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorMarc André Tanner <mat@brain-dump.org>2015-10-27 10:11:40 +0100
committerMarc André Tanner <mat@brain-dump.org>2015-10-27 11:13:08 +0100
commit6fde5cdf2222796d923cf1e88bb29d244d19361c (patch)
tree46f741649875e4eb7b4d40f9977be141c23d7a8c /Makefile
parent9658e4b3886fda4c481641c9e191deebf36aa40d (diff)
downloadvis-6fde5cdf2222796d923cf1e88bb29d244d19361c.tar.gz
vis-6fde5cdf2222796d923cf1e88bb29d244d19361c.tar.xz
build: merge parts of the build system changes from lua branch
Should hopefully fix build on Mac OS X.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile8
1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index b34cb72..142ec01 100644
--- a/Makefile
+++ b/Makefile
@@ -8,14 +8,14 @@ config.h:
cp config.def.h config.h
vis: config.h config.mk *.c *.h
- @echo ${CC} ${CFLAGS} *.c ${LDFLAGS} -o $@
- @${CC} ${CFLAGS} *.c ${LDFLAGS} -o $@
+ @echo ${CC} ${CFLAGS} ${CFLAGS_VIS} *.c ${LDFLAGS} ${LDFLAGS_VIS} -o $@
+ @${CC} ${CFLAGS} ${CFLAGS_VIS} *.c ${LDFLAGS} ${LDFLAGS_VIS} -o $@
debug: clean
- @$(MAKE) CFLAGS='${DEBUG_CFLAGS}'
+ @$(MAKE) CFLAGS_VIS='${DEBUG_CFLAGS_VIS}'
profile: clean
- @$(MAKE) CFLAGS='${DEBUG_CFLAGS} -pg'
+ @$(MAKE) CFLAGS_VIS='${DEBUG_CFLAGS_VIS} -pg'
clean:
@echo cleaning