From 98ecd0443689907e3da25754868459f169cb7d85 Mon Sep 17 00:00:00 2001
From: Monty Brandenberg <monty@lindenlab.com>
Date: Wed, 28 May 2014 19:10:26 -0400
Subject: Win: Get running on Windows. Remove DOM_DYNAMIC, link with
libxml2_a.lib. Release and Debug builds working. Remove the DOM_DYNAMIC
define so that we don't create declspec declarations to colladadom objects
and pull in libxml2_a (_a for archive) to complete the link. Debug
functional and would be moreso if not for all the CrtCheckMemory() calls.
---
indra/cmake/00-Common.cmake | 2 +-
indra/cmake/LLPrimitive.cmake | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
(limited to 'indra/cmake')
diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake
index 1d78638143..244110ff66 100755
--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -62,7 +62,7 @@ if (WINDOWS)
add_definitions(
/DLL_WINDOWS=1
/DNOMINMAX
- /DDOM_DYNAMIC
+# /DDOM_DYNAMIC # For shared library colladadom
/DUNICODE
/D_UNICODE
/GS
diff --git a/indra/cmake/LLPrimitive.cmake b/indra/cmake/LLPrimitive.cmake
index 71b80a1ae4..d02160e439 100755
--- a/indra/cmake/LLPrimitive.cmake
+++ b/indra/cmake/LLPrimitive.cmake
@@ -17,6 +17,7 @@ if (WINDOWS)
optimized llprimitive
debug libcollada14dom23-sd
optimized libcollada14dom23-s
+ libxml2_a
debug pcrecppd
optimized pcrecpp
debug pcred
--
cgit v1.2.3