Skip to content

Commit ff6ba58

Browse files
marktsuchidamarktsuchida
authored
Merge pull request #435 from micro-manager/mmdevice-fix-module-exports
No longer require MODULE_EXPORTS and fix related issues
2 parents 3f78883 + 39a90f7 commit ff6ba58

175 files changed

Lines changed: 375 additions & 387 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎DeviceAdapters/AAAOTF/AAAOTF.vcxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
</Midl>
5555
<ClCompile>
5656
<Optimization>Disabled</Optimization>
57-
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;MODULE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
57+
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
5858
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
5959
<RuntimeTypeInfo>true</RuntimeTypeInfo>
6060
<PrecompiledHeader>
@@ -73,7 +73,7 @@
7373
<TargetEnvironment>X64</TargetEnvironment>
7474
</Midl>
7575
<ClCompile>
76-
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;MODULE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
76+
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
7777
<RuntimeTypeInfo>true</RuntimeTypeInfo>
7878
<PrecompiledHeader>
7979
</PrecompiledHeader>

‎DeviceAdapters/ABS/ABSCamera.vcxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
<ClCompile>
5757
<Optimization>Disabled</Optimization>
5858
<AdditionalIncludeDirectories>./include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
59-
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MODULE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
59+
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
6060
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
6161
<PrecompiledHeader>
6262
</PrecompiledHeader>
@@ -76,7 +76,7 @@
7676
<Optimization>MaxSpeed</Optimization>
7777
<IntrinsicFunctions>true</IntrinsicFunctions>
7878
<AdditionalIncludeDirectories>./include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
79-
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MODULE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
79+
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
8080
<FunctionLevelLinking>true</FunctionLevelLinking>
8181
<PrecompiledHeader>
8282
</PrecompiledHeader>

‎DeviceAdapters/AOTF/AOTF.vcxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
<ClCompile>
5656
<Optimization>Disabled</Optimization>
5757
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
58-
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MODULE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
58+
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
5959
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
6060
<RuntimeTypeInfo>true</RuntimeTypeInfo>
6161
<PrecompiledHeader>
@@ -76,7 +76,7 @@
7676
</Midl>
7777
<ClCompile>
7878
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
79-
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MODULE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
79+
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
8080
<RuntimeTypeInfo>true</RuntimeTypeInfo>
8181
<PrecompiledHeader>
8282
</PrecompiledHeader>

‎DeviceAdapters/ASIFW1000/ASIFW1000.vcxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
<ClCompile>
5656
<Optimization>Disabled</Optimization>
5757
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
58-
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MODULE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
58+
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
5959
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
6060
<RuntimeTypeInfo>true</RuntimeTypeInfo>
6161
<PrecompiledHeader>
@@ -75,7 +75,7 @@
7575
</Midl>
7676
<ClCompile>
7777
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
78-
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MODULE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
78+
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
7979
<RuntimeTypeInfo>true</RuntimeTypeInfo>
8080
<PrecompiledHeader>
8181
</PrecompiledHeader>

‎DeviceAdapters/ASIStage/ASIStage.vcxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
<ClCompile>
5656
<Optimization>Disabled</Optimization>
5757
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
58-
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MODULE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
58+
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
5959
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
6060
<RuntimeTypeInfo>true</RuntimeTypeInfo>
6161
<PrecompiledHeader>
@@ -75,7 +75,7 @@
7575
</Midl>
7676
<ClCompile>
7777
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
78-
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MODULE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
78+
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
7979
<RuntimeTypeInfo>true</RuntimeTypeInfo>
8080
<PrecompiledHeader>
8181
</PrecompiledHeader>

‎DeviceAdapters/ASITiger/ASITiger.vcxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
<ClCompile>
5656
<Optimization>Disabled</Optimization>
5757
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
58-
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MODULE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
58+
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
5959
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
6060
<RuntimeTypeInfo>true</RuntimeTypeInfo>
6161
<PrecompiledHeader>
@@ -75,7 +75,7 @@
7575
</Midl>
7676
<ClCompile>
7777
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
78-
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MODULE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
78+
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
7979
<RuntimeTypeInfo>true</RuntimeTypeInfo>
8080
<PrecompiledHeader>
8181
</PrecompiledHeader>

‎DeviceAdapters/ASIWPTR/ASIwptr.vcxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
<ClCompile>
5757
<Optimization>Disabled</Optimization>
5858
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
59-
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MODULE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
59+
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
6060
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
6161
<RuntimeTypeInfo>true</RuntimeTypeInfo>
6262
<PrecompiledHeader>
@@ -76,7 +76,7 @@
7676
</Midl>
7777
<ClCompile>
7878
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
79-
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MODULE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
79+
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
8080
<RuntimeTypeInfo>true</RuntimeTypeInfo>
8181
<PrecompiledHeader>
8282
</PrecompiledHeader>

‎DeviceAdapters/AgilentLaserCombiner/AgilentLaserCombiner.vcxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
<ClCompile>
5757
<Optimization>Disabled</Optimization>
5858
<AdditionalIncludeDirectories>$(MM_3RDPARTYPRIVATE)\Agilent\LaserCombiner;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
59-
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MODULE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
59+
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
6060
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
6161
<PrecompiledHeader>
6262
</PrecompiledHeader>
@@ -77,7 +77,7 @@
7777
</Midl>
7878
<ClCompile>
7979
<AdditionalIncludeDirectories>$(MM_3RDPARTYPRIVATE)\Agilent\LaserCombiner;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
80-
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MODULE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
80+
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
8181
<PrecompiledHeader>
8282
</PrecompiledHeader>
8383
<DisableSpecificWarnings>4290;%(DisableSpecificWarnings)</DisableSpecificWarnings>

‎DeviceAdapters/Aladdin/Aladdin.vcxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
<ClCompile>
5656
<Optimization>Disabled</Optimization>
5757
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
58-
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MODULE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
58+
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
5959
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
6060
<RuntimeTypeInfo>true</RuntimeTypeInfo>
6161
<PrecompiledHeader>
@@ -75,7 +75,7 @@
7575
</Midl>
7676
<ClCompile>
7777
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
78-
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MODULE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
78+
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
7979
<RuntimeTypeInfo>true</RuntimeTypeInfo>
8080
<PrecompiledHeader>
8181
</PrecompiledHeader>

‎DeviceAdapters/Andor/Andor.vcxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
<ClCompile>
5656
<Optimization>Disabled</Optimization>
5757
<AdditionalIncludeDirectories>$(MM_3RDPARTYPRIVATE)\Andor\SDK 2.95.30003.0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
58-
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MODULE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
58+
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
5959
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
6060
<RuntimeTypeInfo>true</RuntimeTypeInfo>
6161
<PrecompiledHeader>
@@ -76,7 +76,7 @@
7676
</Midl>
7777
<ClCompile>
7878
<AdditionalIncludeDirectories>$(MM_3RDPARTYPRIVATE)\Andor\SDK 2.95.30003.0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
79-
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MODULE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
79+
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
8080
<RuntimeTypeInfo>true</RuntimeTypeInfo>
8181
<PrecompiledHeader>
8282
</PrecompiledHeader>

0 commit comments

Comments
 (0)