Stephen Birarda
|
a85cb2eeaa
|
don't log glm install so it is shown in log
|
2015-02-20 12:18:14 -08:00 |
|
Stephen Birarda
|
b2e587dbbd
|
remove use of include_dependency_includes and use cmake
|
2015-02-18 14:12:05 -08:00 |
|
Stephen Birarda
|
68c19866c4
|
call dll copy after project deps are setup
|
2015-02-17 17:17:30 -08:00 |
|
Stephen Birarda
|
e99012efbb
|
updates to build guides to remove soxr
|
2015-02-17 10:33:12 -08:00 |
|
Stephen Birarda
|
8c998a65ee
|
use the glm find_package and check externals
|
2015-02-13 12:50:32 -08:00 |
|
Stephen Birarda
|
9136154cd5
|
fix double subdir include, clear up build guide
|
2015-02-13 10:48:27 -08:00 |
|
Stephen Birarda
|
df8e51f835
|
use external project glm in more targets
|
2015-02-13 10:21:21 -08:00 |
|
ZappoMan
|
27d8ccb51e
|
more voxelEctomy
|
2014-12-30 19:58:04 -08:00 |
|
Sam Gateau
|
4c670ac17a
|
merging with upstream master and origin temp0
|
2014-12-22 10:38:11 -08:00 |
|
Sam Gateau
|
967c6dbc4b
|
Add the Model library
|
2014-12-19 16:19:06 -08:00 |
|
Stephen Birarda
|
114e3bb2ff
|
rename cmake macro to represent actual purpose
|
2014-12-18 16:51:20 -08:00 |
|
Stephen Birarda
|
d38c78f2c3
|
remove bubbling of linked libraries, cmake does it
|
2014-12-18 09:34:04 -08:00 |
|
Andrew Meadows
|
4c3cdf5b7a
|
move stuff out of shared and into physics library
|
2014-10-28 13:51:45 -07:00 |
|
ZappoMan
|
4c85e9f581
|
removing particles
|
2014-10-13 14:10:57 -07:00 |
|
ZappoMan
|
32d5eb3cea
|
Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities
Conflicts:
assignment-client/CMakeLists.txt
interface/CMakeLists.txt
libraries/entities/CMakeLists.txt
libraries/models/src/ModelEditPacketSender.cpp
libraries/models/src/ModelEditPacketSender.h
libraries/models/src/ModelItem.cpp
libraries/models/src/ModelItem.h
libraries/octree/src/OctreeEditPacketSender.cpp
libraries/octree/src/OctreeEditPacketSender.h
libraries/octree/src/OctreePacketData.h
libraries/octree/src/OctreeQuery.cpp
libraries/particles/src/ParticleEditPacketSender.cpp
libraries/particles/src/ParticleEditPacketSender.h
libraries/script-engine/CMakeLists.txt
tests/octree/CMakeLists.txt
|
2014-08-18 15:16:35 -07:00 |
|
Stephen Birarda
|
b1310c065c
|
remove TARGET_NAME from cmake macros where it is not required
|
2014-08-08 13:17:54 -07:00 |
|
Stephen Birarda
|
26f7b1ba62
|
add macro to link shared dependencies to target
|
2014-08-08 13:17:54 -07:00 |
|
Stephen Birarda
|
1f0a722d0d
|
remove antequated windows libraries that have been replaced by Qt usage
|
2014-08-08 13:17:54 -07:00 |
|
Stephen Birarda
|
17df6484d4
|
remove ssize_t and replace with size_t or int where appropriate
|
2014-08-08 13:17:53 -07:00 |
|
Stephen Birarda
|
1a71d655b9
|
more cmake cleanup to remove ROOT_DIR passing
|
2014-08-08 13:17:53 -07:00 |
|
Stephen Birarda
|
87cf262b9e
|
get to successful cmake after library link macro changes
|
2014-08-08 13:17:53 -07:00 |
|
Stephen Birarda
|
107cbc3f87
|
more simplification of hifi macros to find libraries
|
2014-08-08 13:17:53 -07:00 |
|
Stephen Birarda
|
31488e72fe
|
repairs for interface build to succeed
|
2014-08-08 13:17:53 -07:00 |
|
Stephen Birarda
|
0378fb3049
|
break glm helpers out of SharedUtil
|
2014-08-08 13:17:53 -07:00 |
|
Stephen Birarda
|
892e30c5e1
|
get past assignment-client build after cmake auditing
|
2014-08-08 13:17:53 -07:00 |
|
Stephen Birarda
|
fa26957b23
|
more CMakeLists cleanup for sub-dependencies
|
2014-08-08 13:17:52 -07:00 |
|
Stephen Birarda
|
33e5826842
|
remove animation server, bubble up qt modules
|
2014-08-08 13:17:52 -07:00 |
|
ZappoMan
|
77e1867b11
|
Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities
Conflicts:
assignment-client/src/Agent.cpp
assignment-client/src/Agent.h
examples/editModels.js
interface/src/Application.h
|
2014-07-31 10:34:23 -07:00 |
|
Stephen Birarda
|
2796f71419
|
library cleanup to suppress warnings on cmake 3.0
|
2014-07-30 15:06:15 -07:00 |
|
ZappoMan
|
c4fe36b13d
|
more Models->Entities renaming
|
2014-06-26 17:01:07 -07:00 |
|
Stephen Birarda
|
a9c2e3fe71
|
put back ssize_t definition
|
2014-05-20 11:56:06 -07:00 |
|
Stephen Birarda
|
0e7615391c
|
don't look for GnuTLS from cmake
|
2014-05-20 10:35:04 -07:00 |
|
ZappoMan
|
106c8bffd8
|
first cut at animations in models
|
2014-05-09 16:08:06 -07:00 |
|
ZappoMan
|
aac42058ac
|
first cut at modelserver
|
2014-04-30 09:25:52 -07:00 |
|
Andrzej Kapolka
|
38c0e99cbe
|
More work on animation loading.
|
2014-04-14 18:12:32 -07:00 |
|
Stephen Birarda
|
54647f0f08
|
make sure gnutls define for ssize_t comes before gnutls include
|
2014-04-10 10:27:08 -07:00 |
|
Stephen Birarda
|
2518d314ac
|
add ssize_t definition for gnutls.h include on Windows
|
2014-04-10 10:19:45 -07:00 |
|
Stephen Birarda
|
16bb28a4fa
|
make GnuTLS a system include to suppress warnings
|
2014-04-10 10:04:02 -07:00 |
|
Stephen Birarda
|
58298984d3
|
link GnuTLS to the assignment-client, fix timeval in SharedUtil
|
2014-04-10 09:48:47 -07:00 |
|
Stephen Birarda
|
d5d52f804f
|
add a networking library and link from appropriate targets
|
2014-04-10 09:32:17 -07:00 |
|
Stephen Birarda
|
3d071e85d5
|
link GnuTLS to the assignment-client
|
2014-04-09 17:37:23 -07:00 |
|
ZappoMan
|
1ceb05bf09
|
click harder
|
2014-03-08 18:22:30 -08:00 |
|
Stephen Birarda
|
231dc624ff
|
replace deprecated qt5 macros in cmake with target_link_libraries
|
2014-03-04 12:41:24 -08:00 |
|
Stephen Birarda
|
628f91cd73
|
complete quoting of varous Cmake commands, closes #1999
|
2014-03-03 12:15:05 -08:00 |
|
Stephen Birarda
|
f4fe2bb754
|
move octree-server libs to assignment-client
|
2014-02-05 16:04:23 -08:00 |
|
Brad Hefta-Gaub
|
0c55447809
|
fix windows build
|
2014-01-20 09:26:49 -08:00 |
|
Stephen Birarda
|
6670ff6ee5
|
fix linking of webserver for octree-server
|
2014-01-17 14:27:24 -08:00 |
|
Stephen Birarda
|
5fdf310a45
|
hook OctreeServer up to embedded-webserver
|
2014-01-17 14:21:15 -08:00 |
|
Brad Hefta-Gaub
|
9441f9ffb7
|
fix link issues for many targets
|
2014-01-13 01:01:30 -08:00 |
|
Brad Hefta-Gaub
|
1358f68868
|
try to get this to work
|
2014-01-10 22:58:42 -08:00 |
|