Upgrade MMDevice/MMCore and fix macro defs #111
Merged
Conversation
This file contains 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
7 tasks
marktsuchida
force-pushed
the
mmdevice-module-exports
branch
from
5b88b37 to
1f9977d
Compare
marktsuchida
force-pushed
the
mmdevice-module-exports
branch
from
1f9977d to
0571d37
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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 pulls in the changes up to micro-manager/mmCoreAndDevices#435 and updates the preprocessor macros in setup.py accordingly:
MODULE_EXPORTSremoved from MMDevice build (this was previously needed to compile on Windows, even though semantically wrong)MMDEVICE_CLIENT_BUILDadded to entire buildWIN32and_WINDOWSremoved, as these are no longer depended on by MMDevice/MMCore sourceMMDEVICE_NO_GETTIMEOFDAYremoved, as MMDevice removedgettimeofday()NOMINMAXadded on Windows, as MMCore (theoretically) requires it