From d7fd2acf0582020de87f49d8863d39d1744a858c Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@burninator.cs.washington.edu>
Date: Thu, 23 Jun 2016 05:31:17 +0000
Subject: [PATCH] Merge branch 'master' of https://github.com/pjreddie/darknet

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

diff --git a/Makefile b/Makefile
index 6569ac4..14f4211 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,9 @@
-GPU=0
+GPU=1
+OPENCV=1
 CUDNN=0
-OPENCV=0
 DEBUG=0
 
-ARCH= --gpu-architecture=compute_52 --gpu-code=compute_52 
+ARCH= --gpu-architecture=compute_52 --gpu-code=compute_52
 
 VPATH=./src/
 EXEC=darknet

--
Gitblit v1.10.0