Virendra Singh
|
ed09b619d1
|
OS check
check OS for different filenames
|
2015-02-25 09:12:19 +05:30 |
|
Kodey
|
a5aeb3b980
|
cmake changes for building on linux
|
2015-02-25 08:45:00 +05:30 |
|
Stephen Birarda
|
d52ba5e958
|
call windeployqt after fixup_bundle for qt plugins
|
2015-02-24 13:20:17 -08:00 |
|
Stephen Birarda
|
71dd443ae2
|
also call fixup_bundle for release builds on win
|
2015-02-23 15:29:43 -08:00 |
|
Stephen Birarda
|
87ce55cc42
|
add new macro file for fixup libs
|
2015-02-23 13:24:53 -08:00 |
|
Stephen Birarda
|
8be707f63f
|
rename add paths macro for fixup_bundle
|
2015-02-23 13:24:21 -08:00 |
|
Stephen Birarda
|
bae5d987f9
|
add OpenSSL lib path to paths for fixup
|
2015-02-23 13:21:45 -08:00 |
|
Stephen Birarda
|
954a298dc4
|
correct QXmpp DLL path for windows
|
2015-02-23 13:04:12 -08:00 |
|
Stephen Birarda
|
2ad8ac866d
|
make correct version of bullet for windows
|
2015-02-23 12:50:53 -08:00 |
|
Stephen Birarda
|
b32fa0f33d
|
pass correct configuration to bullet install target
|
2015-02-23 12:27:30 -08:00 |
|
Stephen Birarda
|
88130feb11
|
force release build of bullet on win32
|
2015-02-23 12:19:54 -08:00 |
|
Stephen Birarda
|
8d97107acf
|
use ALL_BUILD for bullet msbuild
|
2015-02-23 12:12:36 -08:00 |
|
Stephen Birarda
|
9e1a890ff2
|
fix for msbuild target command
|
2015-02-23 12:09:00 -08:00 |
|
Stephen Birarda
|
ded0b1461b
|
help cmake find msbuild
|
2015-02-23 12:04:35 -08:00 |
|
Stephen Birarda
|
e60d91e4ce
|
fix for bullet debug or release build on windows
|
2015-02-23 12:00:19 -08:00 |
|
Stephen Birarda
|
5983a94c7f
|
force bullet cmake build to be RelWithDebInfo
|
2015-02-23 11:29:42 -08:00 |
|
Stephen Birarda
|
6803aa8d91
|
fix copy paste typos
|
2015-02-23 11:22:21 -08:00 |
|
Stephen Birarda
|
1372436e63
|
handle possibility that bullet builds debug libraries
|
2015-02-23 11:20:50 -08:00 |
|
Stephen Birarda
|
80da0a1702
|
use empty string for not present debug libraries
|
2015-02-23 11:11:35 -08:00 |
|
Stephen Birarda
|
353f7e2f96
|
set qxmpp debug library to empty string
|
2015-02-23 10:59:54 -08:00 |
|
Stephen Birarda
|
0990910ed2
|
add a missing period for apple qxmpp ext
|
2015-02-23 10:41:48 -08:00 |
|
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 |
|