Commit graph

206 commits

Author SHA1 Message Date
Brad Hefta-Gaub
fb3bf16391 improvement to cmake to explicitly use local external dependency 2015-10-30 09:01:42 -07:00
Brad Hefta-Gaub
e12ddf86f6 add back optional externals 2015-10-30 08:33:29 -07:00
Brad Davis
fcfab0fc51 Moving SDL2, Sixense and Faceshift to external projects 2015-10-30 00:57:51 -07:00
Ken Cooke
4dc2c9a58f Create symbol files on Windows release builds. Added --release to windeployqt.exe, otherwise it gets confused and copies debug DLLs instead of release. 2015-09-29 18:42:52 -07:00
Brad Hefta-Gaub
8da52e2f17 Merge pull request #5906 from kencooke/audio-src
Algorithmic optimization of new resampler
2015-09-28 20:44:27 -07:00
Stephen Birarda
2976520061 remove an extra debug in root CMake 2015-09-28 14:53:53 -04:00
Stephen Birarda
386df86fd1 use the OS X version as the desired SDK 2015-09-28 14:52:17 -04:00
Stephen Birarda
3744632122 allow SDK fallback if 10.9 not present 2015-09-28 14:37:59 -04:00
Ken Cooke
4c12630458 Removed a stray reference to SOXR 2015-09-26 09:09:39 -07:00
Stephen Birarda
c6aeee7036 fix for OSX_SDK default string 2015-09-10 15:28:03 -07:00
Stephen Birarda
9a33a48ba5 clarify OSX_SDK option 2015-09-10 15:25:30 -07:00
Stephen Birarda
699a9566c3 add option to specify OS X SDK for Xcode 7 2015-09-10 15:00:01 -07:00
Seth Alves
0ac885da80 fix when memory debugging message is printed 2015-08-20 10:17:13 -07:00
Seth Alves
c25082d86f use -fsanitize=address in all code rather than just the top-level links 2015-08-20 10:14:16 -07:00
Brad Davis
aba7bebf6e Revert "Updating to the new version of the sixense library" 2015-08-19 09:44:51 -07:00
Brad Davis
eba446e7f6 Updating to the new version of the sixense library 2015-08-18 18:55:59 -07:00
Stephen Birarda
078e60076c don't set a default build type 2015-08-05 14:34:00 -07:00
Stephen Birarda
6c337b8aeb repairs for build type of glew external 2015-08-05 14:30:36 -07:00
Stephen Birarda
cc909507f4 get GLEW for all platforms as external project 2015-08-05 12:34:11 -07:00
Bradley Austin Davis
f19653f3e2 Integrate glew 2015-08-01 20:08:19 -07:00
Seiji Emery
7ba03418fc PR Fixes 2015-07-02 17:24:03 -07:00
Seiji Emery
d75f3b1398 Fixed test target dependencies (which were not getting added into the *-tests build targets) 2015-06-20 11:49:26 -07:00
Seth Alves
021dc64789 merge from upstream 2015-06-18 15:03:09 -07:00
Seth Alves
b8cf4ea29d use -Woverloaded-virtual with g++. quiet compiler warnings 2015-06-16 21:19:31 -07:00
Seth Alves
2a841cc0b8 clang doesn't know -Wdouble-promotion 2015-06-16 19:19:18 -07:00
Seth Alves
508ae276c6 enable -Wdouble-promotion 2015-06-16 18:23:10 -07:00
Brad Davis
1846ead27c Merge branch 'master' into vs2015 2015-06-10 10:11:58 -07:00
Brad Davis
8bad80324f Merge branch 'master' into plugins_pt3 2015-05-29 09:05:01 -07:00
Brad Davis
e5bc0fad1e Merge branch 'master' into plugins_pt3 2015-05-27 23:45:31 -07:00
Seth Alves
386b3301f4 Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-05-27 14:46:37 -07:00
David Rowe
a2272d3f42 Fix Windows C4351 build warning
VS2013 warns about default initialization of arrays because it behaved
differently in previous versions. Default initialization is what we expect
now that we're using VS2013 so we can disable this warning globally.
2015-05-27 11:49:00 -07:00
Brad Davis
09085f1cd9 Working towards display plugins 2015-05-26 18:42:38 -07:00
Seth Alves
4166c3224f link polyvox library in with entities 2015-05-19 16:24:13 -07:00
Ryan Huffman
0883bde1be Update compiler flags to produce warnings on non-gnu compilers 2015-05-01 11:29:23 -07:00
Brad Davis
a83616a7dc Don't prevent building on Visual Studio 2015 2015-04-30 10:32:19 -07:00
Seth Alves
0fb1a83e3b quiet compiler, remove some trailing control-Ms 2015-04-25 09:20:00 -07:00
Brad Davis
7a33474245 Merge remote-tracking branch 'upstream/master' into offscreen
Conflicts:
	interface/src/Menu.cpp
2015-04-21 13:02:38 -07:00
Stephen Birarda
03129f98d4 make VHACD an external project 2015-04-15 13:51:51 -07:00
Brad Davis
d14d5f3d29 Working on new-UI implementations of address bar and login 2015-04-15 00:36:04 -07:00
David Rowe
12f5b992c9 Add /LARGEADDRESSAWARE linker flag for Windows builds
Enables Interface to use more than 2GB of memory.
Reduces the incidence of bad_alloc crashes.
2015-04-08 20:01:01 -07:00
Bradley Austin Davis
db9ab3e699 Merge branch 'master' into oculus_old_renderer 2015-03-31 18:25:34 -07:00
Bradley Austin Davis
02b69f4a70 Enabling the use of #ifdef DEBUG as a platform neutral idiom 2015-03-31 13:32:13 -07:00
Bradley Austin Davis
1d56266044 Merge branch 'master' into oculus_old_renderer 2015-03-20 09:56:54 -07:00
Brad Davis
54f2774d2e Organize projects into folders for IDEs that support it 2015-03-19 15:45:11 -07:00
Brad Davis
fd29f72bfe Making nsight usage optional (still defaults to on) 2015-03-16 12:59:41 -07:00
Brad Davis
320cfa7c9e Merge remote-tracking branch 'upstream/master' into oculus_old_renderer 2015-03-09 14:54:09 -07:00
Andrew Meadows
e4c68bf31c committing some temp debug stuff to help git diff
(will remove this stuff later)
2015-03-05 18:06:08 -08:00
Brad Davis
c1c97fc8b6 Updating cmake files after merging from master 2015-03-04 23:32:27 -08:00
Stephen Birarda
e43da00537 remove xmpp chat support 2015-03-03 10:13:41 -08:00
Stephen Birarda
a7a9ede744 handle an SDK in Xcode beta 2015-02-25 13:53:57 -08:00