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

switch-next: Build with CMake #334

Merged
merged 13 commits into from Oct 13, 2019
Merged

Conversation

glebm
Copy link
Collaborator

@glebm glebm commented Oct 7, 2019

I haven't tested the binary

.circleci/config.yml Outdated Show resolved Hide resolved
@glebm glebm force-pushed the switch-next branch 2 times, most recently from 042e9c6 to cd032ff Compare October 7, 2019 11:11
@rsn8887
Copy link
Contributor

rsn8887 commented Oct 8, 2019

The binary works, but the embedded title, author name, and version seem to be wrong: Title is Devilution Team (used to be "diablo-nx"), Author is "Unspecified Author" (should be "Devilution Team", and version is "0.5.0" (no clue what it should be).

The executable name is "DevilutionX.nro" instead of "diablo-nx.nro", but that might be intended?

Copy link
Contributor

@rsn8887 rsn8887 left a comment

Choose a reason for hiding this comment

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

Binary works, but APP_AUTHOR and APP_TITLE are wrong

CMakeLists.txt Outdated Show resolved Hide resolved
@rsn8887
Copy link
Contributor

rsn8887 commented Oct 8, 2019

The error display requester also works, it shows a red "Date file error" window if the .MPG file is missing. I suppose it should be "data file", not "date file".

Also, on Switch, I cannot press OK in that requeter, it seems maybe the SDL_controller button input is not hooked up so I have no way to cause an OK in these new error requesters.

2019100721363300-D0B9AC9357A3561F8D041C64209A70F0

Notice for other UI elements, we hooked up the controller input, e.g. here:

if (event->type == SDL_CONTROLLERBUTTONDOWN) {

EDIT: It doesn't really matter for this particular requester, because a restart is required to fix the problem anyways.

@glebm
Copy link
Collaborator Author

glebm commented Oct 8, 2019

Thank you for testing!

The error display requester also works, it shows a red "Date file error" window if the .MPG file is missing. I suppose it should be "data file", not "date file".

This typo is fixed on master but the switch-next branch hasn't been rebased yet.

Also, on Switch, I cannot press OK in that requeter, it seems maybe the SDL_controller button input is not hooked up so I have no way to cause an OK in these new error requesters.

Thanks, we should fix this directly on master.

@glebm
Copy link
Collaborator Author

glebm commented Oct 8, 2019

Binary works, but APP_AUTHOR and APP_TITLE are wrong

This is fixed now. The version etc are consistent with the non-switch build (they weren't before).

@rsn8887
Copy link
Contributor

rsn8887 commented Oct 8, 2019

I think this PR should be ready to merge then AFAIK.

@rsn8887
Copy link
Contributor

rsn8887 commented Oct 8, 2019

Although what happened to the line endings in switch/switch_keyboard.cpp? Is it intended? The diff shows the file completely changed, although there's only one tiny change. I think that's line endings then.

@glebm
Copy link
Collaborator Author

glebm commented Oct 8, 2019

Although what happened to the line endings in switch/switch_keyboard.cpp? Is it intended? The diff shows the file completely changed, although there's only one tiny change. I think that's line endings then...

Yeah, the line endings were wrong previously. It's not a big issue, as GitHub has a hide whitespace diff option.

@rsn8887
Copy link
Contributor

rsn8887 commented Oct 8, 2019

Ok then this is ready to merge as far as I am concerned. Awesome work.

@AJenbo
Copy link
Member

AJenbo commented Oct 8, 2019

Thanks for testing, I'll rebase and replace the old PR

@AJenbo AJenbo merged commit 3d51b17 into diasurgical:switch-next Oct 13, 2019
AJenbo pushed a commit that referenced this pull request Oct 13, 2019
* Update CMake/Findsodium.cmake from upstream
* CMake/Findsodium.cmake: Support "Generic" platform
Allows it work using the Switch toolchain
* Switch port: Code changes for latest devkitpro
* switch/build.sh: Fewer devkitpro packages
glebm added a commit to glebm/devilutionX that referenced this pull request Oct 15, 2019
* Update CMake/Findsodium.cmake from upstream
* CMake/Findsodium.cmake: Support "Generic" platform
Allows it work using the Switch toolchain
* Switch port: Code changes for latest devkitpro
* switch/build.sh: Fewer devkitpro packages
glebm added a commit to glebm/devilutionX that referenced this pull request Oct 15, 2019
* Update CMake/Findsodium.cmake from upstream
* CMake/Findsodium.cmake: Support "Generic" platform
Allows it work using the Switch toolchain
* Switch port: Code changes for latest devkitpro
* switch/build.sh: Fewer devkitpro packages
@glebm glebm deleted the switch-next branch October 15, 2019 10:23
glebm added a commit to glebm/devilutionX that referenced this pull request Oct 17, 2019
* Update CMake/Findsodium.cmake from upstream
* CMake/Findsodium.cmake: Support "Generic" platform
Allows it work using the Switch toolchain
* Switch port: Code changes for latest devkitpro
* switch/build.sh: Fewer devkitpro packages
glebm added a commit to glebm/devilutionX that referenced this pull request Oct 17, 2019
* Update CMake/Findsodium.cmake from upstream
* CMake/Findsodium.cmake: Support "Generic" platform
Allows it work using the Switch toolchain
* Switch port: Code changes for latest devkitpro
* switch/build.sh: Fewer devkitpro packages
AJenbo pushed a commit that referenced this pull request Nov 11, 2019
* Update CMake/Findsodium.cmake from upstream
* CMake/Findsodium.cmake: Support "Generic" platform
Allows it work using the Switch toolchain
* Switch port: Code changes for latest devkitpro
* switch/build.sh: Fewer devkitpro packages
AJenbo pushed a commit that referenced this pull request Nov 11, 2019
* Update CMake/Findsodium.cmake from upstream
* CMake/Findsodium.cmake: Support "Generic" platform
Allows it work using the Switch toolchain
* Switch port: Code changes for latest devkitpro
* switch/build.sh: Fewer devkitpro packages
AJenbo pushed a commit that referenced this pull request Nov 11, 2019
* Update CMake/Findsodium.cmake from upstream
* CMake/Findsodium.cmake: Support "Generic" platform
Allows it work using the Switch toolchain
* Switch port: Code changes for latest devkitpro
* switch/build.sh: Fewer devkitpro packages
AJenbo pushed a commit that referenced this pull request Nov 11, 2019
* Use the Switch toolchain
* Switch port: Code changes for latest devkitpro
* switch/build.sh: Fewer devkitpro packages
AJenbo pushed a commit that referenced this pull request Nov 11, 2019
* Switch port: Code changes for latest devkitpro
* switch/build.sh: Fewer devkitpro packages
AJenbo pushed a commit that referenced this pull request Nov 11, 2019
* Switch port: Code changes for latest devkitpro
* switch/build.sh: Fewer devkitpro packages
AJenbo pushed a commit that referenced this pull request Nov 11, 2019
* Switch port: Code changes for latest devkitpro
* switch/build.sh: Fewer devkitpro packages
AJenbo pushed a commit that referenced this pull request Nov 11, 2019
* Switch port: Code changes for latest devkitpro
* switch/build.sh: Fewer devkitpro packages
AJenbo pushed a commit that referenced this pull request Nov 11, 2019
* Switch port: Code changes for latest devkitpro
* switch/build.sh: Fewer devkitpro packages
AJenbo pushed a commit that referenced this pull request Nov 11, 2019
* Switch port: Code changes for latest devkitpro
* switch/build.sh: Fewer devkitpro packages
AJenbo pushed a commit that referenced this pull request Nov 11, 2019
* Switch port: Code changes for latest devkitpro
* switch/build.sh: Fewer devkitpro packages
AJenbo pushed a commit that referenced this pull request Nov 11, 2019
* Switch port: Code changes for latest devkitpro
* switch/build.sh: Fewer devkitpro packages
AJenbo pushed a commit that referenced this pull request Nov 11, 2019
* Switch port: Code changes for latest devkitpro
* switch/build.sh: Fewer devkitpro packages
AJenbo pushed a commit that referenced this pull request Nov 11, 2019
* Switch port: Code changes for latest devkitpro
* switch/build.sh: Fewer devkitpro packages
AJenbo pushed a commit that referenced this pull request Nov 12, 2019
* Switch port: Code changes for latest devkitpro
* switch/build.sh: Fewer devkitpro packages
AJenbo pushed a commit that referenced this pull request Nov 23, 2019
* Switch port: Code changes for latest devkitpro
* switch/build.sh: Fewer devkitpro packages
AJenbo pushed a commit that referenced this pull request Nov 23, 2019
* Switch port: Code changes for latest devkitpro
* switch/build.sh: Fewer devkitpro packages
AJenbo pushed a commit that referenced this pull request Nov 23, 2019
* Switch port: Code changes for latest devkitpro
* switch/build.sh: Fewer devkitpro packages
AJenbo pushed a commit that referenced this pull request Nov 23, 2019
* Switch port: Code changes for latest devkitpro
* switch/build.sh: Fewer devkitpro packages
AJenbo pushed a commit that referenced this pull request Nov 23, 2019
* Switch port: Code changes for latest devkitpro
* switch/build.sh: Fewer devkitpro packages
AJenbo pushed a commit that referenced this pull request Nov 24, 2019
* Switch port: Code changes for latest devkitpro
* switch/build.sh: Fewer devkitpro packages
AJenbo pushed a commit that referenced this pull request Nov 24, 2019
* Switch port: Code changes for latest devkitpro
* switch/build.sh: Fewer devkitpro packages
AJenbo pushed a commit that referenced this pull request Nov 24, 2019
* Switch port: Code changes for latest devkitpro
* switch/build.sh: Fewer devkitpro packages
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants