git-svn-id:...

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@52406 954022d7-b5bf-4e40-9824-e11837661b57

.gitattributes

@@ -410,6 +410,8 @@ OfficeCore/Test/TestConsole/bin/Release/Interop.OfficeCore.dll svn_mime_002dtype
 OfficeCore/Test/TestConsole/bin/Release/TestConsole.exe svn_mime_002dtype=application%2Foctet-stream
 OfficeCore/Test/TestConsole/bin/Release/TestConsole.pdb svn_mime_002dtype=application%2Foctet-stream
 Redist/ASCFontConverter.dll svn_mime_002dtype=application%2Foctet-stream
+Redist/ASCMediaCore3.dll svn_mime_002dtype=application%2Foctet-stream
+Redist/ASCMediaFormatSettings3.dll svn_mime_002dtype=application%2Foctet-stream
 Redist/ASCOfficeDocxFile2.dll svn_mime_002dtype=application%2Foctet-stream
 Redist/ASCOfficeRtfFile.dll svn_mime_002dtype=application%2Foctet-stream
 Redist/ASCOfficeUtils.dll svn_mime_002dtype=application%2Foctet-stream

ASCMediaCore3/ASCMediaCore3.rc

@@ -2,7 +2,7 @@
 //
 #include "resource.h"
 #define COMPONENT_NAME "MediaCore3"
-#include "FileInfo.h"
+#include "../Common/FileInfo.h"
 #include "version.h"
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////

ASCMediaCore3/ASCMediaCore3.vcproj

@@ -232,7 +232,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="..\..\..\Redist\VersionControl.exe &quot;$(ProjectDir)\version.h&quot;"
+				CommandLine="..\Redist\VersionControl.exe &quot;$(ProjectDir)\version.h&quot;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -319,7 +319,7 @@
 			<Tool
 				Name="VCPostBuildEventTool"
 				Description="Performing registration"
-				CommandLine="regsvr32 /s /c &quot;$(TargetPath)&quot;"
+				CommandLine="regsvr32 /s /c &quot;$(TargetPath)&quot;&#x0D;&#x0A;copy &quot;$(TargetPath)&quot; &quot;../Redist/&quot;"
 			/>
 		</Configuration>
 		<Configuration
@@ -749,11 +749,11 @@
 			Name="Common Files"
 			>
 			<File
-				RelativePath="..\..\..\..\Common\ATLDefine.h"
+				RelativePath="..\Common\ASCVideoStudio3ID.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Common\ASCVideoStudio3ID.h"
+				RelativePath="..\..\..\..\Common\ATLDefine.h"
 				>
 			</File>
 			<File

ASCMediaCore3/version.h

@@ -2,6 +2,6 @@
 //1
 //0
 //1
-//667
-#define INTVER 1,0,1,667
-#define STRVER "1,0,1,667\0"
+//668
+#define INTVER 1,0,1,668
+#define STRVER "1,0,1,668\0"

ASCMediaFormatSettings3/ASCMediaFormatSettings3.vcproj

@@ -228,7 +228,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="..\..\..\Redist\VersionControl.exe $(ProjectDir)version.h"
+				CommandLine="..\Redist\VersionControl.exe $(ProjectDir)version.h"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -314,7 +314,7 @@
 			<Tool
 				Name="VCPostBuildEventTool"
 				Description="Performing registration"
-				CommandLine="regsvr32 /s /c &quot;$(TargetPath)&quot;"
+				CommandLine="regsvr32 /s /c &quot;$(TargetPath)&quot;&#x0D;&#x0A;copy &quot;$(TargetPath)&quot; &quot;../Redist&quot;"
 			/>
 		</Configuration>
 		<Configuration
@@ -745,19 +745,19 @@
 				Name="common"
 				>
 				<File
-					RelativePath="..\..\..\..\Common\ATLDefine.h"
+					RelativePath="..\Common\ASCUtils.h"
 					>
 				</File>
 				<File
-					RelativePath="..\Common\AudioGlobal.cpp"
+					RelativePath="..\Common\ASCVideoStudio3ID.h"
 					>
 				</File>
 				<File
-					RelativePath="..\Common\ASCUtils.h"
+					RelativePath="..\..\..\..\Common\ATLDefine.h"
 					>
 				</File>
 				<File
-					RelativePath="..\Common\ASCVideoStudio3ID.h"
+					RelativePath="..\Common\AudioGlobal.cpp"
 					>
 				</File>
 				<File

ASCMediaFormatSettings3/version.h

@@ -2,6 +2,6 @@
 //1
 //1
 //2
-//401
-#define INTVER 1,1,2,401
-#define STRVER "1,1,2,401\0"
+//404
+#define INTVER 1,1,2,404
+#define STRVER "1,1,2,404\0"