From 9c8a5d424086268bfb3d085412f288d92372a28b Mon Sep 17 00:00:00 2001 From: Ansariel Date: Mon, 22 Jan 2018 16:53:26 +0100 Subject: [PATCH] Update build instructions for Windows and delete obsolete package_override_vc12.ini --- README_BUILD_FIRESTORM_WIN64.txt | 17 ---- ....txt => README_BUILD_FIRESTORM_WINDOWS.txt | 29 +++--- package_override_vc12.ini | 98 ------------------- 3 files changed, 17 insertions(+), 127 deletions(-) delete mode 100755 README_BUILD_FIRESTORM_WIN64.txt rename README_BUILD_FIRESTORM_WIN32.txt => README_BUILD_FIRESTORM_WINDOWS.txt (64%) delete mode 100644 package_override_vc12.ini diff --git a/README_BUILD_FIRESTORM_WIN64.txt b/README_BUILD_FIRESTORM_WIN64.txt deleted file mode 100755 index 923a869cb2..0000000000 --- a/README_BUILD_FIRESTORM_WIN64.txt +++ /dev/null @@ -1,17 +0,0 @@ -This is WIP. Please change/expand when seeing fit. - -1.1 Visual Studio 2013 Community Edition or better with installed 64 bit compiler. -1.2 Or Visual Studio Express and 'Microsoft Windows SDK for Windows 7 and .NET Framework 4'. Make sure to install at least the header and compiler with all the latest service packs. -2. autobuild from https://bitbucket.org/NickyD/autobuild-1.0 -3. FMOD, if you want sound, please see https://bitbucket.org/NickyD/3p-fmodex - -You will find the urls to all 64 bit prebuild packages in /package_override_vc12.ini - -Make sure you're not building from a Visual Studio command prompt, or parts of the build -chain might accidentally pick up a 32 bit compiler, resulting in x86<>x64 mismatch. - -Configure/build is nearly the same as building a 32 bit version. -autobuild -m64 configure -c ReleaseFS -- --chan --package -autobuild -m64 build -c ReleaseFS --no-configure - -The resulting installer/exe gets created in build-vc120_x64/newview/Release diff --git a/README_BUILD_FIRESTORM_WIN32.txt b/README_BUILD_FIRESTORM_WINDOWS.txt similarity index 64% rename from README_BUILD_FIRESTORM_WIN32.txt rename to README_BUILD_FIRESTORM_WINDOWS.txt index 3e7de2ebbe..b648dfa4e1 100755 --- a/README_BUILD_FIRESTORM_WIN32.txt +++ b/README_BUILD_FIRESTORM_WINDOWS.txt @@ -1,12 +1,12 @@ Before you start configuring your Windows build system, be aware of our tested configurations: - Memory: You will need at least 2GB RAM, 4GB strongly recommended. - CPU: Multiple CPUs are strongly recommended. - A build can take over an hour. - Visual Studio 2013 Community Edition. + Memory: You will need at least 2GB RAM, 4GB strongly recommended. + CPU: Multiple CPUs are strongly recommended. + A build can take over an hour. + Visual Studio 2013 Community Edition. Ensure you can build a stock viewer-development try as described in the SL wiki. Before asking for any help compiling Firestorm, make sure you can build viewer-development first. If you try and skip this step, you may -receive much less help. http://wiki.secondlife.com/wiki/Viewer_2_Microsoft_Windows_Builds +receive much less help. http://wiki.secondlife.com/wiki/Visual_Studio_2013_Viewer_Builds If you want to use licensed FMOD or KDU build libraries (they are optional) you have to provision these yourself. If you're licensing these with Phoenix/Firestorm, ask for the libraries for fmod and kdu. Put them into: @@ -17,12 +17,12 @@ If you're a community builder, you'll need to build these libraries yourself, th point to your own versions, or create a different autobuild.xml with your customizations, and use this with autobuild instead of our default autobuild.xml There are some examples of how to build FMOD on the LL Wiki and opensource-dev mailing list. We've created a non-KDU build target to make this easier. Everywhere you see "ReleaseFS" below, use -"ReleaseFS_open" instead. This will perform the same build, using openjpeg instead of KDU. +"ReleaseFS_open" instead. This will perform the same build, using OpenJpeg instead of KDU. To build firestorm: - Launch the VS2013 CMD Environment. This is NOT just cmd.exe, this is the CMD shell in the VS2013 start folder +Launch the VS2013 CMD Environment. This is NOT just cmd.exe, this is the CMD shell in the VS2013 start folder that sets your dev environment variables. You will use this shell to kick off command line builds. CYGWIN or standard CMD.EXE will not work. @@ -32,9 +32,9 @@ After launching the VS2013 cmd shell and navigating to your firestorm code repo: Other build targets you may use are: - ReleaseFS (includes KDU, FMOD) - ReleaseFS_open (no KDU, no FMOD) - RelWithDebInfoFS_open (no KDU, no FMOD) + ReleaseFS (includes KDU, FMOD) + ReleaseFS_open (no KDU, no FMOD) + RelWithDebInfoFS_open (no KDU, no FMOD) Other examples: autobuild configure -c ReleaseFS # basic configuration step, don't build, just configure @@ -46,8 +46,13 @@ Other examples: If you want to set custom configuration, do this in the configure step separately from build, then run "autobuild build -c ReleaseFS --no-configure" as a secondary step. +If you want to build the 64bit version, add the parameter -A 64 to the autobuild commands, e.g.: + autobuild configure -A 64 -c ReleaseFS + autobuild build -A 64 -c ReleaseFS --no-configure + + Logs: - Look for logs in build-vc120/logs + Look for logs in build-vc120-32/logs for 32bit builds and build-vc120-64/logs for 64bit Output: - Look for output in build-vc120/newview/Release + Look for output in build-vc120-32/newview/Release for 32bit builds and build-vc120-64/newview/Release for 64bit diff --git a/package_override_vc12.ini b/package_override_vc12.ini deleted file mode 100644 index b4d10f66e9..0000000000 --- a/package_override_vc12.ini +++ /dev/null @@ -1,98 +0,0 @@ -[firestorm] -windows=build_directory|build-vc120_x64 - -[expat] -windows = http://downloads.phoenixviewer.com/expat-2.0.1.201412041835-windows-x64-201412041835.tar.bz2|6295b4bbc7b7498bdff342a399628a5f - -[ogg_vorbis] -windows = http://downloads.phoenixviewer.com/ogg_vorbis-1.2.2-1.3.2.201412081901-windows-x64-201412081901.tar.bz2|6d541e34af90e225c3605afc3ab5f520 - -[apr_suite] -windows = http://downloads.phoenixviewer.com/apr_suite-1.4.5.201602231252-r100-windows-x64-201602231252-r100.tar.bz2|45230669d56305f479bab020512f3c7e - -[ares] -windows = http://downloads.phoenixviewer.com/ares-1.10.0.201412051139-windows-x64-201412051139.tar.bz2|c558757b6f9eeb07397543a602887414 - -[jsoncpp] -windows = http://downloads.phoenixviewer.com/jsoncpp-0.5.0.201508040900-r34-windows-x64-201508040900-r34.tar.bz2|2957dcc4ba8f90f8624b64a2dcac4309 - -[nvapi] -windows = http://downloads.phoenixviewer.com/nvapi-304-windows-x64-201412041836.tar.bz2|6d82a041479e1c80613560cfb4abc793 - -[jpeglib] -windows = http://downloads.phoenixviewer.com/jpeglib-8c.201412091958-windows-x64-201412091958.tar.bz2|926fcd7e4a899d7ae275637bfca241a4 - -[zlib] -windows = http://downloads.phoenixviewer.com/zlib-1.2.8.201412041926-windows-x64-201412041926.tar.bz2|12906492988107cc61d069829b1e27a6 - -[freetype] -windows = http://downloads.phoenixviewer.com/freetype-2.3.9.201505100250-r61-windows-x64-201505100250-r61.tar.bz2|c3ea8e68d0a0f399253e8d578ee38da2 - -[glod] -windows = http://downloads.phoenixviewer.com/glod-1.0pre3.201703081200-windows64-201703081200.tar.bz2|7eceae7977650ebc6124a9dfee3c4d84 - -[libhunspell] -windows = http://downloads.phoenixviewer.com/libhunspell-1.3.2.201412051002-windows-x64-201412051002.tar.bz2|60feb84271fc5a36a5443b2fdd4ae488 - -[openjpeg] -windows = http://downloads.phoenixviewer.com/openjpeg-1.4.201412051021-windows-x64-201412051021.tar.bz2|47c09d96ae84fa4518b639cd93ba45b3 - -[openjpeg2] -windows = http://downloads.phoenixviewer.com/openjpeg2-2.1.201601141917-r32-windows-x64-201601141917-r32.tar.bz2|0465f2221c22a7349e4ae49f751ae3d3 - -[google_breakpad] -windows = http://downloads.phoenixviewer.com/google_breakpad-1413.201505112008-r97-windows-x64-201505112008-r97.tar.bz2|5c838ef1438b1f4264ff393e0d5420bd - -[pcre] -windows = http://downloads.phoenixviewer.com/pcre-8.35.-windows-x64-201412051117.tar.bz2|c4226981c108e5963fcfa8d625ce6c3e - -[openssl] -windows = http://downloads.phoenixviewer.com/openssl-1.0.1i.201412051423-windows-x64-201412051423.tar.bz2|331c237a8bfa36328f5c992d4c24eb04 - -[curl] -windows = http://downloads.phoenixviewer.com/curl-7.47.0.201604191310-windows64-201604191310.tar.bz2|e527051baf7905f97811a3d029594fc3 - -[xmlrpc-epi] -windows = http://downloads.phoenixviewer.com/xmlrpc_epi-0.54.1.201412081443-windows-x64-201412081443.tar.bz2|acf0701508169cb8a2d77ace63ded24a - -[libxml2] -windows = http://downloads.phoenixviewer.com/libxml2-2.9.1.201412051457-windows-x64-201412051457.tar.bz2|177a83579199702fff5505222af204ec - -[libpng] -windows = http://downloads.phoenixviewer.com/libpng-1.6.8.201412051513-windows-x64-201412051513.tar.bz2|39b887916945024bb4200bfcc3cdd4a1 - -[libndofdev] -windows = http://downloads.phoenixviewer.com/libndofdev-0.1.201412081905-windows-x64-201412081905.tar.bz2|dcffe4ca2354d063a9885b1551c23548 - -[icu4c] -windows = http://downloads.phoenixviewer.com/icu4c-53.1-windows-x64-201412051602.tar.bz2|926e8005f8e3e857aa8dba19005d5e81 - -[boost] -windows = http://downloads.phoenixviewer.com/boost-1.57-windows-201606032025-r139.tar.bz2|96b2f66728415217884b7af873d89f11 - -[colladadom] -windows = http://downloads.phoenixviewer.com/colladadom-2.3.201606032138-r100-windows-x64-201606032138-r100.tar.bz2|f47abb611ade15cf960e81649a1f9da0 - -[uriparser] -windows = http://downloads.phoenixviewer.com/uriparser-0.8.0.1-windows-x64-201503021339-r17.tar.bz2|258fe49b01297a5e836a90cc6324b5e0 - -[ndphysicsstub] -windows = http://downloads.phoenixviewer.com/ndPhysicsStub-1.201412081952-windows-x64-201412081952.tar.bz2|a2baf97f950cc16af9fe5cf316b7fa4d - -[gtk-atk-pango-glib] -windows = - -[llqtwebkit] -windows = - -[gntp-growl] -windows = http://downloads.phoenixviewer.com/gntp_growl-1.0-windows-x64-201601022251-r16.tar.bz2|5b1d8e9d3f4fd4fcc6b090d2e9bfd23d - -[llceflib] -windows = http://downloads.phoenixviewer.com/llceflib-1.0-windows-x64-201611182300-r72.tar.bz2|5bb2ec95ff3d8d8aea0136d39b6b3f60 - -[vlc-bin] -windows = http://downloads.phoenixviewer.com/vlc_bin-2.2.4.201608121201-windows64-201608121201.tar.bz2|035cd97ce22bd26cfe6eb80c411c40d4 - -[llphysicsextensions_stub] -windows = file:///c:/cygwin/opt/firestorm/llphysicsextensions_tpv-1.0.511060-windows64-511060.tar.bz2|65183e2fbd4044aeca35ff9e70ac38ac