DXGL r852 - Code Review

Jump to navigation Jump to search
Repository:DXGL
Revision:< r851‎ | r852 | r853 >
Date:19:49, 2 September 2018
Author:admin
Status:new
Tags:
Comment:
Fix Debug VS2017 build.
Add -msvc10 suffix to installers built with the v100 toolset.
Modified paths:
  • /Installer/dxgl.nsi (modified) (history)
  • /dxgl-nsis/dxgl-nsis.vcxproj (modified) (history)

Diff [purge]

Index: Installer/dxgl.nsi
——@@ -101,6 +101,7 @@
102102 !define runtime_sha512 "D2D99E06D49A5990B449CF31D82A33104A6B45164E76FBEB34C43D10BCD25C3622AF52E59A2D4B7F5F45F83C3BA4D23CF1A5FC0C03B3606F42426988E63A9770"
103103 !define runtime_regkey SOFTWARE\Microsoft\VisualStudio\10.0\VC\VCRedist\x86
104104 !define runtime_regvalue Installed
 105+!define PRODUCT_SUFFIX "-msvc10"
105106 !else if ${COMPILER} == "VC2013"
106107 !define download_runtime 1
107108 !define runtime_url "http://www.dxgl.info/download/runtimes/vc12/vcredist_x86.exe"
——@@ -109,6 +110,7 @@
110111 !define runtime_sha512 "729251371ED208898430040FE48CABD286A5671BD7F472A30E9021B68F73B2D49D85A0879920232426B139520F7E21321BA92646985216BF2F733C64E014A71D"
111112 !define runtime_regkey SOFTWARE\Microsoft\DevDiv\vc\Servicing\12.0\RuntimeMinimum
112113 !define runtime_regvalue Install
 114+!define PRODUCT_SUFFIX "-msvc12"
113115 !else if ${COMPILER} == "VC2017_8"
114116 !define download_runtime 1
115117 !define runtime_url http://www.dxgl.info/download/runtimes/vc14.15/vc_redist.x86.exe
——@@ -118,6 +120,7 @@
119121 !define runtime_regkey SOFTWARE\Microsoft\DevDiv\vc\Servicing\14.0\RuntimeMinimum
120122 !define runtime_regvalue Install
121123 !define runtime_regvalue2 Version
 124+!define PRODUCT_SUFFIX ""
122125 !else
123126 !define download_runtime 0
124127 !endif
——@@ -131,9 +134,9 @@
132135 !endif
133136 !ifdef _BETA
134137 !ifdef _DEBUG
135 -OutFile "DXGL-${PRODUCT_VERSION}-Pre-${PRODUCT_REVISION}-win32-Debug.exe"
 138+OutFile "DXGL-${PRODUCT_VERSION}-Pre-${PRODUCT_REVISION}-win32-Debug${PRODUCT_SUFFIX}.exe"
136139 !else
137 -OutFile "DXGL-${PRODUCT_VERSION}-Pre-${PRODUCT_REVISION}-win32.exe"
 140+OutFile "DXGL-${PRODUCT_VERSION}-Pre-${PRODUCT_REVISION}-win32${PRODUCT_SUFFIX}.exe"
138141 !endif
139142 !else
140143 !ifdef _DEBUG
Index: dxgl-nsis/dxgl-nsis.vcxproj
——@@ -109,6 +109,7 @@
110110 <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;SHA512NSIS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
111111 <BufferSecurityCheck>false</BufferSecurityCheck>
112112 <BasicRuntimeChecks>Default</BasicRuntimeChecks>
 113+ <SupportJustMyCode>false</SupportJustMyCode>
113114 </ClCompile>
114115 <Link>
115116 <SubSystem>Windows</SubSystem>
Retrieved from "https://dxgl.org/wiki/Special:Code/DXGL/852"