Browse files

Change VCREDIST version (used by erl R15B)

  • Loading branch information...
1 parent 4f3a3ff commit db2c876ba1ae2f8db8cda7ab13cf6a814b8085d4 @dgud dgud committed Jan 9, 2012
Showing with 8 additions and 8 deletions.
  1. +3 −3 win32/make_installer
  2. +5 −5 win32/wings.nsi
View
6 win32/make_installer
@@ -4,11 +4,11 @@
#
#
-# The pre-built Erlang/OTP R12B-0 for Windows requires this version
-# of the VC80.CRT. It must be updated if future release of Erlang
+# The pre-built Erlang/OTP R15B for Windows requires this version
+# of the VC100.CRT. It must be updated if future release of Erlang
# requires a later version.
#
-WINGS_VCREDIST_VERSION=2.0.50727.4053
+WINGS_VCREDIST_VERSION=10.00.40219.1
OS=`uname -o 2> /dev/null`
if [ X$OS != XMsys ]; then
View
10 win32/wings.nsi
@@ -332,23 +332,23 @@ Function .onInit
SectionSetFlags ${SecWingsClutterDesktop} $0
SectionGetFlags 0 $MYTEMP
-; MessageBox MB_YESNO "Found $SYSDIR\msvcr80.dll" IDYES FoundLbl
- IfFileExists $SYSDIR\msvcr80.dll MaybeFoundInSystemLbl
+; MessageBox MB_YESNO "Found $SYSDIR\msvcr100.dll" IDYES FoundLbl
+ IfFileExists $SYSDIR\msvcr100.dll MaybeFoundInSystemLbl
SearchSxsLbl:
FindFirst $0 $1 $WINDIR\WinSxS\x86*
LoopLbl:
StrCmp $1 "" NotFoundLbl
- IfFileExists $WINDIR\WinSxS\$1\msvcr80.dll MaybeFoundInSxsLbl
+ IfFileExists $WINDIR\WinSxS\$1\msvcr100.dll MaybeFoundInSxsLbl
FindNext $0 $1
Goto LoopLbl
MaybeFoundInSxsLbl:
- GetDllVersion $WINDIR\WinSxS\$1\msvcr80.dll $R0 $R1
+ GetDllVersion $WINDIR\WinSxS\$1\msvcr100.dll $R0 $R1
Call DllVersionGoodEnough
FindNext $0 $1
IntCmp 2 $R0 LoopLbl
Goto FoundLbl
MaybeFoundInSystemLbl:
- GetDllVersion $SYSDIR\msvcr80.dll $R0 $R1
+ GetDllVersion $SYSDIR\msvcr100.dll $R0 $R1
Call DllVersionGoodEnough
IntCmp 2 $R0 SearchSxSLbl
FoundLbl:

0 comments on commit db2c876

Please sign in to comment.