From 085800f6e0243716e0c521bfe3c428e73de4f901 Mon Sep 17 00:00:00 2001 From: Latif Khalifa Date: Wed, 30 Jan 2013 05:26:15 +0100 Subject: [PATCH] Tell the compiler we are using colladadom dll, and not a static lib. Use our current boost libs --- indra/cmake/Colladadom.cmake | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/indra/cmake/Colladadom.cmake b/indra/cmake/Colladadom.cmake index 6c41cc7e9..1e4a9ed56 100644 --- a/indra/cmake/Colladadom.cmake +++ b/indra/cmake/Colladadom.cmake @@ -24,13 +24,14 @@ else (STANDALONE) ) if (WINDOWS) + add_definitions(-DDOM_DYNAMIC) set(COLLADADOM_LIBRARIES debug libcollada14dom22-d optimized libcollada14dom22 - debug libboost_filesystem-mt-gd - optimized libboost_filesystem-mt - debug libboost_system-mt-gd - optimized libboost_system-mt + debug libboost_filesystem-vc100-mt-gd-1_45.lib + optimized libboost_filesystem-vc100-mt-1_45.lib + debug libboost_system-vc100-mt-gd-1_45.lib + optimized libboost_system-vc100-mt-1_45.lib ) else (WINDOWS) set(COLLADADOM_LIBRARIES