livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- 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.
master
Nicky 2013-08-01 23:44:32 +02:00
parent 1077938a72
commit 91cd44e10f
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/llplugin/CMakeLists.txt
View File

@ -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)