diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2014-05-28 19:10:26 -0400 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2014-05-28 19:10:26 -0400 |
| commit | 98ecd0443689907e3da25754868459f169cb7d85 (patch) | |
| tree | b822bf4dc8cbc07698934571701c58b14cf1e532 /indra | |
| parent | 71eb87d0a5ff7d0f70dc2a3ac1445db183aa494b (diff) | |
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.
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/cmake/00-Common.cmake | 2 | ||||
| -rwxr-xr-x | indra/cmake/LLPrimitive.cmake | 1 |
2 files changed, 2 insertions, 1 deletions
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 |