[Scstudio-commits] SF.net SVN: scstudio:[1905] trunk

[<xf...@us...>]

Revision: 1905
          http://sourceforge.net/p/scstudio/code/1905
Author:   xfarmad
Date:     2014-04-03 09:24:40 +0000 (Thu, 03 Apr 2014)
Log Message:
-----------
FIX: VS2010 dll files redistribute 

Modified Paths:
--------------
    trunk/src/view/visio/scstudio.nsi
    trunk/src/view/visio/setup-nsis/certificates.cpp

Added Paths:
-----------
    trunk/third-party-sw/redistribute/atl100.dll
    trunk/third-party-sw/redistribute/msvcp100.dll
    trunk/third-party-sw/redistribute/msvcr100.dll

Modified: trunk/src/view/visio/scstudio.nsi
===================================================================
--- trunk/src/view/visio/scstudio.nsi	2014-02-23 09:26:33 UTC (rev 1904)
+++ trunk/src/view/visio/scstudio.nsi	2014-04-03 09:24:40 UTC (rev 1905)
@@ -180,15 +180,11 @@
 
   SetOutPath $INSTDIR\bin
   DetailPrint "Installing Microsoft libraries"
-  File "..\..\..\third-party-sw\redistribute\Microsoft.VC90.ATL.manifest"
-  File "..\..\..\third-party-sw\redistribute\Microsoft.VC90.ATL.manifest"
-  File "..\..\..\third-party-sw\redistribute\atl90.dll"
-  File "..\..\..\third-party-sw\redistribute\Microsoft.VC90.CRT.manifest"
-  File "..\..\..\third-party-sw\redistribute\msvcm90.dll"
-  File "..\..\..\third-party-sw\redistribute\msvcp90.dll"
-  File "..\..\..\third-party-sw\redistribute\msvcr90.dll"
+  File "..\..\..\third-party-sw\redistribute\atl100.dll"
+  File "..\..\..\third-party-sw\redistribute\msvcp100.dll"
+  File "..\..\..\third-party-sw\redistribute\msvcr100.dll"
   File "..\..\..\third-party-sw\lpsolve\lib\lpsolve55.dll"
-  File "..\..\..\third-party-sw\redistribute\capicom.dll"
+  File "..\..\..\third-party-sw\redistribute\CapiCom.dll"
   ExecWait 'regsvr32.exe /s "$INSTDIR\capicom.dll"'
 
   SetOutPath $TEMP

Modified: trunk/src/view/visio/setup-nsis/certificates.cpp
===================================================================
--- trunk/src/view/visio/setup-nsis/certificates.cpp	2014-02-23 09:26:33 UTC (rev 1904)
+++ trunk/src/view/visio/setup-nsis/certificates.cpp	2014-04-03 09:24:40 UTC (rev 1905)
@@ -27,7 +27,7 @@
 
 // include Microsoft CAPICOM 2.0
 // http://go.microsoft.com/fwlink/?linkid=84567
-#import "capicom.dll"
+#import "..\..\..\..\third-party-sw\redistribute\capicom.dll"
 
 extern "C" __declspec(dllexport)
 void __cdecl InstallPublisherCertificate(HWND hwndParent,

Added: trunk/third-party-sw/redistribute/atl100.dll
===================================================================
(Binary files differ)

Index: trunk/third-party-sw/redistribute/atl100.dll
===================================================================
--- trunk/third-party-sw/redistribute/atl100.dll	2014-02-23 09:26:33 UTC (rev 1904)
+++ trunk/third-party-sw/redistribute/atl100.dll	2014-04-03 09:24:40 UTC (rev 1905)

Property changes on: trunk/third-party-sw/redistribute/atl100.dll
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/third-party-sw/redistribute/msvcp100.dll
===================================================================
(Binary files differ)

Index: trunk/third-party-sw/redistribute/msvcp100.dll
===================================================================
--- trunk/third-party-sw/redistribute/msvcp100.dll	2014-02-23 09:26:33 UTC (rev 1904)
+++ trunk/third-party-sw/redistribute/msvcp100.dll	2014-04-03 09:24:40 UTC (rev 1905)

Property changes on: trunk/third-party-sw/redistribute/msvcp100.dll
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/third-party-sw/redistribute/msvcr100.dll
===================================================================
(Binary files differ)

Index: trunk/third-party-sw/redistribute/msvcr100.dll
===================================================================
--- trunk/third-party-sw/redistribute/msvcr100.dll	2014-02-23 09:26:33 UTC (rev 1904)
+++ trunk/third-party-sw/redistribute/msvcr100.dll	2014-04-03 09:24:40 UTC (rev 1905)

Property changes on: trunk/third-party-sw/redistribute/msvcr100.dll
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.