Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-17 20:16:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
26627 commits 74 branches 59 tags 1.2 GiB
Commit graph

641 commits

Author SHA1 Message Date
Bradley Austin Davis
db9ab3e699 Merge branch 'master' into oculus_old_renderer 2015-03-31 18:25:34 -07:00
Bradley Austin Davis
a7eebfd002 Merge remote-tracking branch 'upstream/master' into oculus_old_renderer 2015-03-31 15:42:01 -07:00
Bradley Austin Davis
c4c6cf82a2 Working on migration to SDK 0.5.0.1 2015-03-31 13:27:11 -07:00
Stephen Birarda
f0c4aef932 download and make tbb for OS X 2015-03-30 17:26:33 -07:00
Stephen Birarda
a308eb2e2f don't use DX11 for bullet even if found 2015-03-30 16:44:10 -07:00
Bradley Austin Davis
5e5bdec88d Merge branch 'master' into oculus_old_renderer 2015-03-30 16:36:00 -07:00
Stephen Birarda
eea4c56547 use TBB release libraries for apple external project 2015-03-26 14:03:25 -07:00
Stephen Birarda
faa47da57e update version of TBB external project 2015-03-24 11:49:33 -07:00
Bradley Austin Davis
1d56266044 Merge branch 'master' into oculus_old_renderer 2015-03-20 09:56:54 -07:00
Brad Davis
54f2774d2e Organize projects into folders for IDEs that support it 2015-03-19 15:45:11 -07:00
Brad Davis
7e50d6359e Merge remote-tracking branch 'upstream/master' into oculus_old_renderer 2015-03-12 22:54:44 -07:00
Stephen Birarda
d3bc540919 use glm from hifi S3 now that fedora is down 2015-03-11 16:42:29 -07:00
Brad Davis
961173ede6 Merge remote-tracking branch 'upstream/master' into oculus_old_renderer 2015-03-10 19:45:25 -07:00
Stephen Birarda
76f3378223 don't pass no-libraries option to windeployqt 2015-03-10 18:05:10 -07:00
Brad Davis
c512c5f2e9 LibOVR: Really fixing the Win32 build this time 2015-03-09 19:26:32 -07:00
Brad Davis
adb6a6ee54 Hopefully fixing win32 build 2015-03-09 17:27:10 -07:00
Brad Davis
2fdb92fc45 Fixing ubuntu build of libovr 2015-03-09 17:07:54 -07:00
Brad Davis
1e65324a7b Updating cmake config to build from pre-compiled Oculus SDK distribution 2015-03-09 14:46:43 -07:00
Brad Davis
e3d48dbb8f Working on Xcode build 2015-03-06 12:53:10 -08:00
Brad Davis
c1c97fc8b6 Updating cmake files after merging from master 2015-03-04 23:32:27 -08:00
Brad Davis
d838b78df9 Merging from upstream 2015-03-04 21:53:31 -08:00
Stephen Birarda
8f2dc7e38b resolve conflicts on merge with upstream master 2015-03-03 12:22:25 -08:00
Sam Gateau
4619ba1f5b Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2015-03-03 10:56:04 -08:00
Stephen Birarda
e43da00537 remove xmpp chat support 2015-03-03 10:13:41 -08:00
Stephen Birarda
5a601f3676 resolve conflicts on merge with upstream/master 2015-03-03 10:01:24 -08:00
Stephen Birarda
38f77190eb remove PrioVR from build files 2015-02-26 17:20:45 -08:00
Stephen Birarda
95c25086d7 handle QTTOOLDIR env when looking for qmake 2015-02-26 16:59:37 -08:00
Stephen Birarda
eb646383e9 Revert "attempt to remove out-of-date warning for tbb" 
This reverts commit 43da329eb4.
 2015-02-26 16:21:15 -08:00
Stephen Birarda
43da329eb4 attempt to remove out-of-date warning for tbb 2015-02-26 16:14:09 -08:00
Stephen Birarda
9979bbd8b5 actually link debug bullet lib for WIN32 2015-02-26 15:49:03 -08:00
Sam Gateau
d8ebb0c5b9 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2015-02-26 14:19:23 -08:00
Stephen Birarda
5a4a3ce6dd remove message calls to debug bullet vars 2015-02-26 09:59:15 -08:00
Stephen Birarda
ea88518a44 handle debug/release for multi-config on WIN32 2015-02-26 09:57:56 -08:00
Stephen Birarda
621df1f66b remove win requirement of msbuild for bullet 2015-02-26 09:50:21 -08:00
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
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