mirror-github-bspeice/libcvautomation
1
0
Fork 0
mirror of https://github.com/bspeice/libcvautomation synced 2025-08-10 09:25:25 -04:00
Code Issues Releases Wiki Activity

Merge include/opencv1 and include/opencv2

Browse Source 
Warning, this is a brutish hack, and unless fixed, should not be used.
This commit is contained in:
Bradlee Speice
2012-07-19 17:17:06 -04:00
parent 556e8b59ed
commit c4c700fcda
17 changed files with 23 additions and 2551 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
examples/Makefile.am
View File

@ -1,12 +1,7 @@
if BUILD_EXAMPLES
#Need to include the -Ilibcvautomation so that libcvautomation.h can find everything that it needs
if USEOPENCV2
AM_LDFLAGS = -L../libcvautomation/.libs -lcvautomation `pkg-config --libs x11` -lopencv_imgproc -lopencv_core -lopencv_highgui -lXtst
AM_CFLAGS = -Wall -Werror -O2 -I$(top_srcdir)/include/opencv2 #-I$(top_srcdir)/include/libcvautomation
else
AM_LDFLAGS = -L../libcvautomation/.libs -lcvautomation `pkg-config --libs x11` `pkg-config --libs opencv` -lXtst
AM_CFLAGS = -Wall -Werror -O2 -I$(top_srcdir)/include/opencv1 #-I$(top_srcdir)/include/libcvautomation
endif
AM_LDFLAGS = -L../libcvautomation/.libs -lcvautomation `pkg-config --libs x11` `pkg-config --libs opencv` `pkg-config --libs xtst`
AM_CFLAGS = -Wall -Werror -O2 -I$(top_srcdir)/include
#Build only if we're building the examples
bin_PROGRAMS = cva-match cva-input