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

Added toolchain file and build instruction for iOS #286

Merged
merged 3 commits into from
Feb 28, 2018
Merged

Added toolchain file and build instruction for iOS #286

merged 3 commits into from
Feb 28, 2018

Conversation

Gummilion
Copy link
Contributor

Created toolchain file and build instructions for build SRT code for iOS per #266
Updated configure script to prevent specifying explicit SSL path if toolchain used.

Gummilion and others added 3 commits February 21, 2018 12:53
@Gummilion
Added build instruction for iOS with toolchain file
ee3b009
@Gummilion
Update build_iOS.md
26f3c67 
Some fixes and additions in build instruction
@Gummilion
Update build_iOS.md
bed67d1 
Some clarifications
@alexpokotilo
Copy link
Contributor

alexpokotilo commented Feb 26, 2018 •
edited
Loading

@rndi could you please check why "continuous-integration/appveyor/pr" check is in pending for this pull request. As I see another new pull request has the same problem #288
This pull request is IOS part of our company contribution to SRT. You have already merged Android part of this request #278

@rndi
Copy link
Collaborator

rndi commented Feb 26, 2018

I will look into it; appveyor has been acting up recently. Thank you for the contribution @alexpokotilo, hopefully this will be sorted out shortly!

@alexpokotilo
Copy link
Contributor

@rndi appveyor failed with following message:
(ClCompile target) ->
C:\projects\srt\srtcore\srt_compat.c(43): error C2143: syntax error : missing '{' before 'const' [C:\projects\srt\srt_virtual.vcxproj]
But we don't change srt_compat.c in this build at all

@rndi
Copy link
Collaborator

rndi commented Feb 27, 2018

Sorry @alexpokotilo , this got broken in #285 and slipped past us because Appveyor was stuck (horrible excuse, I know). I opened PR #290 that should resolve the problem going forward. I don't think you need to rebase this PR to get Appveyor check passed because @Gummilion's changes are not touching anything Windows-related. But it would be good if @ethouris gives his blessings though since he was part of the discussion on #266 thread.

@rndi
Copy link
Collaborator

rndi commented Feb 27, 2018

On another note, @Gummilion , could you please take a look at #229 and give you blessing to MPL change if you are ok with it?

Much appreciated!

@Gummilion
Copy link
Contributor Author

@rndi - OK, voted for it.

@rndi
Copy link
Collaborator

rndi commented Feb 27, 2018

Thanks @Gummilion !

@alexpokotilo
Copy link
Contributor

@rndi as #290 integrated and we push only docs please merge this

ethouris
ethouris reviewed Feb 27, 2018
View reviewed changes
Copy link
Collaborator

@ethouris ethouris left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The only thing I understand here is that if you have changed the toolchain, then the section for HAVE_DARWIN, which enforces the default openssl from brew should not be executed. That's ok.

But I haven't noticed how it happens that this iOS.cmake is being anyhow used in the build system, can you explain?

@Gummilion
Copy link
Contributor Author

iOS.cmake is passed to configure with --cmake-toolchain-file=scripts/iOS.cmake parameter, as mentioned in build_iOS.md, and configure script pass it to CMake with -DCMAKE_TOOLCHAIN_FILE option. Probably we could add some specific parameter (like --build-ios) to configure, but I'm not sure whether it needed.

ethouris
ethouris approved these changes Feb 28, 2018
View reviewed changes
Copy link
Collaborator

@ethouris ethouris left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, that should be good enough.

@rndi rndi merged commit 8b9e0cc into Haivision:dev Feb 28, 2018
Gummilion added a commit to Gummilion/srt that referenced this pull request May 10, 2018
@Gummilion
Merge branch 'dev' into timedwait
5fbd980 
* dev: (21 commits)
  Fix SRT file transmit app to work in non-blocking mode (Haivision#334)
  Ensure stdout silence in console pipe out mode plus a few minor fixups (Haivision#275)
  Replaced hardcoded installdirs with GNUInstallDirs. Fixed some status messages. (Haivision#323)
  Breaking connection when recv buffer inflation caused sequence discrepancy (Haivision#300)
  Fixed problems with encryption decision and status report on encryption failure. (Haivision#318)
  Fixed invalid symbol names in doc (Haivision#311)
  Dev add version to winpackages (Haivision#328)
  Android build for dev (Haivision#326)
  Change License to MPLv2.0 (Haivision#327)
  Used constants for input rate. Fixed after-start rate sampling period to 1s (Haivision#315)
  Made SockaddrToString use only numeric string by default (Haivision#312)
  Ported change in Haivision#307 PR to dev
  Fixed SockaddrToString to format as 4dotIP if unknown (Haivision#299)
  Build with debug information for lldb on iOS platform (Haivision#302)
  Fix for sudden stop sending data on macOS/iOS (Haivision#303)
  Fix broken build when testing apps enabled (Haivision#296)
  Removed all code introduced for CBR (Haivision#293)
  Added API to get instantaneous stats instead of moving averages for a… (Haivision#288)
  Added toolchain file and build instruction for iOS (Haivision#286)
  Fix windows build (Haivision#290)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ethouris ethouris ethouris approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@Gummilion @alexpokotilo @rndi @ethouris