github
/
darknet
mirror of https://github.com/AlexeyAB/darknet.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #4896 from tiagoshibata/opencv4-AlexeyAB

Browse Source 
Support building with OpenCV 4
pull/4907/head
Alexey 5 years ago committed by GitHub
parent a67a3d7880 187918f564
commit 1de03f948c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      Makefile

6
Makefile
Unescape View File

@ -60,7 +60,7 @@ else
CC=gcc CC=gcc
endif endif
CPP=g++ CPP=g++ -std=c++11
NVCC=nvcc NVCC=nvcc
OPTS=-Ofast OPTS=-Ofast
LDFLAGS= -lm -pthread LDFLAGS= -lm -pthread
@ -87,8 +87,8 @@ endif
ifeq ($(OPENCV), 1) ifeq ($(OPENCV), 1)
COMMON+= -DOPENCV COMMON+= -DOPENCV
CFLAGS+= -DOPENCV CFLAGS+= -DOPENCV
LDFLAGS+= `pkg-config --libs opencv` LDFLAGS+= `pkg-config --libs opencv4 2> /dev/null || pkg-config --libs opencv`
COMMON+= `pkg-config --cflags opencv` COMMON+= `pkg-config --cflags opencv4 2> /dev/null || pkg-config --cflags opencv`
endif endif
ifeq ($(OPENMP), 1) ifeq ($(OPENMP), 1)

Write Preview
Loading…
Cancel
Save