Commit graph

229 commits

Author SHA1 Message Date
Stephen Birarda
b3e46d1ed8 some macro renaming and cleanup 2016-01-04 10:26:37 -08:00
Stephen Birarda
abea65fa84 resolve conflicts on merge with upstream/master 2015-12-29 17:54:45 -08:00
Brad Davis
243fba461d Add CMake flag for building only server components 2015-12-22 09:19:07 -08:00
Leonardo Murillo
a7b61cf791 Couple of fixes 2015-12-16 16:39:09 -06:00
Leonardo Murillo
66770cc907 Finishing touches 2015-12-16 16:11:35 -06:00
Leonardo Murillo
cbed8bf35a NSIS Changes 2015-12-16 15:12:14 -06:00
Leonardo Murillo
5ed422e3a1 Removing unwanted changes 2015-12-16 14:28:49 -06:00
Leonardo Murillo
711d02ba2f Consolidating installer checkpoint 2015-12-16 14:26:24 -06:00
Stephen Birarda
20886748af resolve conflicts on merge with upstream/master 2015-12-16 10:21:24 -08:00
samcake
93dbc92c61 Adding the correct selection of the winSDK based on the generator used 2015-12-11 10:59:36 -08:00
samcake
8497931cb4 Changing the path to the win sdk to x64 2015-12-11 10:29:14 -08:00
Leonardo Murillo
cc6d30fe6f Fix to path setting in shortcuts 2015-12-08 13:06:10 -08:00
Leonardo Murillo
eeebe06228 Using CPACK_PACKAGE_EXECUTABLES instead of CPACK_NSIS_CREATE_ICONS_EXTRE 2015-12-08 10:54:42 -08:00
Stephen Birarda
645a5319c3 remove the stack-manager 2015-12-03 14:06:51 -08:00
Stephen Birarda
fa4153d2e0 add a custom target to package up the console 2015-12-03 13:48:37 -08:00
Leonardo Murillo
c786789c4c Changes for SSL and icons 2015-12-02 12:43:25 -06:00
Leonardo Murillo
4e18640922 Some fixes 2015-11-30 10:07:11 -06:00
Leonardo Murillo
5822386702 Checkpoint 2015-11-30 08:56:30 -06:00
Leonardo Murillo
a37262465f Creating icons 2015-11-27 14:23:38 -06:00
Leonardo Murillo
766f0dbd32 Have stack manager use bundled stack 2015-11-27 14:04:33 -06:00
Leonardo Murillo
388157d432 Typo 2015-11-23 20:16:18 -06:00
Leonardo Murillo
c56a3b6d22 Checkpoint - turning quazip into external 2015-11-20 09:56:10 -06:00
Brad Davis
cfb2fd1523 Support for runtime plugins (DLLs) 2015-11-01 11:12:12 -08:00
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