Stephen Birarda
|
aff3732052
|
some light refactoring in interface CMakeLists
|
2013-04-12 13:29:27 -07:00 |
|
Stephen Birarda
|
b0ff960e37
|
use MACRO_DIR variable to find glm in root externals dir
|
2013-04-12 13:20:46 -07:00 |
|
Stephen Birarda
|
67efc12e59
|
move shared to libraries, DRY library macro, rename libs
|
2013-04-12 12:38:34 -07:00 |
|
ZappoMan
|
4364a0e692
|
moved stuff around to migrate glm to shared
|
2013-04-11 18:41:12 -07:00 |
|
vincent
|
4f41aab89a
|
last merge without Curl
|
2013-04-09 22:17:59 +02:00 |
|
vincent
|
56aac7077c
|
changes after merge
|
2013-04-09 19:12:49 +02:00 |
|
Stephen Birarda
|
320fa9e5c8
|
link curl to shared library, not interface
|
2013-04-03 15:14:35 -07:00 |
|
tosh
|
2341af271b
|
Merge branch 'master' of git://github.com/worklist/hifi into 19188
Conflicts:
interface/CMakeLists.txt
interface/src/main.cpp
shared/src/SharedUtil.cpp
shared/src/SharedUtil.h
shared/src/VoxelTree.cpp
|
2013-04-03 22:44:22 +02:00 |
|
tosh
|
0733f06143
|
adds cmake support for starfield subdirectory
|
2013-04-03 22:04:09 +02:00 |
|
Stephen Birarda
|
aa17cc6edc
|
link ALSA after PortAudio for UNIX build
|
2013-04-02 15:34:10 -07:00 |
|
Stephen Birarda
|
6005629d15
|
fix framework inclusions in CMakeLists after previous change
|
2013-04-02 15:27:46 -07:00 |
|
Stephen Birarda
|
757aadf53e
|
changes to CMakeLists to remove double links on OS X
|
2013-04-02 15:07:04 -07:00 |
|
tschw
|
baa0a6de12
|
comments out ++(C++) build settings, for now
in case it needs more than a clean rebuild to compile
the project on recent Xcode - will revisit when I can
ensure things build safely
|
2013-04-01 15:33:22 +03:00 |
|
tosh
|
3a55234436
|
also bumps standard library version for clang (untested)
|
2013-03-29 22:32:44 +01:00 |
|
tosh
|
8300646b33
|
allows new C++ standard features
|
2013-03-29 10:42:36 +01:00 |
|
tosh
|
b4f2b04241
|
allows qualified inclusion in subdirectories
|
2013-03-29 10:24:14 +01:00 |
|
vincent
|
83abc571f1
|
#19197 Create basic visual studio
|
2013-03-28 18:20:50 +01:00 |
|
Stephen Birarda
|
17904ee069
|
remove .mm include for interface now that menu is gone
|
2013-03-27 11:29:13 -07:00 |
|
tosh
|
5de3ec035b
|
leftover changes / minor corrections
|
2013-03-24 06:30:33 +01:00 |
|
Stephen Birarda
|
3fa0439f29
|
add method to SharedUtil to chdir to OS X bundle resources
|
2013-03-22 10:35:55 -07:00 |
|
Kees van Prooijen
|
9ae11ffe77
|
more windows port
|
2013-03-20 12:13:14 -07:00 |
|
Kees van Prooijen
|
d70da7f215
|
some more warning removal, temporarily excluding portaudio for windows
|
2013-03-19 11:49:36 -07:00 |
|
Kees van Prooijen
|
cd27c74a2d
|
prelimanary changes for windows port
|
2013-03-19 11:01:08 -07:00 |
|
Stephen Birarda
|
4a0aba9fb6
|
explicitly include GLUT framework for apple builds
|
2013-03-07 10:35:59 -08:00 |
|
Tomáš Horáček
|
4741eb869e
|
add Mac OS X "Scope" menu with empty action
|
2013-02-22 18:22:16 +01:00 |
|
Stephen Birarda
|
060f4dceca
|
use AgentData class to abstract implemenation of linked data
|
2013-02-21 12:56:57 -08:00 |
|
Stephen Birarda
|
dcb0e5add2
|
copy resources to OS X application bundle
|
2013-02-18 11:39:29 -08:00 |
|
Stephen Birarda
|
8c8309c1f4
|
add some comments to the CMakeLists files
|
2013-02-18 11:08:12 -08:00 |
|
Stephen Birarda
|
cbb7e62616
|
add Grayson's sexy new icon
|
2013-02-15 12:59:39 -08:00 |
|
Stephen Birarda
|
a37410968c
|
make OS X executable an app
|
2013-02-15 11:27:43 -08:00 |
|
Stephen Birarda
|
a5d08142e1
|
create target for shared hifi library
|
2013-02-14 15:25:50 -08:00 |
|
Stephen Birarda
|
fab10ada3e
|
move shared UDPSocket class to shared dir for reuse in mixer
|
2013-02-12 17:31:53 -08:00 |
|
Stephen Birarda
|
3ebb83f01d
|
keep portaudio build contained to build directory
|
2013-02-12 13:04:23 -08:00 |
|
Stephen Birarda
|
04492b28bd
|
link portaudio required libraries after portaudio
|
2013-02-12 11:44:48 -08:00 |
|
Stephen Birarda
|
b74e45e675
|
libraries for portaudio should be linked to interface
|
2013-02-12 11:33:56 -08:00 |
|
Stephen Birarda
|
6d67d6f1a6
|
link required unix libraries to portaudio target
|
2013-02-11 18:45:18 -08:00 |
|
Stephen Birarda
|
aaf9b73daf
|
add find modules for Jack and librt, link to interface
|
2013-02-11 18:42:28 -08:00 |
|
Stephen Birarda
|
b20ab5b5ca
|
wrap prefix dir for portaudio config in quotes
|
2013-02-11 18:15:24 -08:00 |
|
Stephen Birarda
|
d2f38a4c43
|
ask CMake for absolute path for portaudio configure prefix
|
2013-02-11 18:08:30 -08:00 |
|
Stephen Birarda
|
788f709193
|
use absolute path for portaudio install dir
|
2013-02-11 18:04:22 -08:00 |
|
Stephen Birarda
|
0521a48a72
|
tell portaudio configure to install to same dir
|
2013-02-11 18:01:20 -08:00 |
|
Stephen Birarda
|
262b2d82ac
|
Revert "set portaudio install dir to avoid permissions error"
This reverts commit 903bffd797 .
|
2013-02-11 17:42:23 -08:00 |
|
Stephen Birarda
|
903bffd797
|
set portaudio install dir to avoid permissions error
|
2013-02-11 17:39:26 -08:00 |
|
Stephen Birarda
|
8fb58221d0
|
build portaudio from same directory as source
|
2013-02-11 17:36:41 -08:00 |
|
Stephen Birarda
|
b3a343f17f
|
build portaudio as external project before interface
|
2013-02-08 17:28:22 -08:00 |
|
Stephen Birarda
|
99b96ec737
|
build portaudio library to link with interface
|
2013-02-08 15:58:12 -08:00 |
|
Stephen Birarda
|
9fd14c6403
|
fix reference to GL libraries for UNIX headers
|
2013-02-08 14:59:30 -08:00 |
|
Stephen Birarda
|
08142a8adb
|
add header for glut to conditional include in InterfaceConfig
|
2013-02-08 14:57:59 -08:00 |
|
Stephen Birarda
|
d394035e7e
|
switch back to ARB functions with glext include
|
2013-02-08 14:49:12 -08:00 |
|
Stephen Birarda
|
13a0597ab6
|
dynamic header for GLUT include
|
2013-02-08 12:17:35 -08:00 |
|
Stephen Birarda
|
f5cbe7a05a
|
cmake build working for interface project
|
2013-02-07 17:29:01 -08:00 |
|
Stephen Birarda
|
f9b8d6cde0
|
don't use find module for glm/portaudio
|
2013-02-07 12:24:05 -08:00 |
|
Stephen Birarda
|
0ad551c86d
|
use build directory to keep cmake clean
|
2013-02-07 11:57:35 -08:00 |
|
Stephen Birarda
|
4860fb086d
|
link glm library to interface target
|
2013-02-07 11:41:01 -08:00 |
|
Stephen Birarda
|
24240a709c
|
add all extra CMake files to gitignore
|
2013-02-06 18:26:19 -08:00 |
|
Stephen Birarda
|
1111e4837e
|
intial restructuring for CMake setup
|
2013-02-06 18:07:36 -08:00 |
|