From cbc9984a17b3452da4fee397aac912f1e9f7a4c3 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Wed, 10 Jun 2015 07:11:41 +0000
Subject: [PATCH] NIPS

---
 Makefile |   19 ++++++++++++++-----
 1 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 4ebac6d..bc3b9bf 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,7 @@
 GPU=1
+OPENCV=1
 DEBUG=0
+
 ARCH= -arch=sm_52
 
 VPATH=./src/
@@ -9,9 +11,9 @@
 CC=gcc
 NVCC=nvcc
 OPTS=-Ofast
-LDFLAGS=`pkg-config --libs opencv` -lm -pthread -lstdc++
-COMMON=`pkg-config --cflags opencv` -I/usr/local/cuda/include/
-CFLAGS=-Wall -Wfatal-errors
+LDFLAGS= -lm -pthread -lstdc++ 
+COMMON= -I/usr/local/cuda/include/ 
+CFLAGS=-Wall -Wfatal-errors 
 
 ifeq ($(DEBUG), 1) 
 OPTS=-O0 -g
@@ -19,9 +21,16 @@
 
 CFLAGS+=$(OPTS)
 
+ifeq ($(OPENCV), 1) 
+COMMON+= -DOPENCV
+CFLAGS+= -DOPENCV
+LDFLAGS+= `pkg-config --libs opencv` 
+COMMON+= `pkg-config --cflags opencv` 
+endif
+
 ifeq ($(GPU), 1) 
-COMMON+=-DGPU
-CFLAGS+=-DGPU
+COMMON+= -DGPU
+CFLAGS+= -DGPU
 LDFLAGS+= -L/usr/local/cuda/lib64 -lcuda -lcudart -lcublas -lcurand
 endif
 

--
Gitblit v1.10.0