Commit Graph

1345 Commits (eb06fba7679704a7870e3d91f2166bf7e63e5641)

Author SHA1 Message Date
Ansariel 42c77ab5bc Merge Firestorm LGPL 2016-11-04 12:52:13 +01:00
Liny ec98d0d79d Merge the backout in. 2016-11-03 00:03:58 -07:00
Liny a6ad8a160f Backed out changeset: 58602af33b30 2016-11-02 23:59:00 -07:00
Ansariel f1011a1e19 Merge Firestorm LGPL 2016-10-11 21:08:24 +02:00
Ansariel 2aeb2d2e65 Merge Firestorm LGPL 2016-10-10 21:42:22 +02:00
Nicky d1e39953fe Merge with https://phoenixviewer.com/phoenix-firestorm-lgpl/ 2016-10-05 20:25:26 +02:00
Tonya Souther c277e3c772 Fix cmake warning. 2016-10-03 08:36:16 -05:00
Ansariel 92f6d8d521 Merge viewer-bear 2016-10-01 17:03:57 +02:00
Tonya Souther a2ae9255f0 Add support for OS X 10.12 SDK. 2016-09-28 00:28:41 -05:00
Ansariel bb7cbe7cff Small improvements to UI DPI scaling on Windows:
* Use USER_DEFAULT_SCREEN_DPI define from WinUser.h
* Change Win32 SDK target version to Windows Vista or greater
* Define WM_DPICHANGED as preprocessor definition as in WinUser.h
* Cull manual definitions of WM_MOUSEWHEEL and WHEEL_DELTA which are part of the Win32 SDK since Windows NT 4.0
2016-09-20 21:16:39 +02:00
Nicky 9fbcb54631 Backout d8dc2724d189 as DSO loading causes issue with VLC of different API levels. 2016-08-08 19:28:42 +02:00
Nicky 87f61ede8b DSO load VLC. for Windows use the installer from http://www.videolan.org/vlc/download-windows.html (select the 64bit installer from the dropdown next to "Download VLC" for a 64 bit viewer) 2016-08-05 00:33:09 +02:00
Nicky 62b661fb4f Merge. 2016-08-04 19:00:16 +02:00
Nicky 46280740bb Linux/x86; gtk_atk_pango_glib update for gstreamer 1.0 2016-08-03 23:20:59 +02:00
Nicky 276cd251a6 GStreamer 1.0 media plugins for Windows and Linux. 2016-08-02 19:02:29 +02:00
Nicky 60e13343bf - Update CEF
- Remove old preload hack and y flipping debug for CEF.
- Enable 64 bit CEF for Windows x64. The plugins will be built as native 64 bit plugins now (no quicktime).
2016-08-02 14:40:56 +02:00
Ansariel 7fffa971ef Remove WiX installer 2016-10-21 13:53:11 +02:00
Nicky 955192f17c Merge. 2016-07-10 17:25:48 +02:00
Nicky 142946e265 New cmake variable ND_SYSTEM_DEFINES_FORTIFY_SOURCE instead of relying on GCC detection is the system compiler already defines _FORTIFY_SOURCE 2016-07-09 23:33:19 +02:00
Nicky d63d3b4e7b Merge. 2016-07-01 16:00:32 +02:00
Tonya Souther ebf13f9abc Build fixes for C++11 on OS X. Includes several rebuilt libraries. 2016-06-21 15:57:18 -05:00
Ansariel de1a0d4be3 Target minimum Windows Vista for the Windows API 2016-06-21 01:11:04 +02:00
Tonya Souther 5d35959602 Handle building on OS X with Xcode 6 or 7 and SDKs from 10.9 through 10.11. 2016-06-20 11:15:27 -05:00
Oz Linden 97f11bc635 move build number informative output to stdout 2016-06-09 10:03:07 -04:00
Nicky 956f687f47 Merge with https://bitbucket.org/callum_linden/viewer-release-vlc 2016-06-04 00:49:12 +02:00
Nicky bebfe34aac Linux: Use media_plugin_libvlc for media playback. 2016-06-01 22:33:30 +02:00
Nicky b78f19f82e Linux: SDL has a dependency on X11 -> Link against it. 2016-06-01 22:31:00 +02:00
Nicky e982c273fd Merge with viewer-release-vlc 2016-05-29 19:27:00 +02:00
callum_linden 70a38880fa Put back QuickTime plugin code for OS X only (untested - moving code to OS X dev) 2016-05-26 12:50:54 -07:00
callum_linden 05fcb7c812 Automated merge with tip of viewer-release 2016-05-23 16:50:56 -07:00
callum_linden 09e68a4953 Additional set of changes to use vlc-bin package 2016-05-13 16:43:18 -07:00
callum_linden e11ab0240a Moving to a private repo 2016-05-06 17:43:47 -07:00
callum_linden 5a55ba8ce3 Remove references to quicktime from the plain old viewer-release build 2016-04-19 15:04:50 -07:00
Ansariel 2797c5938a Merge Firestorm LGPL 2016-04-05 10:47:23 +02:00
Oz Linden 9be58e915a merge with 4.0.3-release 2016-04-04 15:53:09 -04:00
Nicky a50faa943c Merge. 2016-04-01 12:59:37 +02:00
Ansariel 007cb590ba Merge Firestorm LGPL 2016-03-31 18:55:05 +02:00
Ansariel a818913ab3 Add support for AVX2 optimizations (available for Windows only so far) 2016-03-29 15:57:02 +02:00
Ansariel 59956afb12 Merge viewer-quickgraphics 2016-03-22 23:27:45 +01:00
Oz Linden 7bbf2ec9f8 correct exception thrown for unknown system 2016-03-22 16:35:47 -04:00
Ansariel 3192fe832f Merge viewer-quickgraphics 2016-03-08 01:41:31 +01:00
Nicky cb0017e821 Merge. 2016-02-29 14:23:07 +01:00
Nicky 5c73246c10 Only use indra/newview/VIEWER_VERSION.txt 2016-02-24 22:50:08 +01:00
Oz Linden 4fd57774dd OPEN-297 simplify build number generation 2016-02-07 14:58:47 -08:00
Oz Linden 867ef882fd merge changes for OPEN-292 2016-02-07 13:41:41 -08:00
Oz Linden b46627ffc4 add build configuration to the About box if it is not Release
remove some superfluous other information from About
2016-02-04 23:32:42 -05:00
Nicky f931ce3639 Merge with FS tip. 2016-01-25 14:58:39 +01:00
Tonya Souther b7d4686cb0 Automate not building media plugins on 64-bit OS X. 2016-01-20 16:16:50 -06:00
Tonya Souther b00369ced9 Use prebuilt SLPlugin on 64-bit OS X. 2016-01-19 21:33:59 -06:00
Nicky 6988580777 OpenJPEG 1.4 is default for now. 2016-01-17 13:13:05 +01:00