From 56585d98e20e25f88d8f2be8332bdebf653563a8 Mon Sep 17 00:00:00 2001 From: Serge Lamikhov-Center Date: Fri, 13 Feb 2015 22:21:12 +0200 Subject: [PATCH] Conditional compilation for boost library linkage --- ELFIOTest/ELFIOTest.cpp | 2 ++ ELFIOTest/Makefile | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ELFIOTest/ELFIOTest.cpp b/ELFIOTest/ELFIOTest.cpp index 07b10c3..b6f8b98 100644 --- a/ELFIOTest/ELFIOTest.cpp +++ b/ELFIOTest/ELFIOTest.cpp @@ -4,7 +4,9 @@ #endif #define BOOST_TEST_MAIN +#ifndef _MSC_VER #define BOOST_TEST_DYN_LINK +#endif #define BOOST_TEST_MODULE ELFIO_Test #include diff --git a/ELFIOTest/Makefile b/ELFIOTest/Makefile index 21f7473..ceb4c93 100644 --- a/ELFIOTest/Makefile +++ b/ELFIOTest/Makefile @@ -1,6 +1,6 @@ CXX=g++ CPPFLAGS=-c -Wall -std=c++0x -I.. -LDLIBS=-lboost_unit_test_framework-mt +LDLIBS=-lboost_unit_test_framework ELFIODIR=../elfio/ SOURCES=ELFIOTest.cpp ELFIOTest1.cpp