Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

android_linux merge #1690

Merged
merged 1,111 commits into from
Dec 23, 2016
Merged

android_linux merge #1690

merged 1,111 commits into from
Dec 23, 2016

Conversation

cinder
Copy link
Owner

@cinder cinder commented Dec 21, 2016

Merges the android_linux branch with master, which includes support for Linux and CMake, as well as experimental support for Android.

richardeakin and others added 30 commits July 19, 2016 07:22
@richardeakin
some logging cleanup
1b2c833
@richardeakin
add some logs to debug a problem
de8d56e
@richardeakin
Only place the binary output in a path relative to CMakeLists.txt if …
45271d4 
…we’re in CLion (requires CLion v2016.2).

Append the build type either way. Fixes #1505.
@richardeakin
using ‘config’ mode for find_package(), using ‘module’ mode created a…
5ced87d 
…mbiguities with cinderblocks such as Cairo
@richardeakin
Merge pull request #1507 from richardeakin/cmake_minimal_includes
4714352 
Break out CINDER_INCLUDE_SYSTEM into _PRIVATE and _INTERFACE groups.
@PetrosKataras
Implements vsync for glfw-based linux apps.
e292954
@andrewfb
Fixing very minor typo in Cube sample
89ed0e3
@richardeakin
Merge pull request #1511 from richardeakin/cmake_blocks
b66ec6d 
CMake support for blocks
@andrewfb
Changing target for macosx, ios platforms static libs to lib/macosx/
1b57499
@gaborpapp
Added qtime files for CMake in OSX
672d569
@andrewfb
Moving xcode project into proj/
8792492
@andrewfb
Updating samples' xcode projects to reflect to libcinder path
46761ef
@andrewfb
Changing VC2013 project to generate .lib and .pdb at
9c7a57c
@richardeakin
Merge pull request #1525 from gaborpapp/cmake-qtime
28c96e0 
Added qtime files for CMake in OSX
@PetrosKataras
GstPlayer: Initial refactor and OS X support.
75d0c06
@PetrosKataras
Fix typo.
421ef1e
@PetrosKataras
Fix some spacing.
2327d84
@PetrosKataras
GstPlayer: Better cinder-gstreamer streaming thread synchronization.
40c4501
@PetrosKataras
Refactor frame process logic. Streaming thread now waits on condition…
b38e707 
…_variable until current frame is processed from main thread.
@PetrosKataras
Fix misplaced buffer map that got introduced during refactor
cfc3473
@PetrosKataras
Reset GL path flag to its default value.
201fbcb
@PetrosKataras
Fix mutex positioning.
b42d779
@PetrosKataras
Avoid GL include clashes on the Pi.
5a6f134
@PetrosKataras
Better naming.
667fc36
@PetrosKataras
Mutex back again to correct position.
c5cbd9e
@PetrosKataras
Better syncing between streaming and main thread.
4b23b01
@PetrosKataras
Save current state after a blocking change.
0d952e6
@PetrosKataras
Initial commit for GstPlayer test app.
1387176
@PetrosKataras
Fix test app compilation.
68223df
@patrickFuerst @PetrosKataras
Fix the order of the console prints.
2af7368 
Before it printed ASYNC message although it blocked for state change.
richardeakin and others added 21 commits December 10, 2016 19:59
@richardeakin
Fix VS 2013 project for new cinder.lib location
263a4f9 
From #1429
@richardeakin
disable minimal rebuild so multi-process build works
29d72bf
@richardeakin
Remove UNIT_DIR_ASSETS, which only worked when building with cmake
f53eebd 
Fixes #1666.
Commented out entire FFT test for non os x
3cd747d
@richardeakin
Merge pull request #1679 from lucasvickers/travis-ci
d301d23 
Adds Travis CI support for OS X (various xcode versions) and Ubuntu Trusty
@richardeakin
Merge pull request #1680 from richardeakin/unit_test_fixes
1e0abd7 
Unit test fixes for non-cmake platforms
breaking out cmake and xcode builds.
7f5f1b2
mixing up languages, replacing and with &&
e4125b7
Fixing brackets
90ef777
semi colons
c2391c5
@PetrosKataras
Replace unique_lock's with lock_guard's.
ed1732f
@PetrosKataras
Replace bbb video file with web based videos for testing.
c84697b
Commiting xcode build script.
6a812f3
@richardeakin
Merge pull request #1530 from PetrosKataras/gst-player-refactor-and-o…
cbb9376 
…sx-support

GStreamer video player refactor and macosx support.
trying renames.
7938cfc
@richardeakin
Merge pull request #1687 from lucasvickers/travis-ci
3139635 
Travis ci via xcode
@richardeakin
Merge pull request #1688 from lucasvickers/travis-ci-rename
5aaa79b 
Added descriptions to travis environment
@PetrosKataras
Fix GstPlayer compilation on older linux.
0937249
@richardeakin
Merge pull request #1689 from PetrosKataras/fix-compilation-older-linux
8cb94f9 
Fix GstPlayer compilation on older linux.
@andrewfb
Merge branch 'android_linux' into android_linux_merge
9581b4d
@andrewfb
Merge remote-tracking branch 'origin/android_linux' into android_linu…
b29bfc1 
…x_merge
@richardeakin richardeakin added this to the 0.9.1 milestone Dec 23, 2016
@cinder cinder merged commit e005648 into master Dec 23, 2016
@andrewfb andrewfb deleted the android_linux_merge branch December 23, 2016 01:51
@drewish
Copy link
Contributor

drewish commented Dec 23, 2016

For anyone else who's wondering why the can't open the Xcode project after this got merged, it moved into the proj directory ;)

@drewish drewish mentioned this pull request Jan 14, 2017
Closed
3togo pushed a commit to 3togo/Cinder that referenced this pull request Aug 12, 2019
@cinder
Merge pull request cinder#1690 from cinder/android_linux_merge
6dc5eb2 
android_linux merge
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
android build system linux
Projects
None yet
Milestone
0.9.1
Development

Successfully merging this pull request may close these issues.

None yet
10 participants
@cinder @drewish @dankegel @richardeakin @PetrosKataras @andrewfb @gaborpapp @patrickFuerst @lucasvickers @bartleyryan