(Release 30) Correct src.pro for Windows#357
Merged
vadi2 merged 5 commits intoMudlet:release_30from Dec 6, 2016
Nyyrazzilyss:release_30
Merged
(Release 30) Correct src.pro for Windows#357vadi2 merged 5 commits intoMudlet:release_30from Nyyrazzilyss:release_30
vadi2 merged 5 commits intoMudlet:release_30from
Nyyrazzilyss:release_30
Conversation
This corrects the libraries linked in src.pro for Windows so SQL functions work properly. It also removes reference to external libraries/includes.
This makes two changes to sound playback. mpMusicBox is moved from 4 variables into an expandable QList. An unlimited number of sounds can be played simultaenously. The lua playSoundFile command has an additional argument added to it for volume (0-100). It defaults to 100 if not present for backwards compatability.
This reverts commit f1fbf32.
This reverts commit c53f2df.
Member
|
@vadi2 if this gets your approval I think you will want to use the "Squash and Merge" option to lose the two sets of add+revert commits and end up just with net effect of just the first commit. I think @Nyyrazzilyss will then want to cherry-pick the second and third to his separate sound enhancement PR... |
Member
|
Still seems to compile and run - thanks for the fix! |
mehulmathur16
pushed a commit
to mehulmathur16/Mudlet
that referenced
this pull request
Feb 16, 2024
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This (only) corrects the src.pro file to build properly with Windows. It links the proper libraries, and removes reference to external links/includes