wip - eliminate gettimeofday

micro-manager · Jan 22, 2024 · 229cece · 229cece
1 parent 55c5771
commit 229cece
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 4 deletions.
diff --git a/meson.build b/meson.build
@@ -47,8 +47,6 @@ if cxx.get_id() in ['msvc', 'clang-cl']
     add_project_arguments('/wd4706', language: 'cpp')
 endif
 
-add_global_arguments('-DMMDEVICE_NO_GETTIMEOFDAY', language: 'cpp')
-
 fs = import('fs')
 
 python = import('python').find_installation(pure: false)

diff --git a/mmCoreAndDevices b/mmCoreAndDevices
diff --git a/src/pymmcore/meson.build b/src/pymmcore/meson.build
@@ -31,7 +31,6 @@ swig_gen = custom_target(
         '-python',  # -py3 removed in SWIG 4.1
         '-builtin',
         swig_incdir_args,
-        '-DMMDEVICE_NO_GETTIMEOFDAY',
         '-MD', '-MF', '@DEPFILE@',
         '-o', '@OUTPUT0@',
         '-oh', '@OUTPUT1@',
+1 −1		DeviceAdapters/IlluminateLEDArray/LEDArray.cpp
+1 −1		DeviceAdapters/IlluminateLEDArray/LEDArray.h
+2 −2		DeviceAdapters/PointGrey/PointGrey.cpp
+1 −1		DeviceAdapters/SigmaKoki/Camera.cpp
+0 −41		MMDevice/DeviceUtils.cpp
+0 −25		MMDevice/DeviceUtils.h