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.

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

Extract cpp_rsc #840

Merged
merged 5 commits into from
Aug 13, 2019
Merged

Extract cpp_rsc #840

merged 5 commits into from
Aug 13, 2019

Conversation

JonasVautherin
Copy link
Collaborator

Not sure how ugly this is, but:

  • It may enable the camera definition files for Windows
  • It should improve cross-compilation, as the camera_definition_files.* are now versioned
  • It removes some conditional code in the CMakeLists
  • It removes #ifdefs in the code

@julianoes: What do you think? I'm mainly interested in seeing if that fixes the dockcross compilation after the protoc PR is merged.

@JonasVautherin
Copy link
Collaborator Author

Note: together with #839, this allows me to build for android-arm64 with dockcross (and I expect it to work for other dockcross configurations).

'\x76', '\x65', '\x72', '\x73', '\x69', '\x6f', '\x6e', '\x3d', '\x22',
'\x36', '\x22', '\x3e', '\x0a', '\x20', '\x20', '\x20', '\x20', '\x20',
'\x20', '\x20', '\x20', '\x3c', '\x6d', '\x6f', '\x64', '\x65', '\x6c',
'\x3e', '\x43', '\x47', '\x4f', '\x45', '\x54', '\x3c', '\x2f', '\x6d',
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
'\x3e', '\x43', '\x47', '\x4f', '\x45', '\x54', '\x3c', '\x2f', '\x6d',
'\x3e', '\x42', '\x47', '\x4f', '\x45', '\x54', '\x3c', '\x2f', '\x6d',

Pretty sure! 😄

@JonasVautherin JonasVautherin merged commit 45d908d into develop Aug 13, 2019
@JonasVautherin JonasVautherin deleted the extract-cpp-rsc branch August 13, 2019 21:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants