Mercurial > hg > nsaunier > traffic-intelligence
comparison c/Makefile @ 616:0791b3b55b8f
Merge
| author | MohamedGomaa |
|---|---|
| date | Wed, 10 Dec 2014 14:18:30 -0500 |
| parents | 34111db7cecb |
| children | 107f1ad02b69 |
comparison
equal
deleted
inserted
replaced
| 615:0954aaf28231 | 616:0791b3b55b8f |
|---|---|
| 1 EXE_DIR=../bin | 1 EXE_DIR=../bin |
| 2 SCRIPTS_DIR=../scripts | 2 SCRIPTS_DIR=../scripts |
| 3 TRAJECTORYMANAGEMENT_DIR=D:/00-trackingSoftware/trajectories-trajectorymanagementandanalysis/trunk/src/TrajectoryManagementAndAnalysis | 3 TRAJECTORYMANAGEMENT_DIR=$(HOME)/Research/Code/trajectorymanagementandanalysis/trunk/src/TrajectoryManagementAndAnalysis |
| 4 | 4 |
| 5 CXX = g++ | 5 CXX = g++ |
| 6 | 6 |
| 7 INCLUDE = -I../include -I$(TRAJECTORYMANAGEMENT_DIR) | 7 INCLUDE = -I../include -I$(TRAJECTORYMANAGEMENT_DIR) |
| 8 | 8 |
