Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-09 13:02:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
22704 commits 67 branches 56 tags 1.2 GiB
Commit graph

159 commits

Author SHA1 Message Date
Andrew Meadows
e4c68bf31c committing some temp debug stuff to help git diff 
(will remove this stuff later)
 2015-03-05 18:06:08 -08:00
Stephen Birarda
e43da00537 remove xmpp chat support 2015-03-03 10:13:41 -08:00
Stephen Birarda
a7a9ede744 handle an SDK in Xcode beta 2015-02-25 13:53:57 -08:00
Stephen Birarda
e0d31f6e61 remove extra added spaces 2015-02-25 13:52:14 -08:00
Stephen Birarda
994c0386d3 cleanup command that looks for SDK 2015-02-25 13:50:59 -08:00
Stephen Birarda
d24287f627 look in Xcode application for 10.9 SDK 2015-02-25 13:48:28 -08:00
Leonardo Murillo
006b3ed0ac Merge pull request #4300 from birarda/dependencies 
NOT MERGEABLE - add some externals as cmake external projects
 2015-02-25 13:22:49 -08:00
Stephen Birarda
e7e7323ff0 pass 10.9 SDK as CMAKE_OSX_SYSROOT 2015-02-24 15:00:41 -08:00
Stephen Birarda
8be707f63f rename add paths macro for fixup_bundle 2015-02-23 13:24:21 -08:00
Stephen Birarda
2ad8ac866d make correct version of bullet for windows 2015-02-23 12:50:53 -08:00
Stephen Birarda
c64f172311 add qxmpp as external project 2015-02-20 16:06:37 -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
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
7ec01c9095 handle android build of tbb, don't prefix win with lib 2015-02-18 17:20:13 -08:00
Stephen Birarda
71482f6ad7 include tbb as system include, use project as prefix 2015-02-18 13:58:20 -08:00
Stephen Birarda
84e82f045d find QT_DIR in root CMakeLists 2015-02-18 11:38:08 -08:00
Stephen Birarda
b2ecf99008 back out of lib cmake dir to get Qt bin 2015-02-18 11:36:49 -08:00
Stephen Birarda
e2d7fb574a move macro call so it is actually loaded 2015-02-18 11:27:37 -08:00
Stephen Birarda
cc29297a19 remove requirement of Qt dlls in path 2015-02-18 10:13:23 -08:00
Stephen Birarda
c110fcbfad merge with upstream/master 2015-02-17 17:34:48 -08:00
Seth Alves
8c7e147b82 include debug symbols 2015-02-17 15:16:03 -08:00
Stephen Birarda
bc899eaa58 add fixup_bundle step for WIN32 interface 2015-02-17 13:17:23 -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
2c7e225ef7 use cmake ExternalProject for glm in Interface 2015-02-13 10:14:47 -08:00
Stephen Birarda
ef9cc2aacc repair ability for desktop to add gvr target 2015-02-12 12:49:29 -08:00
Stephen Birarda
53f58ad382 add possibility of desktop GVR build 2015-02-10 10:51:20 -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
f3e120f45d temp disable gvr-interface target to allow build 2015-02-04 11:15:03 -08:00
Stephen Birarda
1dd74c9831 allow gvr-interface target to be compiled for desktop 2015-01-28 16:57:16 -08:00
Stephen Birarda
d13e3c20c8 force GLM to not be found in path 2015-01-28 15:32:59 -08:00
Stephen Birarda
3dd0b85ca4 use a QOpenGLWidget subclass for InterfaceView 2015-01-28 15:26:03 -08:00
Stephen Birarda
2b0796eb7d simplify cmake call for android build 2015-01-28 13:40:47 -08:00
Stephen Birarda
21ecaafea9 don't force system include of GLM 2015-01-22 11:38:34 -08:00
Stephen Birarda
e5accde70d set the qmake excutable path to tell Qt modules where to look 2015-01-22 11:11:22 -08:00
Stephen Birarda
64aa203825 add output of QT_CMAKE_PREFIX_PATH 2015-01-22 11:05:48 -08:00
Stephen Birarda
316bbce83c allow ANDROID_QT_CMAKE_PREFIX_PATH to designate Qt location 2015-01-22 11:04:04 -08:00
Stephen Birarda
5716f576b7 output archive to current binary dir 2015-01-21 13:30:28 -08:00
Stephen Birarda
a3529e745b fix warning and compile with Multimedia 2015-01-21 13:28:18 -08:00
Stephen Birarda
c844502b97 use Qt 5.3 for android build as well 2015-01-19 14:49:01 -08:00
Stephen Birarda
de065ff442 add more instructions for Qt and GLM 2015-01-19 10:58:57 -08:00
Stephen Birarda
14e4879154 add a BUILD_ANDROID guide, reference ANDROID_LIB_DIR 2015-01-19 10:53:17 -08:00
Stephen Birarda
10be0ee984 resolve conflicts on merge with upstream master 2015-01-19 10:26:56 -08:00
Stephen Birarda
30f898109d don't warn about c++11 for MSVC12 2015-01-13 09:40:55 -08:00
Stephen Birarda
d30490c760 resolve conflicts on merge with upstream master 2015-01-12 09:25:37 -08:00
Stephen Birarda
6beaa3d59a set policy for shared lib creation on OS X 2014-12-18 14:36:15 -08:00
Stephen Birarda
a3cc578fd1 use libc++ for C++11 in APPLE builds 2014-12-15 14:08:23 -08:00
Stephen Birarda
5c3e90f64f resolve conflicts on merge with upstream master 2014-12-03 13:11:56 -08:00