فهرست منبع

Fixes the DLL type and flags and builds the debug version of the
DLL if required.

oldfaber 12 سال پیش
والد
کامیت
eab0c89c5d
2فایلهای تغییر یافته به همراه15 افزوده شده و 15 حذف شده
  1. 14 14
      src/win32/modbus.rc
  2. 1 1
      src/win32/modbus.vcproj

+ 14 - 14
src/win32/modbus.rc

@@ -9,8 +9,13 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 VS_VERSION_INFO VERSIONINFO
 FILEVERSION LIBMODBUS_VERSION_MAJOR, LIBMODBUS_VERSION_MINOR, LIBMODBUS_VERSION_MICRO, 2
 PRODUCTVERSION LIBMODBUS_VERSION_MAJOR, LIBMODBUS_VERSION_MINOR, LIBMODBUS_VERSION_MICRO, 2
+#if defined(DEBUG) || defined(W32DEBUG)
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
 FILEOS VOS_NT_WINDOWS32
-FILETYPE VFT_APP
+FILETYPE VFT_DLL
 {
  BLOCK "StringFileInfo"
  {
@@ -18,28 +23,23 @@ FILETYPE VFT_APP
   {
    VALUE "CompanyName", "\x0"
    VALUE "FileDescription", "libmodbus DLL\x0"
-#if defined(DEBUG) || defined(W32DEBUG)
-# define XDBG   " (debug)"
-#else
-# define XDBG   ""
-#endif
 #if defined(__MINGW32__) && !defined(__MINGW64__)
-   VALUE "FileVersion", VERSTRING " (gcc)" XDBG "\x0"
+   VALUE "FileVersion", VERSTRING " (gcc)"
 #endif
 #if defined(__MINGW64__)
-   VALUE "FileVersion", VERSTRING " (gcc64)" XDBG "\x0"
+   VALUE "FileVersion", VERSTRING " (gcc64)"
 #endif
 #if defined(_MSC_VER)
 # if defined(MSC64)
-   VALUE "FileVersion", VERSTRING " (cl64)" XDBG "\x0"
+   VALUE "FileVersion", VERSTRING " (cl64)"
 # else
-   VALUE "FileVersion", VERSTRING " (cl)" XDBG "\x0"
+   VALUE "FileVersion", VERSTRING " (cl)"
 # endif
 #endif
-   VALUE "InternalName", "modbus.dll\x0"
-   VALUE "LegalCopyright", "© See libmodbus.org\x0"
-   VALUE "OriginalFilename", "modbus.dll\x0"
-   VALUE "ProductName", "libmodbus\x0"
+   VALUE "InternalName", "modbus.dll"
+   VALUE "LegalCopyright", "© See libmodbus.org"
+   VALUE "OriginalFilename", "modbus.dll"
+   VALUE "ProductName", "libmodbus"
   }
  }
  BLOCK "VarFileInfo"

+ 1 - 1
src/win32/modbus.vcproj

@@ -53,7 +53,7 @@
 				EnableIntrinsicFunctions="true"
 				WholeProgramOptimization="false"
 				AdditionalIncludeDirectories="..\src;..;.;D:/include/msvc_std"
-				PreprocessorDefinitions="HAVE_CONFIG_H;DLLBUILD;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NONSTDC_NO_DEPRECATE=1"
+				PreprocessorDefinitions="W32DEBUG;HAVE_CONFIG_H;DLLBUILD;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NONSTDC_NO_DEPRECATE=1"
 				MinimalRebuild="false"
 				ExceptionHandling="0"
 				BasicRuntimeChecks="2"