Merge pull request #111 from micro-manager/mmdevice-module-exports

Upgrade MMDevice/MMCore and fix macro defs

MANIFEST.in

@@ -9,4 +9,4 @@ prune mmCoreAndDevices/DeviceAdapters
 prune mmCoreAndDevices/m4
 prune mmCoreAndDevices/.github
 recursive-exclude mmCoreAndDevices *.txt *.md *.am .project \
-    *.vcxproj* *.sln *.props *.cdt* secret-device-*
+    *.vcxproj* *.sln *.props *.cdt* secret-device-* meson.build *.wrap

setup.py

@@ -57,25 +57,19 @@ def run(self):
         super().run()
 
 
+define_macros = [
+    ("MMDEVICE_CLIENT_BUILD", None),
+] + ([
+    ("NOMINMAX", None),
+    ("_CRT_SECURE_NO_WARNINGS", None),
+] if IS_WINDOWS else [])
+
 mmdevice_build_info = {
     "sources": [str(x.relative_to(ROOT)) for x in MMDevicePath.glob("*.cpp")],
     "include_dirs": ["mmCoreAndDevices/MMDevice"],
-    "macros": [("MODULE_EXPORTS", None)],
+    "macros": define_macros,
 }
 
-if IS_WINDOWS:
-    define_macros = [
-        ("_CRT_SECURE_NO_WARNINGS", None),
-        # These would not be necessary if _WIN32 or _MSC_VER were used correctly.
-        ("WIN32", None),
-        ("_WINDOWS", None),
-        # See DeviceUtils.h
-        ("MMDEVICE_NO_GETTIMEOFDAY", None),
-    ]
-    mmdevice_build_info["macros"].extend(define_macros)
-else:
-    define_macros = []
-
 omit = ["unittest"] + (["Unix"] if IS_WINDOWS else ["Windows"])
 mmcore_sources = [
     str(x.relative_to(ROOT))