diff options
| author | mutantturkey <mutantturke@gmail.com> | 2012-06-20 14:36:45 -0400 |
|---|---|---|
| committer | mutantturkey <mutantturke@gmail.com> | 2012-06-20 14:36:45 -0400 |
| commit | e0bbbbcab8f43318faddeb4915897936cec88918 (patch) | |
| tree | eb6491ce20c31ea28cddf0d1e6dcf385b5f9aef9 /fly-tools/Makefile | |
| parent | 5c781d320ac82428ca449d4dd2f35099d5edde40 (diff) | |
updated the readme to include the new utility, mask-generator. Added to mask-generator to the make file, renamed the folder for mask-generator to mask, added proper headers to remove warnings, fixed a return type and removed an unused variable called status
Diffstat (limited to 'fly-tools/Makefile')
| -rw-r--r-- | fly-tools/Makefile | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/fly-tools/Makefile b/fly-tools/Makefile index 94d69e9..1ba4ecc 100644 --- a/fly-tools/Makefile +++ b/fly-tools/Makefile @@ -1,14 +1,17 @@ -CC = g++ -FLAGS = -O2 -Wall -s $(shell pkg-config --cflags --libs ImageMagick++ gsl) +CPPC = g++ +CC = gcc +CPPFLAGS = -O2 -Wall -s $(shell pkg-config --cflags --libs ImageMagick++ gsl) +CFLAGS = -O2 -Wall -s $(shell pkg-config --cflags --libs MagickWand) +all: FilterFlyMask FlyTrackingMain mask-generator -all: FilterFlyMask FlyTrackingMain - +mask-generator: + $(CC) mask/main.c mask/thpool.c -I./mask/ -o mask-generator $(CFLAGS) -pthread FlyTrackingMain: - $(CC) FlyTrackingMain.cpp FlyObject.cpp FrameInfo.cpp -o FlyTracking $(FLAGS) + $(CPPC) FlyTrackingMain.cpp FlyObject.cpp FrameInfo.cpp -o FlyTracking $(CPPFLAGS) FilterFlyMask: - $(CC) FilterFlyMask.cpp FlyObject.cpp FrameInfo.cpp -o FilterFlyMask $(FLAGS) + $(CPPC) FilterFlyMask.cpp FlyObject.cpp FrameInfo.cpp -o FilterFlyMask $(CPPFLAGS) clean: - rm -vf FilterFlyMask FlyTracking + rm -vf FilterFlyMask FlyTracking mask-generator |