From a19fcecb11c5f99a8035d8f3d4498ee7569f0fad Mon Sep 17 00:00:00 2001 From: Tyill Date: Thu, 26 Mar 2020 00:29:29 +0500 Subject: [PATCH] Other -win32 repair --- mswin/VS12/SVExportPanel/SVExportPanel.vcxproj | 10 +++++----- mswin/VS12/SVServer/SVServer.vcxproj | 4 ++-- src/SVConfig/SVConfigLimits.h | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/mswin/VS12/SVExportPanel/SVExportPanel.vcxproj b/mswin/VS12/SVExportPanel/SVExportPanel.vcxproj index 980ac54..92cb72d 100644 --- a/mswin/VS12/SVExportPanel/SVExportPanel.vcxproj +++ b/mswin/VS12/SVExportPanel/SVExportPanel.vcxproj @@ -28,16 +28,16 @@ Moc%27ing exportPanel.h... .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -DSVEXPORTPANEL_LIB -D_WINDLL "-I$(SolutionDir)..\..\src" "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -DSVEXPORTPANEL_LIB -D_WINDLL "-I$(SolutionDir)..\..\src" "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DUSE_QtXlsxWriter -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -DSVEXPPANEL_EXPORTS "-D\"$(INHERIT)\"" -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -DWIN32_LEAN_AND_MEAN -D_WINDLL "-I$(SolutionDir)..\..\src" "-I$(SolutionDir)..\..\src\SVExportPanel" "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -DUSE_QtXlsxWriter -DSVEXPPANEL_EXPORTS -D_WINDLL "-I$(SolutionDir)..\..\src" "-I$(SolutionDir)..\..\src\SVExportPanel" "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" $(QTDIR)\bin\moc.exe;%(FullPath) $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing exportPanel.h... Moc%27ing exportPanel.h... .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -DSVEXPORTPANEL_LIB -D_WINDLL "-I$(SolutionDir)..\..\src" "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -DSVEXPORTPANEL_LIB -D_WINDLL "-I$(SolutionDir)..\..\src" "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DUSE_QtXlsxWriter -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -DSVEXPPANEL_EXPORTS "-D\"$(INHERIT)\"" -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -DWIN32_LEAN_AND_MEAN -D_WINDLL "-I$(SolutionDir)..\..\src" "-I$(SolutionDir)..\..\src\SVExportPanel" "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_NO_DEBUG -DUSE_QtXlsxWriter -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -DSVEXPPANEL_EXPORTS -D_WINDLL "-I$(SolutionDir)..\..\src" "-I$(SolutionDir)..\..\src\SVExportPanel" "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" @@ -242,7 +242,7 @@ - + \ No newline at end of file diff --git a/mswin/VS12/SVServer/SVServer.vcxproj b/mswin/VS12/SVServer/SVServer.vcxproj index c5069ea..73347bc 100644 --- a/mswin/VS12/SVServer/SVServer.vcxproj +++ b/mswin/VS12/SVServer/SVServer.vcxproj @@ -126,7 +126,7 @@ NotUsing Level3 Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;SVSRVDLL_EXPORTS;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;_USRDLL;SVSRVDLL_EXPORTS;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions) $(SolutionDir)../../src @@ -162,7 +162,7 @@ MaxSpeed true true - WIN32;NDEBUG;_WINDOWS;_USRDLL;SVSRVDLL_EXPORTS;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;_USRDLL;SVSRVDLL_EXPORTS;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions) $(SolutionDir)../../src diff --git a/src/SVConfig/SVConfigLimits.h b/src/SVConfig/SVConfigLimits.h index 90e1ceb..6930d9e 100644 --- a/src/SVConfig/SVConfigLimits.h +++ b/src/SVConfig/SVConfigLimits.h @@ -24,7 +24,7 @@ // #pragma once -//#define SV_EN ///< eng интерфейс +#define SV_EN ///< eng интерфейс #define SV_VALUE_MAX_CNT 2048 ///< макс кол-во сигналов (на все модули) #define SV_CYCLEREC_MS cng.cycleRecMs ///< период записи сигналов, мс