Mercurial Hosting > traffic-intelligence
diff c/Makefile @ 231:249d65ff6c35
merged modifications for windows
| author | Nicolas Saunier <nicolas.saunier@polymtl.ca> |
|---|---|
| date | Mon, 02 Jul 2012 23:49:39 -0400 |
| parents | f0f800b95765 |
| children | 7ef1071e3cc3 |
line wrap: on
line diff
--- a/c/Makefile Fri Jun 29 16:15:13 2012 -0400 +++ b/c/Makefile Mon Jul 02 23:49:39 2012 -0400 @@ -11,11 +11,10 @@ LDFLAGS = -lm LDFLAGS += -lTrajectoryManagementAndAnalysis -lsqlite3 LDFLAGS += -lboost_program_options -# -lboost_filesystem-mt -lboost_system-mt -lboost_unit_test_framework-mt +# -lboost_filesystem-mt -lboost_system-mt #LDFLAGS += -lfltk CFLAGS = -Wall -W -Wextra -# -DUSE_OPENCV UNAME = $(shell uname) ifneq ($(OPENCV), 0) @@ -54,9 +53,6 @@ COMMON_OBJS = utils.o Motion.o Parameters.o utils.o OBJS = $(COMMON_OBJS) $(CV_OBJS) TESTS_OBJS = test_feature.o test_graph.o -ifeq ($(UNAME), Linux) - TESTS_OBJS += $(LINUX_BOOST_PREFIX)/lib/libboost_unit_test_framework.a -endif default: builddir all @@ -70,8 +66,8 @@ echo "coucou $(HOME)" tests: $(TESTS_OBJS) $(OBJS) - createdirectory.sh $(EXE_DIR) - createdirectory.sh test_data + @$(SCRIPTS_DIR)/createdirectory.sh $(EXE_DIR) + @$(SCRIPTS_DIR)/createdirectory.sh test_data $(CXX) $(CFLAGS) $(LIBS) -o $(EXE_DIR)/$@ $^ $(LDFLAGS) $(EXE_DIR)/$@