From d7fb793b1f5671e1b6f6fbd19b11ae4c3410e738 Mon Sep 17 00:00:00 2001
From: chenzenghui <3045316072@qq.com>
Date: Sat, 14 Jun 2025 17:53:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E5=BA=93=E5=A2=9E=E5=8A=A0?=
=?UTF-8?q?=E9=9D=99=E6=80=81=E7=BC=96=E8=AF=91=E4=B8=8E=E5=8A=A8=E6=80=81?=
=?UTF-8?q?=E7=BC=96=E8=AF=91=E7=BB=93=E5=90=88=E7=9A=84=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
BaseCommonLibrary.vcxproj | 2 +-
BaseTool/BaseConstVariable.h | 21 ++++++++++++---------
2 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/BaseCommonLibrary.vcxproj b/BaseCommonLibrary.vcxproj
index 8e18baf..52f22c0 100644
--- a/BaseCommonLibrary.vcxproj
+++ b/BaseCommonLibrary.vcxproj
@@ -218,7 +218,7 @@
true
true
true
- NDEBUG;BASECOMMONLIBRARY_EXPORTS;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;BASECONSTVARIABLE_API;_SILENCE_NONFLOATING_COMPLEX_DEPRECATION_WARNING;%(PreprocessorDefinitions)
+ NDEBUG;BASECONSTVARIABLE_STATIC_API;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_SILENCE_NONFLOATING_COMPLEX_DEPRECATION_WARNING;%(PreprocessorDefinitions)
true
NotUsing
pch.h
diff --git a/BaseTool/BaseConstVariable.h b/BaseTool/BaseConstVariable.h
index 31ffcf5..33ffd61 100644
--- a/BaseTool/BaseConstVariable.h
+++ b/BaseTool/BaseConstVariable.h
@@ -6,20 +6,23 @@
//#define EIGEN_NO_DEBUG
+#ifndef BASECONSTVARIABLE_STATIC_API
+#ifdef BASECONSTVARIABLE_API
+#define BASECONSTVARIABLEAPI __declspec(dllexport)
+#else
+#define BASECONSTVARIABLEAPI __declspec(dllimport)
+#endif
+#else
+#define BASECONSTVARIABLEAPI
+#endif
+
//#ifdef BASECONSTVARIABLE_API
-//#define BASECONSTVARIABLEAPI __declspec(dllexport)
+//#define BASECONSTVARIABLEAPI
//#else
-//#define BASECONSTVARIABLEAPI __declspec(dllimport)
+//#define BASECONSTVARIABLEAPI
//#endif
-
-#ifdef BASECONSTVARIABLE_API
-#define BASECONSTVARIABLEAPI
-#else
-#define BASECONSTVARIABLEAPI
-#endif
-
/** 定义常见文件格式*********/
#define ENVI_FILE_FORMAT_FILTER u8"ALL File(*.*);;ENVI Bin(*.bin);;ENVI Data(*.dat);;ENVI Data(*.data);;tiff影像(*.tif);;tiff影像(*.tiff)"
#define XML_FILE_FORMAT_FILTER u8"ALL File(*.*);;XML File(*.xml);;tiff影像(*.tiff)"