Skip to content

Commit d245022

Browse files
committed
- update to VM for VS2017
- avoid warnings: LINK : warning LNK4075: ignoring '/INCREMENTAL' due to '/OPT:ICF' specification [C:\projects\pynpp\PyNPP.vcxproj] and c:\projects\pynpp\dockingfeature\staticdialog.cpp(83): warning C4996: 'sprintf': This function or variable may be unsafe. Consider using sprintf_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
1 parent 03e58c2 commit d245022

2 files changed

Lines changed: 21 additions & 17 deletions

File tree

PyNPP.vcxproj

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,9 @@
6969
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
7070
<LinkIncremental>true</LinkIncremental>
7171
</PropertyGroup>
72-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
73-
<LinkIncremental>true</LinkIncremental>
74-
</PropertyGroup>
7572
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
7673
<ClCompile>
77-
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;PYNPP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
74+
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;PYNPP_EXPORTS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
7875
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
7976
<WarningLevel>Level3</WarningLevel>
8077
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -90,7 +87,7 @@
9087
</ItemDefinitionGroup>
9188
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
9289
<ClCompile>
93-
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PYNPP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
90+
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PYNPP_EXPORTS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
9491
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
9592
<WarningLevel>Level3</WarningLevel>
9693
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -107,6 +104,7 @@
107104
</ItemDefinitionGroup>
108105
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
109106
<ClCompile>
107+
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;PYNPP_EXPORTS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
110108
<MultiProcessorCompilation>true</MultiProcessorCompilation>
111109
<WarningLevel>Level3</WarningLevel>
112110
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -118,11 +116,14 @@
118116
</ItemDefinitionGroup>
119117
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
120118
<ClCompile>
119+
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PYNPP_EXPORTS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
121120
<MultiProcessorCompilation>true</MultiProcessorCompilation>
122121
<WarningLevel>Level3</WarningLevel>
123122
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
124123
</ClCompile>
125124
<Link>
125+
<EnableCOMDATFolding>true</EnableCOMDATFolding>
126+
<OptimizeReferences>true</OptimizeReferences>
126127
<AdditionalDependencies>shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
127128
<SubSystem>Windows</SubSystem>
128129
</Link>

appveyor.yml

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
version: 1.2.1.{build}
2-
image: Visual Studio 2015
2+
image: Visual Studio 2017
33

44

55
environment:
66
matrix:
77
- PlatformToolset: v140_xp
8+
- PlatformToolset: v141_xp
89

910
platform:
1011
- x64
@@ -17,35 +18,37 @@ configuration:
1718

1819
install:
1920
- if "%platform%"=="x64" set archi=amd64
21+
- if "%platform%"=="x64" set platform_input=x64
22+
2023
- if "%platform%"=="x86" set archi=x86
21-
- call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %archi%
24+
- if "%platform%"=="x86" set platform_input=x86
25+
26+
- if "%PlatformToolset%"=="v140_xp" call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %archi%
27+
- if "%PlatformToolset%"=="v141_xp" call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" %archi%
2228

23-
build:
24-
parallel: true # enable MSBuild parallel builds
25-
verbosity: minimal
2629

2730
build_script:
2831
- cd "%APPVEYOR_BUILD_FOLDER%"
29-
- msbuild PyNPP.sln /m /p:configuration="%configuration%" /p:platform="%platform%" /p:PlatformToolset="%PlatformToolset%" /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
32+
- msbuild PyNPP.sln /m /p:configuration="%configuration%" /p:platform="%platform_input%" /p:PlatformToolset="%PlatformToolset%" /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
3033

3134
after_build:
3235
- cd "%APPVEYOR_BUILD_FOLDER%"
3336
- ps: >-
3437
35-
if ($env:PLATFORM -eq "x64") {
36-
Push-AppveyorArtifact "$env:PLATFORM\$env:CONFIGURATION\PyNPP.dll" -FileName PyNPP.dll
38+
if ($env:PLATFORM_INPUT -eq "x64") {
39+
Push-AppveyorArtifact "$env:PLATFORM_INPUT\$env:CONFIGURATION\PyNPP.dll" -FileName PyNPP.dll
3740
}
3841
39-
if ($env:PLATFORM -eq "x86" ) {
42+
if ($env:PLATFORM_INPUT -eq "x86" ) {
4043
Push-AppveyorArtifact "$env:CONFIGURATION\PyNPP.dll" -FileName PyNPP.dll
4144
}
4245
4346
if ($($env:APPVEYOR_REPO_TAG) -eq "true" -and $env:CONFIGURATION -eq "Release" -and $env:PLATFORMTOOLSET -eq "v140_xp") {
44-
if($env:PLATFORM -eq "x64"){
47+
if($env:PLATFORM_INPUT -eq "x64"){
4548
$ZipFileName = "PyNPP_$($env:APPVEYOR_REPO_TAG_NAME)_x64.zip"
46-
7z a $ZipFileName $env:PLATFORM\$env:CONFIGURATION\PyNPP.dll
49+
7z a $ZipFileName $env:PLATFORM_INPUT\$env:CONFIGURATION\PyNPP.dll
4750
}
48-
if($env:PLATFORM -eq "x86"){
51+
if($env:PLATFORM_INPUT -eq "x86"){
4952
$ZipFileName = "PyNPP_$($env:APPVEYOR_REPO_TAG_NAME)_x86.zip"
5053
7z a $ZipFileName $env:CONFIGURATION\PyNPP.dll
5154
}

0 commit comments

Comments
 (0)