From d41fbf638e070d9fcf26a4c55a58fc1d015179c5 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Thu, 11 Jun 2015 18:04:48 +0000
Subject: [PATCH] stuff

---
 Makefile |   25 +++++++++++++++++++------
 1 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 4ebac6d..0a029e9 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
 
@@ -33,7 +42,7 @@
 OBJS = $(addprefix $(OBJDIR), $(OBJ))
 DEPS = $(wildcard src/*.h) Makefile
 
-all: $(EXEC)
+all: obj $(EXEC)
 
 $(EXEC): $(OBJS)
 	$(CC) $(COMMON) $(CFLAGS) $(LDFLAGS) $^ -o $@
@@ -44,6 +53,10 @@
 $(OBJDIR)%.o: %.cu $(DEPS)
 	$(NVCC) $(ARCH) $(COMMON) --compiler-options "$(CFLAGS)" -c $< -o $@
 
+obj:
+	mkdir -p obj
+
+
 .PHONY: clean
 
 clean:

--
Gitblit v1.10.0