Skip to content

Commit d0c876b

Browse files
committed
Fix includes when using manual opencv
1 parent d449211 commit d0c876b

File tree

2 files changed

+11
-9
lines changed

2 files changed

+11
-9
lines changed

modules/Makefile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,13 @@ LD=g++
1414
LFLAGS=-Wall -I. -lm -g
1515
LIBS=-lsystemc -lm
1616

17+
# Source directories
18+
SRCDIR=src
19+
OBJDIR=obj
20+
BINDIR=./
21+
INCDIR=-I. -I./include -I$(SYSTEMC)/include -Ibasic_protocol -I$(SYSTEMC)/include/tlm_core/tlm_2
22+
LIBDIR=-L. -L$(SYSTEMC)/lib-linux64
23+
1724
ifdef INCLUDE_OPENCV
1825
# Target
1926
LIBS+=-lopencv_imgcodecs -lopencv_core -lopencv_highgui -lopencv_imgproc
@@ -28,13 +35,6 @@ LFLAGS += $(shell pkg-config --libs opencv4)
2835
endif # INCLUDE_OPENCV_PKG
2936
endif # INCLUDE_OPENCV
3037

31-
# Source directories
32-
SRCDIR=src
33-
OBJDIR=obj
34-
BINDIR=./
35-
INCDIR=-I. -I./include -I$(SYSTEMC)/include -Ibasic_protocol -I$(SYSTEMC)/include/tlm_core/tlm_2
36-
LIBDIR=-L. -L$(SYSTEMC)/lib-linux64
37-
3838
SOURCES := $(wildcard $(SRCDIR)/*.cpp)
3939
INCLUDES := $(wildcard $(INCDIR)/*.hpp)
4040
OBJECTS := $(SOURCES:$(SRCDIR)/%.cpp=$(OBJDIR)/%.o)

modules/edge-detector/utils.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
#!/bin/sh
2-
export SYSTEMC=/home/systemc-2.3.3
3-
export LD_LIBRARY_PATH=$SYSTEMC/lib-linux64:/usr/local/lib
2+
export SYSTEMC_HOME=/home/systemc-2.3.3
3+
export OPENCV_SO_DIR=/usr/local/lib
4+
export OPENCV_H_DIR=/usr/local/include/opencv4
5+
export LD_LIBRARY_PATH=$SYSTEMC_HOME/lib-linux64:/usr/local/lib
46
export USER_DEF_SYSTEMC_DIR=1
57
export INCLUDE_OPENCV=1

0 commit comments

Comments
 (0)