Fix build issue on arm linux

diff --git a/Makefile b/Makefile
index ecdef3a..1f35d81 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,13 @@
 CC := g++
-CFLAGS := -Wall -std=c++11
+CFLAGS := -Wall -std=c++11 -Iinclude
 CPPLAGS += -Wall -std=c++11
 CXXLAGS += -Wall -std=c++11
 
 SRC := $(wildcard src/*.cpp *.cpp)
 OBJS := $(patsubst %.cpp,%.o, $(SRC))
-LIBS += `pkg-config --libs opencv`
-LIBS +=  -llog4cpp -lpthread
+LIBS += `pkg-config --libs opencv log4cpp`
+#LIBS +=  -llog4cpp -lpthread
+LIBS += -lpthread
 
 .PHONY: all clean
 all:$(OBJS)

diff --git a/SConstruct b/SConstruct
index e779fc9..4b4f63b 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -8,21 +8,18 @@ AddOption('--all', dest='all', action='store_true', help='Build all include test
 
 env = Environment(CXX="g++", 
                 CPPPATH=['#include'],
-                ALL=GetOption('all'))
+                CCFLAGS=['-Wall', '-std=c++11'])
 
-env.Append(CCFLAGS = ['-Wall', '-std=c++11'])
+env.Append(LIBS = ['tracker'])
 env.ParseConfig("pkg-config --libs opencv log4cpp")
+env.Append(LIBS = ['pthread'])
+
+env.Append(LIBPATH=['#.'])
 
-#obj = env.Object(Glob("src/*.cpp")) + env.Object("main.cpp")
 obj = env.Object('main.cpp')
-env.StaticLibrary('tracker', Glob('src/*.cpp'))
 
-#print env['LINKFLAGS']
-#print env['LIBS']
-env.Append(LIBS = ['tracker'])
-env.Append(LIBPATH=['#.'])
+env.StaticLibrary('tracker', Glob('src/*.cpp'))
 
-#env.Program("main", 'main.cpp', LIBS=['tracker'], LIBPATH=['.'])
 env.Program("main", list(obj))
 
 if GetOption('all'):

diff --git a/third_party/googletest/lib/libgmock.a b/third_party/googletest/lib/libgmock.a
index 8f02137..bf6a753 100644 (file)
Binary files a/third_party/googletest/lib/libgmock.a and b/third_party/googletest/lib/libgmock.a differ

diff --git a/third_party/googletest/lib/libgmock_main.a b/third_party/googletest/lib/libgmock_main.a
index 5a1da7b..af992c7 100644 (file)
Binary files a/third_party/googletest/lib/libgmock_main.a and b/third_party/googletest/lib/libgmock_main.a differ

diff --git a/third_party/googletest/lib/libgtest.a b/third_party/googletest/lib/libgtest.a
index b387ab1..47f45f9 100644 (file)
Binary files a/third_party/googletest/lib/libgtest.a and b/third_party/googletest/lib/libgtest.a differ

diff --git a/third_party/googletest/lib/libgtest_main.a b/third_party/googletest/lib/libgtest_main.a
index 5e0cdd2..ec5fec2 100644 (file)
Binary files a/third_party/googletest/lib/libgtest_main.a and b/third_party/googletest/lib/libgtest_main.a differ