lnvis

commit eb2dbca588ba5e8fedd75280b89253e97212d333
parent e7b688dc1a55382cda36b5563bd07b72e179abc9
Author: William Casarin <jb55@jb55.com>
Date:   Fri, 17 Aug 2018 00:18:14 -0700

travis: fix issues

Diffstat:
M
.travis.yml
 | 
5
++++-
M
Makefile
 | 
6
+++---

2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/.travis.yml b/.travis.yml
@@ -1,11 +1,13 @@
 language: c
 sudo: required
 dist: trusty
-script: make
+script: make lnvis
 
 env:
   global:
     - GLFW_VERSION=3.2.1
+    - TRAVIS_CFLAGS="-I/home/travis/include"
+    - TRAVIS_LDFLAGS="-L/home/travis/lib"
     - DISPLAY=:99.0
 
 before_install:
@@ -16,6 +18,7 @@ before_install:
   - cmake -DBUILD_SHARED_LIBS=ON -DGLFW_BUILD_EXAMPLES=OFF -DGLFW_BUILD_TESTS=OFF -DGLFW_BUILD_DOCS=OFF -DCMAKE_INSTALL_PREFIX=$HOME
   - make
   - sudo make install
+  - cd ..
 
 addons:
   apt:
diff --git a/Makefile b/Makefile
@@ -1,9 +1,9 @@
 
 BIN = lnvis
 PREFIX ?= /usr/local
-CFLAGS = -Ideps -ggdb -O2 -Wall -Wextra -std=c99 -DJSMN_PARENT_LINKS
+CFLAGS = -Ideps -ggdb -O2 -Wall -Wextra -std=c99 -DJSMN_PARENT_LINKS $(TRAVIS_CFLAGS)
 
-LDFLAGS = -lglfw -lGL -lm
+LDFLAGS = $(TRAVIS_LDFLAGS) -lglfw -lGL -lm
 
 
 SRCS = main.c
@@ -28,7 +28,7 @@ include $(OBJS:.o=.d)
 	$(CC) -MM $(CFLAGS) $< > $@
 
 $(BIN): $(OBJS)
-	$(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@
+	$(CC) $(CFLAGS) $^ $(LDFLAGS)  -o $@
 
 TAGS: fake
 	etags $(SRCS)