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

MORPHOS: Added CAMD MIDI driver support #2740

Closed
wants to merge 4 commits into from

Conversation

@BeWorld2018
Copy link
Contributor

@BeWorld2018 BeWorld2018 commented Jan 23, 2021

Merge with AmigaOS4 camd.cpp

To confirm if Raziel is OK

Merge with AmigaOS4 camd.cpp
@raziel-
Copy link
Contributor

@raziel- raziel- commented Jan 23, 2021

Need to test if compiler errors are still there.

Unfortunately that will take some time, back at work

@BeWorld2018
Copy link
Contributor Author

@BeWorld2018 BeWorld2018 commented Jan 23, 2021

no problem :-)

@raziel-
Copy link
Contributor

@raziel- raziel- commented Feb 3, 2021

@BeWorld2018

I´m afraid, i still get some errors on compiling
Bug.txt

@BeWorld2018
Copy link
Contributor Author

@BeWorld2018 BeWorld2018 commented Feb 3, 2021

it's possible to view define on g++ ?
(on config.mk file put VERBOSE_BUILD = 1)

else i can create new file just for MorphOS and dont touch your part.

@raziel-
Copy link
Contributor

@raziel- raziel- commented Feb 3, 2021

@BeWorld2018

Are you looking for this line (verbose)?
I can do a complete verbose compile upto the errors, if needed.

mkdir -p backends/midi/.deps
g++ -MMD -MF "backends/midi/.deps/camd.d" -MQ "backends/midi/camd.o" -MP -Wall -std=gnu++11 -U__STRICT_ANSI__ -W -Wno-unused-parameter -Wno-empty-body -fno-operator-names -std=c++11 -pedantic -Wno-long-long -Wno-format -O3 -Wuninitialized -I/SDK/local/common/include/freetype2 -Wno-long-long -Wno-multichar -Wno-unknown-pragmas -Wno-reorder -Wpointer-arith -Wcast-qual -Wshadow -Wnon-virtual-dtor -Wwrite-strings -fno-exceptions -fcheck-new -DHAVE_CONFIG_H -DRELEASE_BUILD -DPPC_TARGET -DSDL_BACKEND -DDATA_PATH="/usr/local/share/scummvm" -DPLUGIN_DIRECTORY="/usr/local/lib/scummvm" -DENABLE_SCI=STATIC_PLUGIN -I. -I. -I./engines -I/SDK/local/newlib/include/SDL2 -D_REENTRANT -I/SDK/local/newlib/include -c backends/midi/camd.cpp -o backends/midi/camd.o

Does your code feature any additions, fixes, speed-ups or even readability enhancements?
I wouldn't want to miss out of those.

Then again i don't know how maintainable the code will be in the future, if it merges MorphOS and AmigaOS(4).
There are only few errors left, i'm sure you can tackle them (sorry to be of so little help)

@BeWorld2018
Copy link
Contributor Author

@BeWorld2018 BeWorld2018 commented Feb 4, 2021

Ok dont worry,

I dissociate AmigaOS and MorphOS but in the same file. This should be transparent for AmigaOS4 compilation

Now just confirm with last path it's ok for you,

thanks

@deepcode-ci-bot
Copy link

@deepcode-ci-bot deepcode-ci-bot bot commented Feb 4, 2021

Congratulations 🎉. DeepCode analyzed your code in 2.943 seconds and we found no issues. Enjoy a moment of no bugs ☀️.

👉 View analysis in DeepCode’s Dashboard | Configure the bot

@raziel-
Copy link
Contributor

@raziel- raziel- commented Feb 8, 2021

Sorry, work still delays things.

Will get back to you once I'm back home

@raziel-
Copy link
Contributor

@raziel- raziel- commented Feb 18, 2021

Checked now, compiles again on AmigaOS4 and MIDI output is still working here too.

Sorry again for the awful long delay

@BeWorld2018
Copy link
Contributor Author

@BeWorld2018 BeWorld2018 commented Feb 18, 2021

Thanks, ScummVM team.. you can merge if ok ok for you. Thanks

@criezy
Copy link
Member

@criezy criezy commented Feb 18, 2021

@BeWorld2018 Your second commit message does not respect our commit message formatting guidelines (it is missing the subsystem prefix). Once this is fixed this can be merged.
Or should the two commits be squashed? In which case this does not matter.

@BeWorld2018
Copy link
Contributor Author

@BeWorld2018 BeWorld2018 commented Feb 19, 2021

@BeWorld2018 Your second commit message does not respect our commit message formatting guidelines (it is missing the subsystem prefix). Once this is fixed this can be merged.
Or should the two commits be squashed? In which case this does not matter.

I "amend" my commit, but you can create only one commit on master if you want.

@criezy
Copy link
Member

@criezy criezy commented Feb 21, 2021

Thank you. I ended up merging manually to squash, rebase, and remove the merge commit.

@criezy criezy closed this Feb 21, 2021
@BeWorld2018 BeWorld2018 deleted the BeWorld2018:camd branch Feb 23, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants