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 changes, stage 1 #1264

Merged
merged 2 commits into from
Apr 4, 2019
Merged

Android changes, stage 1 #1264

merged 2 commits into from
Apr 4, 2019

Conversation

ifarbod
Copy link
Contributor

@ifarbod ifarbod commented Mar 28, 2019

As discussed in #1251, this is a PR that contains merely fixes and minor changes, I'll do the second PR with the new functions and features once this gets merged.

Here's a quick brief of what I did:

  • Reworked the stl API, using staticruntime to decide on shared/static.
stl "libc++"
staticruntime "On"
-- Would produce: "c++_static"
-- Or:
stl "gnustl"
staticruntime "Off"
-- Would produce: "gnustl_shared"
  • Fixed the MultiProcessorCompilation flag.
  • Renamed androidproj to Packaging.
  • Prevented some Windows-exclusive attributes from ending up in Android projects, such as CharacterSet.
  • Added NEON support for vectorextensions.
  • Added UnwindTables support for exceptionhandling.
  • Fixed targetName not working in Packaging projects.
  • Included Android fixes from bliz #1112 (minus the unit tests) which fixes disablewarnings, exceptionhandling and rtti.
  • Unify cppdialect and cdialect, added support for C++latest which maps to C++17 at the moment.
  • Fixed pic.
  • Fixed thumbmode.

@ifarbod ifarbod mentioned this pull request Mar 28, 2019
Closed
ratzlaff
ratzlaff reviewed Mar 28, 2019
View reviewed changes
modules/android/tests/test_android_project.lua Outdated Show resolved Hide resolved
modules/android/vsandroid_vcxproj.lua Show resolved Hide resolved
modules/android/vsandroid_vcxproj.lua Outdated Show resolved Hide resolved
modules/android/vsandroid_vcxproj.lua Show resolved Hide resolved
modules/vstudio/vs2010_vcxproj.lua Show resolved Hide resolved
samsinsane
samsinsane requested changes Apr 3, 2019
View reviewed changes
modules/android/_preload.lua Outdated Show resolved Hide resolved
modules/android/_preload.lua Show resolved Hide resolved
modules/android/_preload.lua Show resolved Hide resolved
modules/android/tests/test_android_project.lua Outdated Show resolved Hide resolved
modules/android/vsandroid_androidproj.lua Outdated Show resolved Hide resolved
modules/android/vsandroid_vcxproj.lua Outdated Show resolved Hide resolved
modules/android/vsandroid_vcxproj.lua Outdated Show resolved Hide resolved
modules/android/vsandroid_vcxproj.lua Outdated Show resolved Hide resolved
modules/android/vsandroid_vcxproj.lua Show resolved Hide resolved
@samsinsane
Copy link
Member

Once you squish the commits down it should be good to merge! 👍

tritao
tritao reviewed Apr 4, 2019
View reviewed changes
src/base/_foundation.lua Outdated Show resolved Hide resolved
@ifarbod
Copy link
Contributor Author

ifarbod commented Apr 4, 2019

@samsinsane Thanks for the review, will squash everything into one now.

@samsinsane samsinsane merged commit cccad35 into premake:master Apr 4, 2019
@ifarbod ifarbod deleted the android-fixes-stage-1 branch April 4, 2019 16:41
@ifarbod ifarbod changed the title Android changes, stage 1 (#1263) Android changes, stage 1 Apr 5, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@WorldofBay WorldofBay WorldofBay left review comments

@ratzlaff ratzlaff ratzlaff left review comments

@tritao tritao tritao left review comments

@samsinsane samsinsane samsinsane 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.
5 participants
@ifarbod @samsinsane @tritao @ratzlaff @WorldofBay