Commit graph

19867 commits

Author SHA1 Message Date
Stephen Birarda
e8ea45efde clarify TBB find for windows 2014-12-15 13:59:51 -08:00
Stephen Birarda
4d8d6d602a simplify the FindTBB module for set envs 2014-12-15 13:56:21 -08:00
ZappoMan
dee8f69722 windows build hackery 2014-12-15 13:33:47 -08:00
ZappoMan
ea6d6e9f72 windows build hackery 2014-12-15 13:26:27 -08:00
ZappoMan
7b973453b4 move TextureCache to library 2014-12-15 13:14:16 -08:00
Stephen Birarda
bf5147cd91 fix qt modules to link in LinkSharedDependencies 2014-12-15 12:56:32 -08:00
ZappoMan
a92b65b0e9 now lets see if this works 2014-12-15 12:42:04 -08:00
ZappoMan
0b95403949 cleanup the windows hackery a little 2014-12-15 12:25:20 -08:00
ZappoMan
95d820ee8b more windows hackery 2014-12-15 12:16:01 -08:00
ZappoMan
4e7368b643 more windows hackery 2014-12-15 12:09:30 -08:00
ZappoMan
d6e7211650 Merge branch 'master' of https://github.com/highfidelity/hifi into InterfaceConfigEctomy 2014-12-15 12:02:58 -08:00
Clément Brisset
78a61cd48b Merge pull request #3966 from ZappoMan/untangling
Untangling - step toward librarization
2014-12-15 12:02:15 -08:00
Atlante45
68430e1346 Moved GLCanvas to DependencyManager 2014-12-15 11:54:33 -08:00
Stephen Birarda
fa8b7020b0 repairs to MetavoxelSystem after reset to upstream 2014-12-15 11:49:43 -08:00
ZappoMan
28f2dc62ea add windowshacks.h to GPUConfig.h and move it to shared 2014-12-15 11:49:01 -08:00
ZappoMan
94cf8b3384 reduce calls to DependencyManager::get<> where possible 2014-12-15 11:43:30 -08:00
ZappoMan
3bc1321549 reduce calls to DependencyManager::get<> where possible 2014-12-15 11:40:17 -08:00
Stephen Birarda
c18c45a401 bump glm dependency version 2014-12-15 11:30:17 -08:00
ZappoMan
90c1132dd5 reduce calls to DependencyManager::get<> where possible 2014-12-15 11:28:57 -08:00
Stephen Birarda
ea08d7bb23 remove block recommending VS2010 project file 2014-12-15 11:28:43 -08:00
Stephen Birarda
aac44953cb fix generator passed to cmake for windows build 2014-12-15 11:27:31 -08:00
Stephen Birarda
36f23fe4be fix Qt path in Generating build files 2014-12-15 11:26:06 -08:00
Stephen Birarda
ee91964300 clarify that TBB can be installed wherever 2014-12-15 11:25:17 -08:00
Stephen Birarda
9b37967bed changes to instructions for TBB, remove MSVC2010 2014-12-15 11:23:25 -08:00
Atlante45
25df784f43 Headers cleanup 2014-12-15 10:56:42 -08:00
ZappoMan
049cb25f07 make ModelBlender work with DependancyManager 2014-12-15 10:56:29 -08:00
ZappoMan
e0a017e963 make GeometryCache work with DependancyManager 2014-12-15 10:49:34 -08:00
ZappoMan
7d75d2d1bf make TextureCache work with DependancyManager 2014-12-15 10:34:16 -08:00
Stephen Birarda
bba48a61f9 cleanup formatting of build guides 2014-12-15 10:22:58 -08:00
Stephen Birarda
a87fb0fe5e link to OS build guides from main guide 2014-12-15 10:21:31 -08:00
Stephen Birarda
5ad4a57e3d add OS specific build files 2014-12-15 10:19:06 -08:00
ZappoMan
c6b033fa0e revert out the InterfaceConfig.h changes 2014-12-15 10:12:55 -08:00
ZappoMan
6b39783de7 revert out the InterfaceConfig.h changes 2014-12-15 10:12:04 -08:00
Stephen Birarda
d65f435e28 change Qt version referenced in build guide 2014-12-15 10:10:31 -08:00
Stephen Birarda
ce6334535b add info for TBB to Linux section 2014-12-15 10:08:48 -08:00
Stephen Birarda
a688f48bf7 indicate that user should run tbbvars for FindTBB 2014-12-15 10:02:01 -08:00
ZappoMan
7d1081473e remove _textureCache 2014-12-15 09:42:35 -08:00
Stephen Birarda
8549e9cb53 resolve conflicts on merge with upstream master 2014-12-15 09:36:17 -08:00
ZappoMan
ca39c79df4 unix compile 2014-12-15 08:50:36 -08:00
ZappoMan
3de3540ebe move back into interface for now 2014-12-15 08:37:33 -08:00
ZappoMan
4ac673fe63 more render util cleanup 2014-12-15 08:16:42 -08:00
ZappoMan
e9ea6b20ce use TextureCache::getInstance() instead of Application::getInstance()->getTextureCache() 2014-12-15 08:16:18 -08:00
ZappoMan
2df4c017f1 move GeometryCache out of application and remove dependency on Model 2014-12-15 08:15:55 -08:00
ZappoMan
e253b8afa4 move TextureCache out of interface and Application 2014-12-15 08:14:53 -08:00
Brad Hefta-Gaub
0b85a4cc49 Merge pull request #3965 from Atlante45/dependancy_manager
Dependancy manager
2014-12-15 08:12:04 -08:00
Atlante45
738f23f326 Moved visage and dde over to DependencyManager 2014-12-14 22:30:13 -08:00
Atlante45
65094f2165 Update headers 2014-12-14 21:47:08 -08:00
Atlante45
e40961df12 Checking that T is in fact derived from Dependency 2014-12-14 21:34:27 -08:00
Atlante45
1db3592d4c Switched meFaceshifto DependencyManager for Faceshift 2014-12-14 19:56:42 -08:00
Atlante45
39a19a297f Switched menu to DependencyManager for Faceshift 2014-12-14 16:31:03 -08:00