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

Don't define NOMINMAX if it's already defined #5678

Merged
merged 1 commit into from
Sep 18, 2020
Merged

Conversation

Spekular
Copy link
Member

Co-authored-by: Dominic Clark mrdomclark@gmail.com

Co-authored-by: Dominic Clark <mrdomclark@gmail.com>
@LmmsBot
Copy link

LmmsBot commented Sep 18, 2020

🤖 Hey, I'm @LmmsBot from github.com/lmms/bot and I made downloads for this pull request, click me to make them magically appear! 🎩

Linux

Windows

macOS

🤖
{"platform_name_to_artifacts": {"Linux": [{"artifact": {"title": {"title": "(AppImage)", "platform_name": "Linux"}, "link": {"link": "https://8806-15778896-gh.circle-artifacts.com/0/lmms-1.2.3-705%2Bg92e13b0-linux-x86_64.AppImage"}}, "build_link": "https://circleci.com/gh/LMMS/lmms/8806?utm_campaign=vcs-integration-link&utm_medium=referral&utm_source=github-build-link"}], "Windows": [{"artifact": {"title": {"title": "32-bit", "platform_name": "Windows"}, "link": {"link": "https://8805-15778896-gh.circle-artifacts.com/0/lmms-1.2.3-705%2Bg92e13b001-mingw-win32.exe"}}, "build_link": "https://circleci.com/gh/LMMS/lmms/8805?utm_campaign=vcs-integration-link&utm_medium=referral&utm_source=github-build-link"}, {"artifact": {"title": {"title": "64-bit", "platform_name": "Windows"}, "link": {"link": "https://8804-15778896-gh.circle-artifacts.com/0/lmms-1.2.3-705%2Bg92e13b001-mingw-win64.exe"}}, "build_link": "https://circleci.com/gh/LMMS/lmms/8804?utm_campaign=vcs-integration-link&utm_medium=referral&utm_source=github-build-link"}, {"artifact": {"title": {"title": "32-bit", "platform_name": "Windows"}, "link": {"link": "https://ci.appveyor.com/api/buildjobs/b4n1cq0ch28ffj89/artifacts/build/lmms-1.2.2-msvc2017-win32.exe"}}, "build_link": "https://ci.appveyor.com/project/Lukas-W/lmms/builds/35280913"}, {"artifact": {"title": {"title": "64-bit", "platform_name": "Windows"}, "link": {"link": "https://ci.appveyor.com/api/buildjobs/hja6ntr061i7h2vo/artifacts/build/lmms-1.2.2-msvc2017-win64.exe"}}, "build_link": "https://ci.appveyor.com/project/Lukas-W/lmms/builds/35280913"}, {"artifact": {"title": {"title": "32-bit", "platform_name": "Windows"}, "link": {"link": "https://ci.appveyor.com/api/buildjobs/5rp15281ed0xr10a/artifacts/build/lmms-1.2.2-msvc2017-win32.exe"}}, "build_link": "https://ci.appveyor.com/project/Lukas-W/lmms/builds/35280918"}, {"artifact": {"title": {"title": "64-bit", "platform_name": "Windows"}, "link": {"link": "https://ci.appveyor.com/api/buildjobs/hv46h4x4stuxjvth/artifacts/build/lmms-1.2.2-msvc2017-win64.exe"}}, "build_link": "https://ci.appveyor.com/project/Lukas-W/lmms/builds/35280918"}], "macOS": [{"artifact": {"title": {"title": "", "platform_name": "macOS"}, "link": {"link": "https://8807-15778896-gh.circle-artifacts.com/0/lmms-1.2.3-705%2Bg92e13b001-mac10.13.dmg"}}, "build_link": "https://circleci.com/gh/LMMS/lmms/8807?utm_campaign=vcs-integration-link&utm_medium=referral&utm_source=github-build-link"}]}, "commit_sha": "92e13b001a93d92b3cabc74ae440aeb3ef4697a4"}

@Spekular
Copy link
Member Author

Being eager to fix this CI error via direct commit just led to more CI errors, so let's go with a PR this time. Bypassing CI when attempting to fix CI was probably a dumb move...

@Spekular Spekular merged commit a6d0b46 into master Sep 18, 2020
@Spekular Spekular deleted the Spekular-patch-1 branch September 18, 2020 16:48
sdasda7777 pushed a commit to sdasda7777/lmms that referenced this pull request Jun 28, 2022
Co-authored-by: Dominic Clark <mrdomclark@gmail.com>
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.

2 participants