Do not use pcre on linux64
Conflicts: indra/newview/viewer_manifest.py Merged with a patch that I wrote. The linux pcre prebuilts can also be removed from install.xml, but for now leaving them there because the prebuilts are still in use by the libcollada prebuilt (probably should just move them into that git repository).
This commit is contained in:
committed by
Aleric Inglewood
parent
64513e7229
commit
cf100fc36c
@@ -10,9 +10,9 @@ if (STANDALONE)
|
||||
else (STANDALONE)
|
||||
use_prebuilt_binary(colladadom)
|
||||
|
||||
if (NOT WINDOWS)
|
||||
if (NOT WINDOWS AND NOT LINUX)
|
||||
use_prebuilt_binary(pcre)
|
||||
endif (NOT WINDOWS)
|
||||
endif (NOT WINDOWS AND NOT LINUX)
|
||||
|
||||
if (NOT DARWIN AND NOT WINDOWS)
|
||||
use_prebuilt_binary(libxml)
|
||||
|
||||
Reference in New Issue
Block a user