Skip to content

Commit b0627e3

Browse files
committed
use PRE_RELEASE=PRE_RELEASE environment variable
1 parent 5cee20e commit b0627e3

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

MUSHclient.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ BOOL CMUSHclientApp::InitInstance()
235235

236236
MUSHCLIENT_VERSION = VERSION_STRING;
237237

238-
#if _MSC_VER == 1900 // 1200 for Visual Studio 6, 1900 for MSVC 2015
238+
#ifdef PRE_RELEASE
239239
MUSHCLIENT_VERSION += "-pre";
240240
#endif
241241

MUSHclient.vcxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@
122122
<Optimization>MaxSpeed</Optimization>
123123
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
124124
<AdditionalIncludeDirectories>$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
125-
<PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;ZLIB_DLL;LUA51;_CRT_SECURE_NO_WARNINGS;_CRT_NON_CONFORMING_SWPRINTFS;NO_WARN_MBCS_MFC_DEPRECATION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
125+
<PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;ZLIB_DLL;LUA51;_CRT_SECURE_NO_WARNINGS;_CRT_NON_CONFORMING_SWPRINTFS;NO_WARN_MBCS_MFC_DEPRECATION;$(PRE_RELEASE);%(PreprocessorDefinitions)</PreprocessorDefinitions>
126126
<StringPooling>true</StringPooling>
127127
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
128128
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -1446,4 +1446,4 @@
14461446
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
14471447
<ImportGroup Label="ExtensionTargets">
14481448
</ImportGroup>
1449-
</Project>
1449+
</Project>

appveyor.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,17 @@ branches:
44
- master
55
skip_tags: true
66
configuration: Release
7+
environment:
8+
auth_token:
9+
secure: SKQr480MzNJLzmyrFxDeMta2nHica+9ed2n1Djpa53ioURK0NLo/iStu9DhUrQIK
10+
PRE_RELEASE: PRE_RELEASE
711
build:
812
project: MUSHclient_2015.sln
913
parallel: true
1014
verbosity: normal
1115
artifacts:
1216
- path: WinRel\MUSHclient.exe
1317
name: release_exe
14-
environment:
15-
auth_token:
16-
secure: SKQr480MzNJLzmyrFxDeMta2nHica+9ed2n1Djpa53ioURK0NLo/iStu9DhUrQIK
1718
before_deploy:
1819
- git config --global credential.helper store
1920
- ps: Add-Content "$env:USERPROFILE\.git-credentials" "https://$($env:auth_token):x-oauth-basic@github.com`n"

0 commit comments

Comments
 (0)