Example config:
/python develop.py -G VC100 -t ReleaseSSE2 configure -DPACKAGE:BOOL=ON -DFMODEX:BOOL=ON -DVIEWER_CHANNEL:STRING="Singularity Alpha" -DVIEWER_LOGIN_CHANNEL:STRING="Singularity Alpha"
VIEWER_LOGIN_CHANNEL is the string that is used in --chanel switch to the shortcut created
VIEWER_CHANNEL is the string used for executable name and installer name
This example will produce: SingularityAlphaViewer.exe and installer named
SingularityAlpha_x-y-z-buildnr_Setup.exe
Added missing header to indra/newview/ascentkeyword.cpp now that
llviewerpluginmanager.h has a couple of header dependencies less.
Resolved Conflicts:
indra/llcommon/CMakeLists.txt
Proximity: addition of two independent things. Just included both.
Resolved Conflicts:
indra/newview/llviewermedia.cpp
indra/plugins/base_media/CMakeLists.txt
Trivial fix for indra/newview/llviewermedia.cpp.
Moved 'prepare' dependency from base_media to
base_basic because media already depends on basic.
This commit contains all changes, except those in indra/media_plugins
(which was renamed to indra/plugins) and indra/llplugin.
However, it does contain the (new) file
indra/plugins/filepicker/basic_plugin_filepicker.cpp
This involves making libllcommon shared, a change
that was not finished for windows/Mac.
More changes are needed to indra/newview/viewer_manifest.py
for those two operating systems, as well as to
indra/copy_win_scripts.
I did not test this on linux 32bit, nor non-standalone
on that OS, either.
I did not check voice (which will very likely not work
anyway on 64bit). And currently the webkit plugin doesn't
work for me, but I'll fix that in a different commit.
