From 91cd44e10f5fdde2a647942a89f0c8a726019d6d Mon Sep 17 00:00:00 2001 From: Nicky Date: Thu, 1 Aug 2013 23:44:32 +0200 Subject: [PATCH] - Don't use /FIXED:NO for Windows. - Disable building slplugin when building a 64 bit Windows binary. We use a prebuilt one due to Quicktime. --- indra/llplugin/CMakeLists.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/indra/llplugin/CMakeLists.txt b/indra/llplugin/CMakeLists.txt index 75d89aac78..dde4e0d5fb 100644 --- a/indra/llplugin/CMakeLists.txt +++ b/indra/llplugin/CMakeLists.txt @@ -58,7 +58,9 @@ set_source_files_properties(${llplugin_HEADER_FILES} if(NOT WORD_SIZE EQUAL 32) if(WINDOWS) + if( NOT ND_BUILD64BIT_ARCH ) add_definitions(/FIXED:NO) + endif( NOT ND_BUILD64BIT_ARCH ) else(WINDOWS) # not windows therefore gcc LINUX and DARWIN add_definitions(-fPIC) endif(WINDOWS) @@ -68,7 +70,9 @@ list(APPEND llplugin_SOURCE_FILES ${llplugin_HEADER_FILES}) add_library (llplugin ${llplugin_SOURCE_FILES}) -add_subdirectory(slplugin) +if( NOT ( WINDOWS AND ND_BUILD64BIT_ARCH ) ) + add_subdirectory(slplugin) +endif( NOT ( WINDOWS AND ND_BUILD64BIT_ARCH ) ) # Add tests if (LL_TESTS)