Stephen Birarda
|
6042ba6cf2
|
fix for qxmpp name on win and lib location
|
2015-02-23 10:36:20 -08:00 |
|
Stephen Birarda
|
16c557a9c7
|
copy over /tmp/hifi.dst dir for xcode qxmpp install
|
2015-02-23 10:32:06 -08:00 |
|
Stephen Birarda
|
2463292339
|
link SDL2 as a downloaded framework on OS X
|
2015-02-23 10:00:44 -08:00 |
|
Stephen Birarda
|
e71a8258d6
|
fix SDL2 framework link on OS X
|
2015-02-23 09:52:35 -08:00 |
|
Stephen Birarda
|
82a798ef15
|
use SDL2 framework on OS X
|
2015-02-23 09:47:35 -08:00 |
|
Stephen Birarda
|
437d5c7bdf
|
repairs to include locations for QXmpp and SDL2
|
2015-02-23 09:26:35 -08:00 |
|
Brad Davis
|
1cd4dc4746
|
Adding win32 libs, need to fix for cross platform
|
2015-02-23 09:15:18 -08:00 |
|
Stephen Birarda
|
c3d98b1289
|
use nmake for install of QXmpp on windows
|
2015-02-23 09:11:52 -08:00 |
|
Stephen Birarda
|
1b8d421fb3
|
add a fatal error if nmake not found
|
2015-02-23 09:06:39 -08:00 |
|
Stephen Birarda
|
1c707059c5
|
fix for quoted PLATFORM_BUILD_COMMAND for QXmpp
|
2015-02-23 08:46:16 -08:00 |
|
Stephen Birarda
|
28bcc0a952
|
use nmake on win for QXmpp build
|
2015-02-23 08:43:18 -08:00 |
|
Stephen Birarda
|
d08f7d6255
|
check if QXmpp is dynamic or static
|
2015-02-23 08:24:52 -08:00 |
|
Virendra Singh
|
b9befc208b
|
Cmake module to find VHACD library
FindVHACD will look for VHACD_ROOT_DIR env variable or
HIFI_LIB_DIR/vhacd folder
|
2015-02-21 15:38:16 +05:30 |
|
Stephen Birarda
|
c64f172311
|
add qxmpp as external project
|
2015-02-20 16:06:37 -08:00 |
|
Stephen Birarda
|
fd8e9bad20
|
fix casing in find modules for gverb and soxr
|
2015-02-20 15:36:59 -08:00 |
|
Stephen Birarda
|
dc9c4ea43c
|
add options with default for get of external projects
|
2015-02-20 15:34:41 -08:00 |
|
Stephen Birarda
|
bc0bd462cb
|
add an external project for SDL 2
|
2015-02-20 15:26:16 -08:00 |
|
Stephen Birarda
|
b23dd28b56
|
don't use static version of GLEW
|
2015-02-20 14:01:01 -08:00 |
|
Stephen Birarda
|
c242b4e834
|
set GLEW debug version to NOTFOUND
|
2015-02-20 13:55:40 -08:00 |
|
Stephen Birarda
|
ef729201d6
|
fix external name for GLEW
|
2015-02-20 13:51:12 -08:00 |
|
Stephen Birarda
|
5e264f8241
|
add GLEW as dependency external project
|
2015-02-20 13:47:38 -08:00 |
|
Stephen Birarda
|
32fa2e8d31
|
add missing docstring to AddPathsToLibPaths
|
2015-02-20 12:24:17 -08:00 |
|
Stephen Birarda
|
b7cc163ca4
|
lib paths is actually a string
|
2015-02-20 12:21:10 -08:00 |
|
Stephen Birarda
|
a85cb2eeaa
|
don't log glm install so it is shown in log
|
2015-02-20 12:18:14 -08:00 |
|
Stephen Birarda
|
0bad8db1a0
|
fix missing dependencies to external projects
|
2015-02-20 12:17:58 -08:00 |
|
Stephen Birarda
|
abfebf51f5
|
handle install name change on OS X for TBB
|
2015-02-20 12:17:42 -08:00 |
|
Brad Davis
|
16feaceab5
|
Working on oculus build
|
2015-02-20 09:32:25 -08:00 |
|
Stephen Birarda
|
12f03c5606
|
set install name dir for bullet on OS X
|
2015-02-19 17:39:30 -08:00 |
|
Stephen Birarda
|
b7c03c34a8
|
use path and filepath where appropriate for cache
|
2015-02-19 16:39:05 -08:00 |
|
Stephen Birarda
|
dab524fb0f
|
remove zlib modules and mentions in build guides
|
2015-02-19 15:35:40 -08:00 |
|
Stephen Birarda
|
63d4538b76
|
fix ZLIB dll find, bullet check
|
2015-02-19 15:22:37 -08:00 |
|
Stephen Birarda
|
c3b9198ec3
|
cleanup handling of external projects if OS not handled
|
2015-02-19 15:19:52 -08:00 |
|
Stephen Birarda
|
a3d370f01f
|
more path shortening for build of external projects
|
2015-02-19 14:33:31 -08:00 |
|
Stephen Birarda
|
a0a4882ed6
|
shorten externals binary dir path
|
2015-02-19 14:18:05 -08:00 |
|
Stephen Birarda
|
d47a114f23
|
actually remove BUILD_SHARED_LIBS from combo command
|
2015-02-19 13:57:31 -08:00 |
|
Stephen Birarda
|
01c92ba94d
|
don't attempt to build shared bullet libs on windows
|
2015-02-19 13:53:48 -08:00 |
|
Stephen Birarda
|
721be462f5
|
attempt to handle windows in bullet external project
|
2015-02-19 13:40:17 -08:00 |
|
Stephen Birarda
|
cbc6ae98d8
|
groundwork for windows support in bullet external project
|
2015-02-19 13:22:33 -08:00 |
|
Stephen Birarda
|
d185c775a4
|
fix install step for OS X bullet
|
2015-02-19 13:17:39 -08:00 |
|
Stephen Birarda
|
2cdb8edbbf
|
fix casing for libBulletSoftBody
|
2015-02-19 12:44:49 -08:00 |
|
Stephen Birarda
|
71b273ceec
|
fix order for found result in bullet find module
|
2015-02-19 12:42:28 -08:00 |
|
Stephen Birarda
|
03809131a4
|
log install to be able to confirm installed files
|
2015-02-19 12:39:48 -08:00 |
|
Stephen Birarda
|
d563c80ca0
|
handle bullet external project on unix/android
|
2015-02-19 12:12:41 -08:00 |
|
Stephen Birarda
|
70a89680f5
|
fix bullet include to match previous format
|
2015-02-19 12:04:41 -08:00 |
|
Stephen Birarda
|
6f055ca0d7
|
add an external project to handle bullet
|
2015-02-19 12:01:40 -08:00 |
|
Stephen Birarda
|
27c6f80a61
|
use md5 hash to verify downloaded externals
|
2015-02-19 09:33:22 -08:00 |
|
Stephen Birarda
|
7ec01c9095
|
handle android build of tbb, don't prefix win with lib
|
2015-02-18 17:20:13 -08:00 |
|
Sam Gateau
|
b78106400e
|
Merge branch 'master' of https://github.com/highfidelity/hifi into temp0
|
2015-02-18 16:52:41 -08:00 |
|
Stephen Birarda
|
31b136f807
|
resolve conflicts on merge with upstream/master
|
2015-02-18 16:19:15 -08:00 |
|
Stephen Birarda
|
5a3ef34d1e
|
use http link for gverb in case no git available
|
2015-02-18 16:14:51 -08:00 |
|
Stephen Birarda
|
75b193d784
|
mirror tbb in HF S3 for http link
|
2015-02-18 16:03:12 -08:00 |
|
Sam Gateau
|
6070bf8a37
|
Merge branch 'master' of https://github.com/highfidelity/hifi into temp0
|
2015-02-18 16:02:18 -08:00 |
|
Stephen Birarda
|
e665a1b4bb
|
use https for tbb urls since it will redirect
|
2015-02-18 15:47:33 -08:00 |
|
Stephen Birarda
|
b3b292a45f
|
handle linux binary find for tbb external project
|
2015-02-18 15:40:14 -08:00 |
|
Stephen Birarda
|
b6d660fdd3
|
setup TBB external project for windows
|
2015-02-18 15:26:33 -08:00 |
|
Stephen Birarda
|
b2e587dbbd
|
remove use of include_dependency_includes and use cmake
|
2015-02-18 14:12:05 -08:00 |
|
Stephen Birarda
|
973a076f34
|
use default prefix for external project
|
2015-02-18 13:54:39 -08:00 |
|
Stephen Birarda
|
60fc4d2c1c
|
attempt to handle android via tbb binaries
|
2015-02-18 13:54:30 -08:00 |
|
Stephen Birarda
|
0a01a6f566
|
add TBB as external_project, handle on OS X
|
2015-02-18 13:24:59 -08:00 |
|
Stephen Birarda
|
84e82f045d
|
find QT_DIR in root CMakeLists
|
2015-02-18 11:38:08 -08:00 |
|
Stephen Birarda
|
48d2684209
|
add path to DeviceDLL for sixense
|
2015-02-17 17:51:54 -08:00 |
|
Stephen Birarda
|
9d7212cdae
|
remove some debug in AddPathsToLibPaths
|
2015-02-17 17:18:24 -08:00 |
|
Stephen Birarda
|
68c19866c4
|
call dll copy after project deps are setup
|
2015-02-17 17:17:30 -08:00 |
|
Stephen Birarda
|
5b563e3bc5
|
add LIB_PATHS debugging to catch destruction
|
2015-02-17 17:12:14 -08:00 |
|
Stephen Birarda
|
0ff382e68a
|
correct typo in sixense dll path
|
2015-02-17 16:54:59 -08:00 |
|
Stephen Birarda
|
d8bf8e322b
|
fix a docstring in glm external project
|
2015-02-17 16:42:24 -08:00 |
|
Stephen Birarda
|
df72594afe
|
fix for docstring of external projects
|
2015-02-17 16:41:16 -08:00 |
|
Stephen Birarda
|
315ab73900
|
fix a typo on temporary list
|
2015-02-17 16:32:52 -08:00 |
|
Stephen Birarda
|
bc9481051b
|
use configure_file to pass lib_paths to fixup_bundle
|
2015-02-17 16:30:39 -08:00 |
|
Stephen Birarda
|
73891b61b0
|
use separate arugments to get colon separated list of paths
|
2015-02-17 16:18:35 -08:00 |
|
Stephen Birarda
|
7920f7afa3
|
spell things correctly so cmake knows what you want
|
2015-02-17 16:13:53 -08:00 |
|
Stephen Birarda
|
1a0a4d0e20
|
use seperate_arguments to allow cmake path escape
|
2015-02-17 16:05:32 -08:00 |
|
Stephen Birarda
|
b14110f596
|
ensure fixup bundle post build step called with list
|
2015-02-17 16:01:41 -08:00 |
|
Stephen Birarda
|
c3b71196c7
|
add debug to catch LIB_PATHS override
|
2015-02-17 15:58:08 -08:00 |
|
Stephen Birarda
|
d0d4eaec86
|
fix AddPathsToLibPaths foreach, soxr requirements
|
2015-02-17 15:44:03 -08:00 |
|
Stephen Birarda
|
10cdbc4fa0
|
fix dynamic requirements in find modules
|
2015-02-17 15:33:26 -08:00 |
|
Stephen Birarda
|
ecbbb481d0
|
ensure dll path is found for sdl2
|
2015-02-17 15:27:12 -08:00 |
|
Stephen Birarda
|
e582709185
|
ensure leapmotion dll path is found
|
2015-02-17 15:22:22 -08:00 |
|
Stephen Birarda
|
bc0ddd8c1c
|
rename AddPathToLibPaths file so it is findable
|
2015-02-17 15:19:57 -08:00 |
|
Stephen Birarda
|
b727c910d1
|
handle multiple dll paths, add sixense
|
2015-02-17 15:19:17 -08:00 |
|
Stephen Birarda
|
e7b4746c16
|
add TBB dll path to lib paths
|
2015-02-17 15:12:13 -08:00 |
|
Stephen Birarda
|
c233dc7b57
|
get sdl2 dll path for win32 fixup_bundle
|
2015-02-17 15:08:41 -08:00 |
|
Stephen Birarda
|
b682cd03f3
|
cleanup leap dll path for win
|
2015-02-17 15:08:30 -08:00 |
|
Stephen Birarda
|
34cf7bb1f1
|
add leap motion dll path for fixup_bundle
|
2015-02-17 15:04:57 -08:00 |
|
Stephen Birarda
|
18f293b59b
|
disable bundle fixup on Release build
|
2015-02-17 14:53:22 -08:00 |
|
Stephen Birarda
|
97fa1412e2
|
copy dlls beside windows executable for all executables
|
2015-02-17 14:45:26 -08:00 |
|
Stephen Birarda
|
801ab0e2b9
|
windows unhelpfully puts soxr dll in bin, not lib
|
2015-02-17 14:30:20 -08:00 |
|
Stephen Birarda
|
07e3064cc4
|
add an output message to verify LIB_PATHS
|
2015-02-17 14:18:10 -08:00 |
|
Stephen Birarda
|
767601de4f
|
use a cache variable to pass around lib paths
|
2015-02-17 14:09:26 -08:00 |
|
Stephen Birarda
|
250b25154c
|
test for recursive dll dir search
|
2015-02-17 13:41:37 -08:00 |
|
Stephen Birarda
|
bc899eaa58
|
add fixup_bundle step for WIN32 interface
|
2015-02-17 13:17:23 -08:00 |
|
Stephen Birarda
|
016ef2b243
|
fix name of soxr lib for windows
|
2015-02-17 12:36:26 -08:00 |
|
Stephen Birarda
|
66756308a4
|
force soxr to be shared lib, use new zip
|
2015-02-17 12:21:19 -08:00 |
|
Stephen Birarda
|
26b4340417
|
change soxr source to friendly zip
|
2015-02-17 12:07:57 -08:00 |
|
Stephen Birarda
|
c7befe8018
|
build the dynamic soxr to reduce manual linking
|
2015-02-17 11:56:33 -08:00 |
|
Stephen Birarda
|
a5bd9be510
|
put externals in build-externals to avoid clean build removal
|
2015-02-17 11:00:23 -08:00 |
|
Stephen Birarda
|
c53465e550
|
fix archive type for soxr external project
|
2015-02-17 10:52:31 -08:00 |
|
Stephen Birarda
|
c82f5b7c0d
|
use hifi-public as host for libsoxr
|
2015-02-17 10:50:43 -08:00 |
|
Stephen Birarda
|
2d1ad4977f
|
handle soxr build for android
|
2015-02-17 10:46:19 -08:00 |
|
Stephen Birarda
|
e99012efbb
|
updates to build guides to remove soxr
|
2015-02-17 10:33:12 -08:00 |
|
Stephen Birarda
|
d299f015d1
|
use binary dir for externals as well
|
2015-02-17 09:46:39 -08:00 |
|
Stephen Birarda
|
feaad37751
|
add a GET_PROJ_NAME var to skip external projects
|
2015-02-16 09:38:53 -08:00 |
|
Stephen Birarda
|
a1bf06f004
|
can't use find module for external proj
|
2015-02-16 09:10:18 -08:00 |
|
Stephen Birarda
|
9683ed92e3
|
use proper lib path on WIN32 for gverb
|
2015-02-13 16:40:48 -08:00 |
|
Stephen Birarda
|
018b8497bd
|
use non-redirecting glm link to avoid https error
|
2015-02-13 16:21:19 -08:00 |
|
Stephen Birarda
|
28fabcb788
|
avoid ubuntu libssl error by using http links
|
2015-02-13 16:17:45 -08:00 |
|
Stephen Birarda
|
48e7aa7433
|
handle android build of gverb for external project
|
2015-02-13 16:06:30 -08:00 |
|
Stephen Birarda
|
4300836810
|
make gverb a cmake external project
|
2015-02-13 15:47:35 -08:00 |
|
Stephen Birarda
|
6e63c1c1ad
|
set the GLM_INCLUDE_DIRS var in cache so find hits it
|
2015-02-13 14:50:12 -08:00 |
|
Stephen Birarda
|
8c998a65ee
|
use the glm find_package and check externals
|
2015-02-13 12:50:32 -08:00 |
|
Stephen Birarda
|
50c9bb2ae5
|
remove glm as manual dep in BUILD guides
|
2015-02-13 12:33:29 -08:00 |
|
Stephen Birarda
|
9136154cd5
|
fix double subdir include, clear up build guide
|
2015-02-13 10:48:27 -08:00 |
|
Stephen Birarda
|
2f875cc08e
|
remove the glm find module
|
2015-02-13 10:38:13 -08:00 |
|
Stephen Birarda
|
df8e51f835
|
use external project glm in more targets
|
2015-02-13 10:21:21 -08:00 |
|
Stephen Birarda
|
2c7e225ef7
|
use cmake ExternalProject for glm in Interface
|
2015-02-13 10:14:47 -08:00 |
|
Sam Gateau
|
e2e61c64b1
|
Support include path to shaders from the hifi libraries to cmake
|
2015-02-13 01:30:04 -08:00 |
|
Brad Hefta-Gaub
|
6378009992
|
Merge pull request #4249 from birarda/master
don't force requirement of both debug and release versions of bullet
|
2015-02-08 12:52:41 -08:00 |
|
Stephen Birarda
|
adbf6de3e6
|
actually append found libraries to BULLET_LIBRARIES
|
2015-02-06 17:02:36 -08:00 |
|
Stephen Birarda
|
6c2710354a
|
remove an extra cmake debug line
|
2015-02-06 16:36:15 -08:00 |
|
Stephen Birarda
|
f0f7bca5db
|
don't force requirement of BOTH debug/release Bullet
|
2015-02-06 16:35:25 -08:00 |
|
Stephen Birarda
|
d68b0958a7
|
resolve conflicts on merge with upstream/master
|
2015-02-06 14:09:20 -08:00 |
|
Stephen Birarda
|
c8fb891158
|
move fonts to sdff files, load with qrc
|
2015-02-06 11:48:55 -08:00 |
|
Stephen Birarda
|
951617d40a
|
get PlatformActivity menu working in GVR
|
2015-02-02 17:01:04 -08:00 |
|
Stephen Birarda
|
30a9f6159b
|
add required files for ndk-gdb
|
2015-02-02 11:01:35 -08:00 |
|
Stephen Birarda
|
dd4f4f0993
|
repairs for hifi scheme handling on android
|
2015-01-29 13:03:39 -08:00 |
|
Stephen Birarda
|
763994da5a
|
handle gverb move to audio-client
|
2015-01-29 12:44:03 -08:00 |
|
Stephen Birarda
|
d13e3c20c8
|
force GLM to not be found in path
|
2015-01-28 15:32:59 -08:00 |
|
Stephen Birarda
|
ad0ae76b00
|
use shared soxr to avoid openmp link
|
2015-01-28 14:59:23 -08:00 |
|
Stephen Birarda
|
c06ba0307e
|
make sure we grab openmp for soxr on Android
|
2015-01-28 14:46:01 -08:00 |
|
Stephen Birarda
|
ce1e96e034
|
fix version find for 1.0.2 in OpenSSL
|
2015-01-28 13:48:28 -08:00 |
|
Stephen Birarda
|
42d064a613
|
add a comment to push build count
|
2015-01-28 10:29:12 -08:00 |
|
Stephen Birarda
|
0c1babe6f9
|
allow APK rename, fix hockey app update
|
2015-01-28 10:25:11 -08:00 |
|
Stephen Birarda
|
3a69e394b6
|
use the git commit count for version code
|
2015-01-28 10:04:27 -08:00 |
|
Stephen Birarda
|
161b49a819
|
don't install the HockeyApp build
|
2015-01-27 18:03:27 -08:00 |
|
Stephen Birarda
|
4c338a9950
|
handle possibility of HockeyApp inclusion
|
2015-01-27 17:08:57 -08:00 |
|
Stephen Birarda
|
d420674edd
|
apply orientation change to listening position for audio
|
2015-01-27 14:50:02 -08:00 |
|
Stephen Birarda
|
893ad0caa7
|
hack for vr mode, output sensor readings when docked
|
2015-01-27 14:23:40 -08:00 |
|
Stephen Birarda
|
c0b61e4c38
|
register GVR receivers with QtActivity
|
2015-01-27 11:38:38 -08:00 |
|
Stephen Birarda
|
43e907ec83
|
get QtActivity notifications about GVR changes
|
2015-01-27 11:37:07 -08:00 |
|
Stephen Birarda
|
976c3b633b
|
remove extra library links for android LibOVR
|
2015-01-26 13:26:26 -08:00 |
|
Stephen Birarda
|
4679f7f858
|
cleanup linking of oculus mobile sdk
|
2015-01-26 13:26:08 -08:00 |
|
Stephen Birarda
|
c269ee6b94
|
include ovr mobile sdk and test it
|
2015-01-26 11:32:24 -08:00 |
|
Stephen Birarda
|
a3b92e05da
|
support 44.1 for the note 4
|
2015-01-23 11:48:23 -08:00 |
|
Stephen Birarda
|
86c0cbe4a8
|
fix comment in Android manifest, move to Address
|
2015-01-23 10:24:28 -08:00 |
|
Stephen Birarda
|
102f076412
|
look for soxr and not redundant libsoxr
|
2015-01-22 14:09:29 -08:00 |
|
Stephen Birarda
|
c82ac27104
|
fix a typo in RtMidi find module
|
2015-01-22 14:06:53 -08:00 |
|
Stephen Birarda
|
aa6e1607e2
|
add libsoxr for audio resampling
|
2015-01-22 14:06:05 -08:00 |
|
Stephen Birarda
|
21ecaafea9
|
don't force system include of GLM
|
2015-01-22 11:38:34 -08:00 |
|
Stephen Birarda
|
3d12ed95da
|
fix for cmake variable interpolation warning
|
2015-01-22 11:22:37 -08:00 |
|
Stephen Birarda
|
b25a2a1918
|
temporary removal of VRLib requirement
|
2015-01-22 10:23:07 -08:00 |
|
Stephen Birarda
|
5716f576b7
|
output archive to current binary dir
|
2015-01-21 13:30:28 -08:00 |
|
Stephen Birarda
|
e7ba900cda
|
add debug for dependency links
|
2015-01-21 13:29:04 -08:00 |
|
Stephen Birarda
|
eebb21656e
|
fix so Gverb is found on android
|
2015-01-21 13:20:21 -08:00 |
|
Stephen Birarda
|
3ea699d31b
|
remove user CMakeLists, fix path in FindGverb
|
2015-01-21 13:00:15 -08:00 |
|
Stephen Birarda
|
246ee41cf3
|
fix deps of linked target, create QMainWindow
|
2015-01-20 11:37:20 -08:00 |
|
Stephen Birarda
|
60bdd206eb
|
Merge branch 'master' of https://github.com/highfidelity/hifi into android
|
2015-01-19 12:35:22 -08:00 |
|
Brad Hefta-Gaub
|
699964ebb9
|
Merge pull request #4111 from AndrewMeadows/bispinor
require Bullet
|
2015-01-19 12:30:14 -08:00 |
|
Stephen Birarda
|
671734ba44
|
fix TBB find module for android build
|
2015-01-19 12:01:24 -08:00 |
|
Andrew Meadows
|
fd9b56fe49
|
add lib/Release and lib/Debug to lib PATH_SUFFIXES
|
2015-01-19 10:41:45 -08:00 |
|
Stephen Birarda
|
10be0ee984
|
resolve conflicts on merge with upstream master
|
2015-01-19 10:26:56 -08:00 |
|
Andrew Meadows
|
614a7eb0b5
|
fix for entities rendering as black on linux
|
2015-01-16 16:49:11 -08:00 |
|
Andrew Meadows
|
117ed9206c
|
add ${BULLET_SEARCH_DIRS}/include,
remove PATH_SUFFIXES include/bullet
|
2015-01-16 16:19:47 -08:00 |
|
Andrew Meadows
|
d5119b3532
|
merge upstream/master into andrew/bispinor
Conflicts:
libraries/entities/src/EntityItem.cpp
libraries/physics/src/EntityMotionState.h
libraries/physics/src/ObjectMotionState.cpp
libraries/physics/src/PhysicsEngine.cpp
libraries/physics/src/PhysicsEngine.h
|
2015-01-16 14:36:27 -08:00 |
|
Andrew Meadows
|
0a04dc8445
|
modify PATH_SUFFIXES when hunting for include dir
|
2015-01-16 13:38:11 -08:00 |
|
Andrew Meadows
|
e5eccbc791
|
add back BULLET_ROOT_DIR hint
|
2015-01-16 13:25:43 -08:00 |
|
Andrew Meadows
|
a293c61c05
|
use hifi_library_search_hints() macro
|
2015-01-16 13:20:58 -08:00 |
|
Andrew Meadows
|
54a6a0a27c
|
use custom config when hunting for bullet include
|
2015-01-16 12:50:50 -08:00 |
|
Andrew Meadows
|
ba31309206
|
also find debug Bullet libs
|
2015-01-16 08:57:35 -08:00 |
|
Andrew Meadows
|
6836f23574
|
add custom FindBullet.cmake module
|
2015-01-15 14:53:55 -08:00 |
|
Andrew Meadows
|
2177a1701a
|
more correct cmake config for Bullet
(copying pattern from IncludeGLM.cmake)
|
2015-01-15 11:38:38 -08:00 |
|
Andrew Meadows
|
51cc9d6d9a
|
alt method for repressing unused var warnings
|
2015-01-15 10:46:09 -08:00 |
|
Andrew Meadows
|
ff171a5782
|
Bullet is now required dependency
|
2015-01-15 10:27:43 -08:00 |
|
Thijs Wenker
|
80a81043ed
|
Merge branch 'master' of https://github.com/highfidelity/hifi into 20216
Conflicts:
interface/src/Menu.cpp
|
2015-01-15 02:28:31 +01:00 |
|
Stephen Birarda
|
d30490c760
|
resolve conflicts on merge with upstream master
|
2015-01-12 09:25:37 -08:00 |
|
Thijs Wenker
|
21d8d55be3
|
fix indentation
|
2015-01-07 22:53:44 +01:00 |
|
Thijs Wenker
|
2690241eb6
|
fix to add GLEW debug library
|
2015-01-07 22:08:01 +01:00 |
|
Stephen Birarda
|
35a69ce049
|
remove the faceplus find module
|
2015-01-07 09:48:12 -08:00 |
|
Brad Hefta-Gaub
|
43e6ba77fa
|
Merge pull request #4007 from AndrewMeadows/inertia
Bullet physics part 1
|
2014-12-31 10:33:00 -08:00 |
|
Andrew Meadows
|
adf778fba2
|
Merge pull request #4013 from Atlante45/cmake_fix
Fix for new version of cmake
|
2014-12-30 15:10:14 -08:00 |
|
Atlante45
|
729034dd94
|
Removed unnecessary list(LENGTH ...)
|
2014-12-30 11:13:00 -08:00 |
|
Atlante45
|
4586afc6c5
|
Fix for new version of cmake
|
2014-12-29 17:23:54 -08:00 |
|
Andrew Meadows
|
9b7e50858a
|
merge upstream/master into andrew/inertia
Conflicts:
libraries/avatars/CMakeLists.txt
libraries/entities/CMakeLists.txt
|
2014-12-29 09:15:49 -08:00 |
|
Sam Gateau
|
acad86edf5
|
clean cmake file for autoScribeShader
|
2014-12-25 22:41:14 -08:00 |
|
Sam Gateau
|
c5eb04336f
|
first version of SCribe used for shaders in render-utils
|
2014-12-23 16:27:02 -08:00 |
|
Sam Gateau
|
03d8922d59
|
fix typo
|
2014-12-23 15:47:39 -08:00 |
|
Sam Gateau
|
3cfe066bcb
|
Add the autoScribeShader cmake
|
2014-12-23 15:42:14 -08:00 |
|
Stephen Birarda
|
715b3a245e
|
remove GLUT from Cmake files
|
2014-12-19 10:53:36 -08:00 |
|
Thijs Wenker
|
e913095af5
|
Merge branch 'master' of https://github.com/worklist/hifi into 20216
Conflicts:
interface/CMakeLists.txt
|
2014-12-19 13:53:33 +01:00 |
|
Andrew Meadows
|
25b00977be
|
fix cmake config for bullet after c++-11 changes
|
2014-12-18 17:34:39 -08:00 |
|
Stephen Birarda
|
114e3bb2ff
|
rename cmake macro to represent actual purpose
|
2014-12-18 16:51:20 -08:00 |
|
Andrew Meadows
|
11f01e1859
|
merge upstream/master into andrew/inertia
|
2014-12-18 15:01:08 -08:00 |
|
Stephen Birarda
|
d38c78f2c3
|
remove bubbling of linked libraries, cmake does it
|
2014-12-18 09:34:04 -08:00 |
|
Stephen Birarda
|
adf51bfeb8
|
temp disable visage to get to C++11 support
|
2014-12-17 16:41:28 -08:00 |
|
Stephen Birarda
|
33d50c6eb6
|
fix dependency qt module linking in LinkSharedDependencies
|
2014-12-17 10:26:51 -08:00 |
|
Stephen Birarda
|
4216806967
|
remove extra debugging in LinkSharedDependencies
|
2014-12-17 10:21:53 -08:00 |
|
Stephen Birarda
|
2ee33cef9f
|
have targets bubble up their Qt modules
|
2014-12-17 10:21:27 -08:00 |
|
Stephen Birarda
|
f63aa44d01
|
add lib to lib dirs for win and linux
|
2014-12-15 14:02:55 -08:00 |
|
Stephen Birarda
|
4d8d6d602a
|
simplify the FindTBB module for set envs
|
2014-12-15 13:56:21 -08:00 |
|
Stephen Birarda
|
bf5147cd91
|
fix qt modules to link in LinkSharedDependencies
|
2014-12-15 12:56:32 -08:00 |
|
Thijs Wenker
|
3f26e1b63a
|
RealSense Initial
|
2014-12-13 23:04:19 +01:00 |
|