Skip to content

Post Visual Studio 2015 Upgrade#1139

Merged
rryan merged 6 commits intomixxxdj:masterfrom
uklotzde:post_vs2015_upgrade
Jan 21, 2017
Merged

Post Visual Studio 2015 Upgrade#1139
rryan merged 6 commits intomixxxdj:masterfrom
uklotzde:post_vs2015_upgrade

Conversation

@uklotzde
Copy link
Copy Markdown
Contributor

Visual Studio 2015 is now the minimum requirement for compiling Mixxx on Windows.

This PR includes the definition of missing static const/constexpr class constants detected with optimize=off. Visual Studio 2013 didn't like those.

I did NOT remove any version checks in external sources that we just copied!

@timrae
Copy link
Copy Markdown
Contributor

timrae commented Jan 21, 2017

Thank you, it works for me on gcc 6.2

@uklotzde
Copy link
Copy Markdown
Contributor Author

Still struggling to get everything right to make the build pass on all platforms ;)

Comment thread src/sources/soundsourcemodplug.h Outdated
static const SINT kSamplingRate;
static const SINT kBitsPerSample;
static constexpr SINT kChannelCount = kChannelCountStereo;
static constexpr SINT kSamplingRate = 16;
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

ITYM
kSamplingRate = 44100;
kBitsPerSample = 16;
:)

Comment thread src/track/replaygain.h Outdated
static constexpr CSAMPLE kPeakMin = CSAMPLE_ZERO; // lower bound (inclusive)
static constexpr CSAMPLE kPeakClip = CSAMPLE_PEAK; // upper bound (inclusive) represents digital full scale without clipping

// TODO(uklotzde): Uncomment after switching to Visual Studio 2015
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Do you want to uncomment this?

static const SINT kBitsPerSample;
static constexpr SINT kChannelCount = kChannelCountStereo;
static constexpr SINT kSamplingRate = 44100;
static constexpr SINT kBitsPerSample = 16;
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Extra space indent.

@rryan rryan merged commit b789a7b into mixxxdj:master Jan 21, 2017
@rryan
Copy link
Copy Markdown
Member

rryan commented Jan 21, 2017

thanks!

@uklotzde uklotzde deleted the post_vs2015_upgrade branch January 21, 2017 22:54
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.

4 participants