From fbf547f536abff1a98cbccf2a222c62897595d52 Mon Sep 17 00:00:00 2001 From: Adam Goldsmith Date: Sat, 5 Mar 2016 01:26:54 -0500 Subject: [PATCH] Simplify Makefile and correct for new file name --- Makefile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 4584c5a..99c08a2 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,7 @@ LIBS=wpi -override CFLAGS +=-l$(LIBS) -std=c++14 +CXX=arm-frc-linux-gnueabi-g++ +override CPPFLAGS +=-std=c++14 +LDFLAGS=-l$(LIBS) TEAM=1786 SSH_OPTIONS=-q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no SSH_SSHPASS=$(shell command -v sshpass >/dev/null 2>&1 && echo -n "sshpass -p ''") @@ -8,9 +10,9 @@ all: deploy build: FRCUserProgram -FRCUserProgram: robot.cpp +FRCUserProgram: src/Robot.cpp @echo "Building FRCUserProgram" - arm-frc-linux-gnueabi-g++ robot.cpp -o FRCUserProgram $(CFLAGS) + $(CXX) $(CPPFLAGS) $< -o $@ $(LDFLAGS) clean: rm FRCUserProgram