Virendra Singh
|
b3fdb19cad
|
Merge branch 'master' of https://github.com/highfidelity/hifi into 20305
Conflicts:
BUILD.md
BUILD_WIN.md
|
2015-02-26 22:16:35 +05:30 |
|
Stephen Birarda
|
f8627c8233
|
fix handling for vc12 externals
|
2015-02-25 17:48:26 -08:00 |
|
Stephen Birarda
|
1c2606c6db
|
fail out if windeployqt is not found
|
2015-02-25 13:12:37 -08:00 |
|
Stephen Birarda
|
33b0fd24a6
|
don't call copy dll step for scribe
|
2015-02-25 11:02:05 -08:00 |
|
Stephen Birarda
|
66ab2ba9f9
|
fix for flipped conditional for dll fixup
|
2015-02-25 10:44:02 -08:00 |
|
Stephen Birarda
|
fd8240669b
|
fix for windeployqt for executables
|
2015-02-25 10:39:44 -08:00 |
|
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 |
|
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 |
|