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)"