diff --git a/build/771mod.vcxproj b/build/771mod.vcxproj index 40e9df000..4c55ec715 100644 --- a/build/771mod.vcxproj +++ b/build/771mod.vcxproj @@ -284,14 +284,6 @@ - - - true - - - true - - Document diff --git a/build/771mod.vcxproj.filters b/build/771mod.vcxproj.filters index 43e224e68..6b1c33ef8 100644 --- a/build/771mod.vcxproj.filters +++ b/build/771mod.vcxproj.filters @@ -215,10 +215,6 @@ - - - - Forms diff --git a/build/772mod.vcxproj b/build/772mod.vcxproj index 2adafeafb..d7d62188d 100644 --- a/build/772mod.vcxproj +++ b/build/772mod.vcxproj @@ -239,15 +239,6 @@ - - - Document - true - - - true - - {2d38a763-3d74-4338-9362-b891784ec90e} diff --git a/build/772mod.vcxproj.filters b/build/772mod.vcxproj.filters index 007e43e66..2b372def7 100644 --- a/build/772mod.vcxproj.filters +++ b/build/772mod.vcxproj.filters @@ -102,8 +102,4 @@ - - - - \ No newline at end of file diff --git a/build/773mod.vcxproj b/build/773mod.vcxproj index d90fe3c80..7e9874954 100644 --- a/build/773mod.vcxproj +++ b/build/773mod.vcxproj @@ -203,12 +203,6 @@ - - - true - - - {2d38a763-3d74-4338-9362-b891784ec90e} diff --git a/build/773mod.vcxproj.filters b/build/773mod.vcxproj.filters index bacae8b2a..a12af4103 100644 --- a/build/773mod.vcxproj.filters +++ b/build/773mod.vcxproj.filters @@ -44,8 +44,4 @@ - - - - \ No newline at end of file diff --git a/build/774.vcxproj b/build/774.vcxproj index 8af50dd11..af7fc0b5e 100644 --- a/build/774.vcxproj +++ b/build/774.vcxproj @@ -198,14 +198,6 @@ - - - true - - - true - - {2d38a763-3d74-4338-9362-b891784ec90e} diff --git a/build/774.vcxproj.filters b/build/774.vcxproj.filters index d51e0c3b9..7a6845e62 100644 --- a/build/774.vcxproj.filters +++ b/build/774.vcxproj.filters @@ -44,8 +44,4 @@ - - - - \ No newline at end of file diff --git a/build/775.vcxproj b/build/775.vcxproj index 985d2a800..95da34756 100644 --- a/build/775.vcxproj +++ b/build/775.vcxproj @@ -181,15 +181,6 @@ true - - - true - - - Document - true - - diff --git a/build/775.vcxproj.filters b/build/775.vcxproj.filters index f52e7d8a5..e5ac7af28 100644 --- a/build/775.vcxproj.filters +++ b/build/775.vcxproj.filters @@ -29,10 +29,6 @@ Masks - - - - diff --git a/build/Authoriz.vcxproj b/build/Authoriz.vcxproj index c3f5a345d..d0628b038 100644 --- a/build/Authoriz.vcxproj +++ b/build/Authoriz.vcxproj @@ -297,9 +297,6 @@ - - - {1991f7f5-2e5a-4985-a328-744d5e8ab770} diff --git a/build/Authoriz.vcxproj.filters b/build/Authoriz.vcxproj.filters index 3224ffd6e..a2f9395eb 100644 --- a/build/Authoriz.vcxproj.filters +++ b/build/Authoriz.vcxproj.filters @@ -51,7 +51,4 @@ - - - \ No newline at end of file diff --git a/build/Ba7.vcxproj b/build/Ba7.vcxproj index 158dd870d..a730d7c3a 100644 --- a/build/Ba7.vcxproj +++ b/build/Ba7.vcxproj @@ -181,14 +181,12 @@ - - diff --git a/build/Ba7.vcxproj.filters b/build/Ba7.vcxproj.filters index fa4979315..b4ab3c100 100644 --- a/build/Ba7.vcxproj.filters +++ b/build/Ba7.vcxproj.filters @@ -44,9 +44,6 @@ Masks - - Masks - @@ -61,9 +58,6 @@ Headers - - Headers - diff --git a/build/Cacnv.vcxproj b/build/Cacnv.vcxproj index 0b04d558b..74068d3c7 100644 --- a/build/Cacnv.vcxproj +++ b/build/Cacnv.vcxproj @@ -180,6 +180,7 @@ %(PreprocessorDefinitions) + diff --git a/build/Cacnv.vcxproj.filters b/build/Cacnv.vcxproj.filters index 25f9ff84b..d700756aa 100644 --- a/build/Cacnv.vcxproj.filters +++ b/build/Cacnv.vcxproj.filters @@ -36,6 +36,9 @@ Sources + + Sources + diff --git a/build/CampoRules.props b/build/CampoRules.props index 45512f094..a8e4a8056 100644 --- a/build/CampoRules.props +++ b/build/CampoRules.props @@ -259,35 +259,19 @@ - Midl - CustomBuild + Condition="'$(SrcCompilerBeforeTargets)' == '' and '$(SrcCompilerAfterTargets)' == '' and '$(ConfigurationType)' != 'Makefile'"> + Midl + CustomBuild - _SelectedFiles;$(SrcDebugCompilerDependsOn) + _SelectedFiles;$(SrcCompilerDependsOn) - + ini32 %(FullPath) $(TargetDir)%(Filename).ini $(TargetDir)%(Filename).ini Compiling %(Filename) to $(TargetDir) - - - - Midl - CustomBuild - - - _SelectedFiles;$(SrcReleaseCompilerDependsOn) - - - - ini32r %(FullPath) $(TargetDir)%(Filename).ini - $(TargetDir)%(Filename).ini - Compiling %(Filename) to $(TargetDir) - + \ No newline at end of file diff --git a/build/CampoRules.rules b/build/CampoRules.rules index a2753168a..87457db7c 100644 --- a/build/CampoRules.rules +++ b/build/CampoRules.rules @@ -183,8 +183,8 @@ - - - - diff --git a/build/CampoRules.targets b/build/CampoRules.targets index 79de1af99..7c07bae1b 100644 --- a/build/CampoRules.targets +++ b/build/CampoRules.targets @@ -68,12 +68,8 @@ _DatCompiler - _SrcDebugCompiler - - - _SrcReleaseCompiler + Include="SrcCompiler"> + _SrcCompiler $(MSBuildThisFileDirectory)$(MSBuildThisFileName).xml - $(MSBuildThisFileDirectory)$(MSBuildThisFileName).xml - - $(MSBuildThisFileDirectory)$(MSBuildThisFileName).xml @@ -1209,131 +1199,67 @@ Directories="@(DatCompilerDirsToMake->'%(RootDir)%(Directory)')" /> + Name="_SrcCompiler" + BeforeTargets="$(SrcCompilerBeforeTargets)" + AfterTargets="$(SrcCompilerAfterTargets)" + Condition="'@(SrcCompiler)' != ''" + DependsOnTargets="$(SrcCompilerDependsOn);ComputeSrcCompilerOutput" + Outputs="%(SrcCompiler.Outputs)" + Inputs="%(SrcCompiler.Identity);%(SrcDebugCompiler.AdditionalDependencies);$(MSBuildProjectFile)"> - - - @(SrcDebugCompiler, '|') - + + @(SrcCompiler, '|') + + Text="%(SrcCompiler.ExecutionDescription)" /> - + Lines="^%(SrcCompiler_tlog.Source);@(SrcCompiler_tlog->'%(Fullpath)')" /> + $(ComputeLinkInputsTargets); - ComputeSrcDebugCompilerOutput; + ComputeSrcCompilerOutput; $(ComputeLibInputsTargets); - ComputeSrcDebugCompilerOutput; + ComputeSrcCompilerOutput; + Name="ComputeSrcCompilerOutput" + Condition="'@(SrcCompiler)' != ''"> - + - - - - - - - - @(SrcReleaseCompiler, '|') - - - - - - - - - $(ComputeLinkInputsTargets); - ComputeSrcReleaseCompilerOutput; - - - $(ComputeLibInputsTargets); - ComputeSrcReleaseCompilerOutput; - - - - - - - - - - + Directories="@(SrcCompilerDirsToMake->'%(RootDir)%(Directory)')" /> \ No newline at end of file diff --git a/build/CampoRules.xml b/build/CampoRules.xml index 7b21ccf08..0de28ee5c 100644 --- a/build/CampoRules.xml +++ b/build/CampoRules.xml @@ -1985,14 +1985,14 @@ DisplayName="Dat Compiler" ItemType="DatCompiler" /> + ItemType="SrcCompiler" /> @@ -2027,7 +2027,7 @@ Visible="False" IncludeInCommandLine="False" /> @@ -2040,7 +2040,7 @@ + Value="^SrcCompilerBeforeTargets|^Compute" /> @@ -2062,7 +2062,7 @@ + Value="^SrcCompilerAfterTargets|^Compute" /> + Name="SrcCompiler" + DisplayName="Profile Compiler" /> + ContentType="SrcCompiler" /> - - - - - - - - General - - - - - Command Line - - - - - - - - - - - - Execute Before - - - Specifies the targets for the build customization to run before. - - - - - - - - - - - Execute After - - - Specifies the targets for the build customization to run after. - - - - - - - - - - - - - - Additional Options - - - Additional Options - - - - - - - \ No newline at end of file + ItemType="SrcCompiler" /> + \ No newline at end of file diff --git a/build/In0.vcxproj b/build/In0.vcxproj index 110bc5360..d00ca0eec 100644 --- a/build/In0.vcxproj +++ b/build/In0.vcxproj @@ -263,10 +263,9 @@ - - true - - + + {2d38a763-3d74-4338-9362-b891784ec90e} + diff --git a/build/In0.vcxproj.filters b/build/In0.vcxproj.filters index 6f2ecd1b7..0e8d687e9 100644 --- a/build/In0.vcxproj.filters +++ b/build/In0.vcxproj.filters @@ -208,8 +208,4 @@ Txts - - - - \ No newline at end of file diff --git a/build/PATCHDEF.EXE b/build/PATCHDEF.EXE index b9bb7b1f8..4998c9544 100644 Binary files a/build/PATCHDEF.EXE and b/build/PATCHDEF.EXE differ diff --git a/build/Sc0.vcxproj b/build/Sc0.vcxproj index c90b49bbf..bfb9bab5f 100644 --- a/build/Sc0.vcxproj +++ b/build/Sc0.vcxproj @@ -73,7 +73,7 @@ $(IntDir) Level3 true - EditAndContinue + ProgramDatabase NDEBUG;%(PreprocessorDefinitions) diff --git a/build/Sc1.vcxproj b/build/Sc1.vcxproj index c744e1273..7df98f98d 100644 --- a/build/Sc1.vcxproj +++ b/build/Sc1.vcxproj @@ -120,7 +120,7 @@ .\..\release/ Level3 true - EditAndContinue + ProgramDatabase NDEBUG;%(PreprocessorDefinitions) diff --git a/build/Sc3.vcxproj b/build/Sc3.vcxproj index b7276e64d..085d4c449 100644 --- a/build/Sc3.vcxproj +++ b/build/Sc3.vcxproj @@ -179,6 +179,11 @@ + + + {2d38a763-3d74-4338-9362-b891784ec90e} + + diff --git a/build/ab2.vcxproj b/build/ab2.vcxproj index 9d194c28b..55ba89b4f 100644 --- a/build/ab2.vcxproj +++ b/build/ab2.vcxproj @@ -195,14 +195,6 @@ true - - - Document - - - Document - - diff --git a/build/ba.sln b/build/ba.sln index 5ff52c5ea..75a76e3ca 100644 --- a/build/ba.sln +++ b/build/ba.sln @@ -27,8 +27,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Bainst", "Bainst.vcxproj", EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SetCmpUp", "setup.vcxproj", "{59D7EE36-6D12-4A17-AB39-0CDDFDE6DE14}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fastrip", "fastrip.vcxproj", "{68251613-3B9A-4F87-9F40-827C46267ADE}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "autorun", "autorun.vcxproj", "{D748A0B3-109B-4315-B121-79C09A01E2B0}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SSAservice", "SSAservice.vcxproj", "{DE70E2D1-6A4D-4984-BD82-CE750889F0D3}" @@ -127,12 +125,6 @@ Global {59D7EE36-6D12-4A17-AB39-0CDDFDE6DE14}.Release|Win32.ActiveCfg = Release|Win32 {59D7EE36-6D12-4A17-AB39-0CDDFDE6DE14}.Release|Win32.Build.0 = Release|Win32 {59D7EE36-6D12-4A17-AB39-0CDDFDE6DE14}.Release|x64.ActiveCfg = Release|Win32 - {68251613-3B9A-4F87-9F40-827C46267ADE}.Debug|Win32.ActiveCfg = Debug|Win32 - {68251613-3B9A-4F87-9F40-827C46267ADE}.Debug|Win32.Build.0 = Debug|Win32 - {68251613-3B9A-4F87-9F40-827C46267ADE}.Debug|x64.ActiveCfg = Debug|Win32 - {68251613-3B9A-4F87-9F40-827C46267ADE}.Release|Win32.ActiveCfg = Release|Win32 - {68251613-3B9A-4F87-9F40-827C46267ADE}.Release|Win32.Build.0 = Release|Win32 - {68251613-3B9A-4F87-9F40-827C46267ADE}.Release|x64.ActiveCfg = Release|Win32 {D748A0B3-109B-4315-B121-79C09A01E2B0}.Debug|Win32.ActiveCfg = Debug|Win32 {D748A0B3-109B-4315-B121-79C09A01E2B0}.Debug|Win32.Build.0 = Debug|Win32 {D748A0B3-109B-4315-B121-79C09A01E2B0}.Debug|x64.ActiveCfg = Debug|Win32 diff --git a/build/bs0.vcxproj b/build/bs0.vcxproj index 3bb29432a..7b5a566b1 100644 --- a/build/bs0.vcxproj +++ b/build/bs0.vcxproj @@ -171,6 +171,7 @@ + diff --git a/build/bs0.vcxproj.filters b/build/bs0.vcxproj.filters index ca57840e2..23f6642f9 100644 --- a/build/bs0.vcxproj.filters +++ b/build/bs0.vcxproj.filters @@ -38,6 +38,9 @@ Sources + + Sources + diff --git a/build/ca2.vcxproj b/build/ca2.vcxproj index 3d8b9c4c3..709826337 100644 --- a/build/ca2.vcxproj +++ b/build/ca2.vcxproj @@ -173,7 +173,6 @@ - %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) diff --git a/build/ca2.vcxproj.filters b/build/ca2.vcxproj.filters index b0384dffa..b41b843ad 100644 --- a/build/ca2.vcxproj.filters +++ b/build/ca2.vcxproj.filters @@ -56,6 +56,9 @@ Masks + + Masks + @@ -91,11 +94,11 @@ Headers + + Headers + - - - \ No newline at end of file diff --git a/build/ce1.vcxproj b/build/ce1.vcxproj index 0353f1355..080926a22 100644 --- a/build/ce1.vcxproj +++ b/build/ce1.vcxproj @@ -38,7 +38,7 @@ <_ProjectFileVersion>10.0.30319.1 - ,,\exe\ + ..\exe\ ..\obj\ true ..\exe\ @@ -68,7 +68,7 @@ Level3 true false - EditAndContinue + ProgramDatabase $(IntDir) diff --git a/build/ce2.vcxproj b/build/ce2.vcxproj index 0f66a9913..71fccf9cc 100644 --- a/build/ce2.vcxproj +++ b/build/ce2.vcxproj @@ -121,7 +121,7 @@ Level3 true false - EditAndContinue + ProgramDatabase $(IntDir) diff --git a/build/ce3.vcxproj b/build/ce3.vcxproj index d233fe79d..25325f664 100644 --- a/build/ce3.vcxproj +++ b/build/ce3.vcxproj @@ -68,7 +68,7 @@ Level3 true false - EditAndContinue + ProgramDatabase $(IntDir) @@ -349,8 +349,9 @@ - - + + Designer + diff --git a/build/ce3.vcxproj.filters b/build/ce3.vcxproj.filters index ae2be2a24..b2c32a50e 100644 --- a/build/ce3.vcxproj.filters +++ b/build/ce3.vcxproj.filters @@ -137,9 +137,6 @@ Reports - - Reports - diff --git a/build/ce4.vcxproj b/build/ce4.vcxproj index 16e1fe2ea..e745bac5d 100644 --- a/build/ce4.vcxproj +++ b/build/ce4.vcxproj @@ -122,7 +122,7 @@ false Level3 true - EditAndContinue + ProgramDatabase $(IntDir) diff --git a/build/cg.sln b/build/cg.sln index 4845dd10b..1d0a30bbb 100644 --- a/build/cg.sln +++ b/build/cg.sln @@ -27,8 +27,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pdflibwrap", "pdflibwrap.vc EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Cb6", "Cb6.vcxproj", "{99683594-420F-4DD9-BB41-7DC48278B931}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{1D3A7EB6-3C70-4D26-AAEF-7BBBC7E7457B}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gfm", "gfm.vcxproj", "{37C3DDAE-3A63-4C1C-A419-242141B262ED}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pdflib", "pdflib_dll.vcxproj", "{A294C667-27A9-4125-82AF-5093447505EC}" diff --git a/build/ci0.vcxproj b/build/ci0.vcxproj index 1cfd6902f..bc9e0c207 100644 --- a/build/ci0.vcxproj +++ b/build/ci0.vcxproj @@ -42,7 +42,7 @@ ..\obj\ true ..\exe\ - --\obj\ + ..\obj\ true false false @@ -123,7 +123,7 @@ $(IntDir) Level3 true - EditAndContinue + ProgramDatabase NDEBUG;%(PreprocessorDefinitions) @@ -135,7 +135,7 @@ $(OutDir)$(TargetName)$(TargetExt) true %(IgnoreSpecificDefaultLibraries) - $(IntDir) + ($IntDir) Windows diff --git a/build/ci1.vcxproj b/build/ci1.vcxproj index 229ca9b86..af20bf550 100644 --- a/build/ci1.vcxproj +++ b/build/ci1.vcxproj @@ -39,7 +39,7 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - --\obj\ + ..\obj\ true false false @@ -116,7 +116,7 @@ .\..\release/ci1.pch Level3 true - EditAndContinue + ProgramDatabase NDEBUG;%(PreprocessorDefinitions) @@ -128,13 +128,13 @@ $(OutDir)$(TargetName)$(TargetExt) true %(IgnoreSpecificDefaultLibraries) - .\..\release/ci1.pdb + $(IntDir) Windows MachineX86 12.0 - $(IntDir) + false $(IntDir) diff --git a/build/ci2.vcxproj b/build/ci2.vcxproj index fb4c43808..c810d2661 100644 --- a/build/ci2.vcxproj +++ b/build/ci2.vcxproj @@ -40,7 +40,7 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ ..\exe\ - --\obj\ + ..\obj\ true false false @@ -119,7 +119,7 @@ $(IntDir) Level3 true - EditAndContinue + ProgramDatabase @@ -135,13 +135,13 @@ $(OutDir)$(TargetName)$(TargetExt) true %(IgnoreSpecificDefaultLibraries) - .\..\release/ci2.pdb + $(IntDir) Windows MachineX86 12.0 - $(IntDir) + false true @@ -165,7 +165,6 @@ - %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) diff --git a/build/ci2.vcxproj.filters b/build/ci2.vcxproj.filters index d2c99a5aa..4a2f46882 100644 --- a/build/ci2.vcxproj.filters +++ b/build/ci2.vcxproj.filters @@ -45,9 +45,6 @@ Sources - - Sources - diff --git a/build/crpa.sln b/build/crpa.sln index 9d4398f66..42c9ccd0a 100644 --- a/build/crpa.sln +++ b/build/crpa.sln @@ -1,6 +1,6 @@  -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "crpa0", "crpa0.vcproj", "{307A83A1-35A5-4E21-AEE1-50D735D1ED37}" ProjectSection(ProjectDependencies) = postProject {A1CE9743-A597-4F92-B55A-345A366C9E55} = {A1CE9743-A597-4F92-B55A-345A366C9E55} @@ -11,7 +11,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "crpa1", "crpa1.vcproj", "{3 {A1CE9743-A597-4F92-B55A-345A366C9E55} = {A1CE9743-A597-4F92-B55A-345A366C9E55} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vedoc", "vedoc.vcproj", "{A1CE9743-A597-4F92-B55A-345A366C9E55}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vedoc", "vedoc.vcxproj", "{A1CE9743-A597-4F92-B55A-345A366C9E55}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "crpa", "crpa.vcproj", "{0E7C9E43-17A8-4A24-8D15-117D457FD750}" EndProject diff --git a/build/ct.sln b/build/ct.sln index 9741c0c5e..85baf0b33 100644 --- a/build/ct.sln +++ b/build/ct.sln @@ -1,7 +1,12 @@  Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual C++ Express 2010 +# Visual Studio 2010 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ct0", "ct0.vcxproj", "{E3E7DE6C-EDE3-48D4-8F15-333B71AE4AC2}" + ProjectSection(ProjectDependencies) = postProject + {2D38A763-3D74-4338-9362-B891784EC90E} = {2D38A763-3D74-4338-9362-B891784EC90E} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AgaLib", "AgaLib.vcxproj", "{2D38A763-3D74-4338-9362-B891784EC90E}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -13,6 +18,10 @@ Global {E3E7DE6C-EDE3-48D4-8F15-333B71AE4AC2}.Debug|Win32.Build.0 = Debug|Win32 {E3E7DE6C-EDE3-48D4-8F15-333B71AE4AC2}.Release|Win32.ActiveCfg = Release|Win32 {E3E7DE6C-EDE3-48D4-8F15-333B71AE4AC2}.Release|Win32.Build.0 = Release|Win32 + {2D38A763-3D74-4338-9362-B891784EC90E}.Debug|Win32.ActiveCfg = Debug|Win32 + {2D38A763-3D74-4338-9362-B891784EC90E}.Debug|Win32.Build.0 = Debug|Win32 + {2D38A763-3D74-4338-9362-B891784EC90E}.Release|Win32.ActiveCfg = Release|Win32 + {2D38A763-3D74-4338-9362-B891784EC90E}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/build/ct0.vcxproj b/build/ct0.vcxproj index 0d3a4d9f3..0eb9f0a92 100644 --- a/build/ct0.vcxproj +++ b/build/ct0.vcxproj @@ -42,7 +42,7 @@ $(Configuration)\$(ProjectName)\ true ..\exe\ - $(Configuration)\$(ProjectName)\ + ..\obj\ false false false @@ -177,15 +177,12 @@ - - true - - - true - + - + + {2d38a763-3d74-4338-9362-b891784ec90e} + diff --git a/build/ct0.vcxproj.filters b/build/ct0.vcxproj.filters index d31b71f6d..cb3c32bb9 100644 --- a/build/ct0.vcxproj.filters +++ b/build/ct0.vcxproj.filters @@ -67,10 +67,6 @@ Menu - - - - diff --git a/build/db0.vcxproj b/build/db0.vcxproj index 898c2927f..dde5782b2 100644 --- a/build/db0.vcxproj +++ b/build/db0.vcxproj @@ -70,7 +70,7 @@ $(IntDir) Level3 true - EditAndContinue + ProgramDatabase @@ -114,7 +114,7 @@ Disabled ..\src\include;..\src\xvaga;%(AdditionalIncludeDirectories) - _DEBUG;__LONGDOUBLE__;WIN32;%(PreprocessorDefinitions) + _DEBUG;WIN32;%(PreprocessorDefinitions) false MultiThreadedDebug true diff --git a/build/db1.vcxproj b/build/db1.vcxproj index 118476298..201c8c9a0 100644 --- a/build/db1.vcxproj +++ b/build/db1.vcxproj @@ -67,7 +67,7 @@ true Level3 true - EditAndContinue + ProgramDatabase $(IntDir) @@ -112,7 +112,7 @@ Disabled ..\src\include;..\src\xvaga;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;__LONGDOUBLE__;%(PreprocessorDefinitions) + _DEBUG;WIN32;%(PreprocessorDefinitions) true MultiThreadedDebug true diff --git a/build/db2.vcxproj b/build/db2.vcxproj index ec6d471b4..68afbd88c 100644 --- a/build/db2.vcxproj +++ b/build/db2.vcxproj @@ -62,7 +62,7 @@ Disabled ..\src\include;..\src\xvaga;%(AdditionalIncludeDirectories) - _DEBUG;__LONGDOUBLE__;WIN32;%(PreprocessorDefinitions) + _DEBUG;WIN32;%(PreprocessorDefinitions) false MultiThreadedDebug true @@ -119,7 +119,7 @@ .\..\release/db2.pch Level3 true - EditAndContinue + ProgramDatabase NDEBUG;%(PreprocessorDefinitions) diff --git a/build/fastrip.exe b/build/fastrip.exe index 036ed898c..66332c629 100644 Binary files a/build/fastrip.exe and b/build/fastrip.exe differ diff --git a/build/fastrip.sln b/build/fastrip.sln index 362caa971..92376dc4c 100644 --- a/build/fastrip.sln +++ b/build/fastrip.sln @@ -1,8 +1,10 @@  Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual C++ Express 2010 +# Visual Studio 2010 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fastrip", "fastrip.vcxproj", "{68251613-3B9A-4F87-9F40-827C46267ADE}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "patchdef", "patchdef.vcxproj", "{F0F108C3-BE88-4AB4-995A-3A921586A7A6}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -13,6 +15,10 @@ Global {68251613-3B9A-4F87-9F40-827C46267ADE}.Debug|Win32.Build.0 = Debug|Win32 {68251613-3B9A-4F87-9F40-827C46267ADE}.Release|Win32.ActiveCfg = Release|Win32 {68251613-3B9A-4F87-9F40-827C46267ADE}.Release|Win32.Build.0 = Release|Win32 + {F0F108C3-BE88-4AB4-995A-3A921586A7A6}.Debug|Win32.ActiveCfg = Debug|Win32 + {F0F108C3-BE88-4AB4-995A-3A921586A7A6}.Debug|Win32.Build.0 = Debug|Win32 + {F0F108C3-BE88-4AB4-995A-3A921586A7A6}.Release|Win32.ActiveCfg = Release|Win32 + {F0F108C3-BE88-4AB4-995A-3A921586A7A6}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/build/gv0.vcxproj b/build/gv0.vcxproj index c4f99d2a3..55d108c11 100644 --- a/build/gv0.vcxproj +++ b/build/gv0.vcxproj @@ -172,6 +172,7 @@ + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) diff --git a/build/gv0.vcxproj.filters b/build/gv0.vcxproj.filters index 1aecc270e..94085ab74 100644 --- a/build/gv0.vcxproj.filters +++ b/build/gv0.vcxproj.filters @@ -100,6 +100,9 @@ Sources + + Sources + diff --git a/build/ha.sln b/build/ha.sln index cc4fce2a4..065817ee3 100644 --- a/build/ha.sln +++ b/build/ha.sln @@ -1,6 +1,6 @@  Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual C++ Express 2010 +# Visual Studio 2010 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ha0", "ha0.vcxproj", "{2DB7F8EF-BABB-4A27-BC7D-8821B0D285C6}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ha_profiles", "ha_profiles.vcxproj", "{50411897-4D04-4906-A9D6-67FF865B513D}" @@ -13,6 +13,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hacnv", "hacnv.vcxproj", "{ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ha2", "ha2.vcxproj", "{9A321567-FAE8-4FC3-A257-B9E35E0736B9}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AgaLib", "AgaLib.vcxproj", "{2D38A763-3D74-4338-9362-B891784EC90E}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vedoc", "vedoc.vcxproj", "{A1CE9743-A597-4F92-B55A-345A366C9E55}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vedocext", "vedocext.vcxproj", "{0042619A-6B7C-4D3D-9CD9-9BDD8D200C15}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -43,6 +49,18 @@ Global {9A321567-FAE8-4FC3-A257-B9E35E0736B9}.Debug|Win32.Build.0 = Debug|Win32 {9A321567-FAE8-4FC3-A257-B9E35E0736B9}.Release|Win32.ActiveCfg = Release|Win32 {9A321567-FAE8-4FC3-A257-B9E35E0736B9}.Release|Win32.Build.0 = Release|Win32 + {2D38A763-3D74-4338-9362-B891784EC90E}.Debug|Win32.ActiveCfg = Debug|Win32 + {2D38A763-3D74-4338-9362-B891784EC90E}.Debug|Win32.Build.0 = Debug|Win32 + {2D38A763-3D74-4338-9362-B891784EC90E}.Release|Win32.ActiveCfg = Release|Win32 + {2D38A763-3D74-4338-9362-B891784EC90E}.Release|Win32.Build.0 = Release|Win32 + {A1CE9743-A597-4F92-B55A-345A366C9E55}.Debug|Win32.ActiveCfg = Debug|Win32 + {A1CE9743-A597-4F92-B55A-345A366C9E55}.Debug|Win32.Build.0 = Debug|Win32 + {A1CE9743-A597-4F92-B55A-345A366C9E55}.Release|Win32.ActiveCfg = Release|Win32 + {A1CE9743-A597-4F92-B55A-345A366C9E55}.Release|Win32.Build.0 = Release|Win32 + {0042619A-6B7C-4D3D-9CD9-9BDD8D200C15}.Debug|Win32.ActiveCfg = Debug|Win32 + {0042619A-6B7C-4D3D-9CD9-9BDD8D200C15}.Debug|Win32.Build.0 = Debug|Win32 + {0042619A-6B7C-4D3D-9CD9-9BDD8D200C15}.Release|Win32.ActiveCfg = Release|Win32 + {0042619A-6B7C-4D3D-9CD9-9BDD8D200C15}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/build/ha0.vcxproj b/build/ha0.vcxproj index 0d247ea77..610912469 100644 --- a/build/ha0.vcxproj +++ b/build/ha0.vcxproj @@ -215,27 +215,18 @@ - - true - - - true - - - true - - - true - - - true - - - true - + - + + {2d38a763-3d74-4338-9362-b891784ec90e} + + + {a1ce9743-a597-4f92-b55a-345a366c9e55} + + + {0042619a-6b7c-4d3d-9cd9-9bdd8d200c15} + diff --git a/build/ha0.vcxproj.filters b/build/ha0.vcxproj.filters index 2a842b8ab..b04426c8b 100644 --- a/build/ha0.vcxproj.filters +++ b/build/ha0.vcxproj.filters @@ -94,9 +94,6 @@ {2072a6c1-30f9-49fd-a64d-1bebd4673dba} - - {66e6f5f5-6908-4f02-87c1-935120854e4f} - {49800232-5ead-4972-8493-7c1b85a6d326} @@ -104,26 +101,6 @@ - - - Libraries - - - Libraries - - - Libraries - - - Libraries - - - Libraries - - - Libraries - - Accessories diff --git a/build/ha1.vcxproj b/build/ha1.vcxproj index 84f74b639..f15e7dcf4 100644 --- a/build/ha1.vcxproj +++ b/build/ha1.vcxproj @@ -186,30 +186,15 @@ - - Document - true - - - Document - true - - - Document - true - - - Document - true - - - Document - true - - - Document - true - + + {2d38a763-3d74-4338-9362-b891784ec90e} + + + {a1ce9743-a597-4f92-b55a-345a366c9e55} + + + {0042619a-6b7c-4d3d-9cd9-9bdd8d200c15} + diff --git a/build/ha1.vcxproj.filters b/build/ha1.vcxproj.filters index c6133f407..fc5f38510 100644 --- a/build/ha1.vcxproj.filters +++ b/build/ha1.vcxproj.filters @@ -11,9 +11,6 @@ {6cc7b2e6-1f38-44ef-88f8-b4b7a56159b1} - - {45d67e9e-1fc4-49b1-b8f9-1288bc8ef1ce} - @@ -84,24 +81,4 @@ - - - Libraries - - - Libraries - - - Libraries - - - Libraries - - - Libraries - - - Libraries - - \ No newline at end of file diff --git a/build/ha2.vcxproj b/build/ha2.vcxproj index 59942000b..797b0c1e6 100644 --- a/build/ha2.vcxproj +++ b/build/ha2.vcxproj @@ -196,30 +196,12 @@ - - Document - true - - - Document - true - - - Document - true - - - Document - true - - - Document - true - - - Document - true - + + {2d38a763-3d74-4338-9362-b891784ec90e} + + + {a1ce9743-a597-4f92-b55a-345a366c9e55} + diff --git a/build/ha2.vcxproj.filters b/build/ha2.vcxproj.filters index 803e8f360..ca618a3e8 100644 --- a/build/ha2.vcxproj.filters +++ b/build/ha2.vcxproj.filters @@ -1,48 +1,57 @@  - - - - + + Sources + + + Sources + + + Sources + + + Sources + - - - - + + Headers + + + Headers + + + Headers + + + Headers + - - - + + Mask + + + Mask + + + Mask + - - {d6a000a7-170c-4746-9f3c-0c330571a0dd} + + {d19a9e6d-3e0f-4ad7-b027-e0741fd46415} + *.h + + + {14d2c71f-3346-466a-8ed7-c51ee4f60c35} + + + {c9cd7c2a-a422-4f34-b0fe-983dd820fc85} - - - Libraries - - - Libraries - - - Libraries - - - Libraries - - - Libraries - - - Libraries - - \ No newline at end of file diff --git a/build/ha3.vcxproj b/build/ha3.vcxproj index 40aa32930..028a149b1 100644 --- a/build/ha3.vcxproj +++ b/build/ha3.vcxproj @@ -234,6 +234,11 @@ true + + + {2d38a763-3d74-4338-9362-b891784ec90e} + + diff --git a/build/hacnv.vcxproj b/build/hacnv.vcxproj index e6267eb3b..d99f0c17d 100644 --- a/build/hacnv.vcxproj +++ b/build/hacnv.vcxproj @@ -220,6 +220,11 @@ + + + {2d38a763-3d74-4338-9362-b891784ec90e} + + diff --git a/build/in.sln b/build/in.sln index bbd6b08a4..bae2ff753 100644 --- a/build/in.sln +++ b/build/in.sln @@ -1,8 +1,10 @@  Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual C++ Express 2010 +# Visual Studio 2010 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "in0", "in0.vcxproj", "{EA629ED4-5793-4286-A7DA-864522EB6E35}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AgaLib", "AgaLib.vcxproj", "{2D38A763-3D74-4338-9362-B891784EC90E}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -13,6 +15,10 @@ Global {EA629ED4-5793-4286-A7DA-864522EB6E35}.Debug|Win32.Build.0 = Debug|Win32 {EA629ED4-5793-4286-A7DA-864522EB6E35}.Release|Win32.ActiveCfg = Release|Win32 {EA629ED4-5793-4286-A7DA-864522EB6E35}.Release|Win32.Build.0 = Release|Win32 + {2D38A763-3D74-4338-9362-B891784EC90E}.Debug|Win32.ActiveCfg = Debug|Win32 + {2D38A763-3D74-4338-9362-B891784EC90E}.Debug|Win32.Build.0 = Debug|Win32 + {2D38A763-3D74-4338-9362-B891784EC90E}.Release|Win32.ActiveCfg = Release|Win32 + {2D38A763-3D74-4338-9362-B891784EC90E}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/build/ini32.bat b/build/ini32.bat index 1ed04bd07..9e1935997 100644 --- a/build/ini32.bat +++ b/build/ini32.bat @@ -1,19 +1,23 @@ -@echo off +rem @echo off echo Generating %1 ini file -copy ..\src\include\lffiles.h+%1 %TMP%\tmp.tmp set oldinc=%include -set include=..\src\include;..\src\ve -cl /nologo /EP %TMP%\tmp.tmp >%TMP%\tmp.ini +set include=..\src\include;..\src\xvaga;..\src\ve;%~p1 + +type ..\src\include\uml.h >%TMP%\%~n1.tmp +type %1 >>%TMP%\%~n1.tmp + +cl /nologo /EP %TMP%\%~n1.tmp >%TMP%\~n1.in0 +fastrip %TMP%\~n1.in0 %TMP%\~n1.ini +copy %TMP%\~n1.ini %2 + set include=%oldinc set oldinc= -fastrip %TMP%\tmp.ini %TMP%\tmp1.ini -copy %TMP%\tmp1.ini %2 -del %TMP%\tmp.ini -del %TMP%\tmp1.ini -del %TMP%\tmp.tmp + +del %TMP%\~n1.ini +del %TMP%\~n1.in0 +del %TMP%\~n1.tmp cd %~p2 echo Generating %2 msk file ve0 -3 %2 -f /uADMIN -cd ..\build diff --git a/build/ini32r.bat b/build/ini32r.bat index 9d7dc94b9..9e1935997 100644 --- a/build/ini32r.bat +++ b/build/ini32r.bat @@ -1,20 +1,23 @@ rem @echo off echo Generating %1 ini file -copy ..\src\include\lffiles.h+%1 %TMP%\tmp.tmp set oldinc=%include -set include=..\src\include;..\src\ve -cl /nologo /EP %TMP%\tmp.tmp >%TMP%\tmp.ini +set include=..\src\include;..\src\xvaga;..\src\ve;%~p1 + +type ..\src\include\uml.h >%TMP%\%~n1.tmp +type %1 >>%TMP%\%~n1.tmp + +cl /nologo /EP %TMP%\%~n1.tmp >%TMP%\~n1.in0 +fastrip %TMP%\~n1.in0 %TMP%\~n1.ini +copy %TMP%\~n1.ini %2 + set include=%oldinc set oldinc= -fastrip %TMP%\tmp.ini %TMP%\tmp1.ini -copy %TMP%\tmp1.ini %2 -del %TMP%\tmp.ini -del %TMP%\tmp1.ini -del %TMP%\tmp.tmp + +del %TMP%\~n1.ini +del %TMP%\~n1.in0 +del %TMP%\~n1.tmp cd %~p2 echo Generating %2 msk file ve0 -3 %2 -f /uADMIN -cd ..\build - diff --git a/build/lv3.vcxproj b/build/lv3.vcxproj index 51178a703..e7e810251 100644 --- a/build/lv3.vcxproj +++ b/build/lv3.vcxproj @@ -151,6 +151,7 @@ + diff --git a/build/lv3.vcxproj.filters b/build/lv3.vcxproj.filters index 7356dad35..15cabdef5 100644 --- a/build/lv3.vcxproj.filters +++ b/build/lv3.vcxproj.filters @@ -48,6 +48,9 @@ Sources + + Sources + diff --git a/build/mr0.vcxproj b/build/mr0.vcxproj index c2f90a95f..821605154 100644 --- a/build/mr0.vcxproj +++ b/build/mr0.vcxproj @@ -99,7 +99,7 @@ MaxSpeed - ..\src\include;..\src\xvaga;%(AdditionalIncludeDirectories) + ..\src\include;..\src\xvaga;..\src\xi;%(AdditionalIncludeDirectories) NDEBUG;WIN32;_WINDOWS;%(PreprocessorDefinitions) true MultiThreaded diff --git a/build/mr1.vcxproj b/build/mr1.vcxproj index b8cbc41bb..631cc9d05 100644 --- a/build/mr1.vcxproj +++ b/build/mr1.vcxproj @@ -59,7 +59,7 @@ MaxSpeed - ..\src\include;..\src\xvaga;%(AdditionalIncludeDirectories) + ..\src\include;..\src\xvaga;..\src\xi;%(AdditionalIncludeDirectories) NDEBUG;WIN32;_WINDOWS;%(PreprocessorDefinitions) true MultiThreaded diff --git a/build/mr2.vcxproj b/build/mr2.vcxproj index e63c8fad1..98e5a7400 100644 --- a/build/mr2.vcxproj +++ b/build/mr2.vcxproj @@ -105,7 +105,7 @@ MaxSpeed - ..\src\include;..\src\xvaga;%(AdditionalIncludeDirectories) + ..\src\include;..\src\xvaga;..\src\xi;%(AdditionalIncludeDirectories) NDEBUG;WIN32;_WINDOWS;%(PreprocessorDefinitions) true MultiThreaded diff --git a/build/msk232.bat b/build/msk232.bat index 745044751..386018762 100644 --- a/build/msk232.bat +++ b/build/msk232.bat @@ -1,18 +1,24 @@ @echo off echo Compiling %1 into %2 -copy ..\src\include\uml.h+%1 %TMP%\tmp.uml set oldinc=%include set include=..\src\include;..\src\xvaga;..\src\ve;%~p1 -cl /nologo /EP %TMP%\tmp.uml >%TMP%\tmp.tmp -type %TMP%\tmp.tmp|patchdef >%TMP%\tmp.msk -copy ..\src\include\uml.h+%TMP%\tmp.msk %TMP%\tmp.uml -cl /nologo /EP %TMP%\tmp.uml >%TMP%\tmp.msk + +type ..\src\include\uml.h >%TMP%\%~n1.tmp +type %1 >>%TMP%\%~n1.tmp + +cl /nologo /EP %TMP%\%~n1.tmp >%TMP%\%~n1.tm2 +patchdef %TMP%\%~n1.tm2 %TMP%\%TMP%\%~n1.tm3 + +type ..\src\include\uml.h >%TMP%\%~n1.uml +type %TMP%\%~n1.tm3 >>%TMP%\%~n1.uml +cl /nologo /EP %TMP%\%~n1.uml >%TMP%\%~n1.msk +fastrip %TMP%\%~n1.msk %2 + set include=%oldinc set oldinc= -fastrip %TMP%\tmp.msk %TMP%\tmp1.msk -copy %TMP%\tmp1.msk %2 -del %TMP%\tmp.msk -del %TMP%\tmp1.msk -del %TMP%\tmp.uml -del %TMP%\tmp.tmp + +del %TMP%\%~n1.tmp +del %TMP%\%~n1.tm2 +del %TMP%\%~n1.tm3 +del %TMP%\%~n1.uml diff --git a/build/msk32.bat b/build/msk32.bat index dafd483c4..a3e9be021 100644 --- a/build/msk32.bat +++ b/build/msk32.bat @@ -1,14 +1,17 @@ rem @echo off echo Compiling mask %1 into %2 -copy ..\src\include\uml.h+%1 %TMP%\%~n1.tmp - set oldinc=%include -set include=..\src\include;%~p1 +set include=..\src\include;..\src\xvaga;..\src\ve;%~p1 + +type ..\src\include\uml.h >%TMP%\%~n1.tmp +type %1 >>%TMP%\%~n1.tmp cl /nologo /EP %TMP%\%~n1.tmp > %TMP%\%~n1.msk +fastrip %TMP%\%~n1.msk %2 + set include=%oldinc set oldinc= -fastrip %TMP%\%~n1.msk %2 + del %TMP%\%~n1.msk del %TMP%\%~n1.tmp diff --git a/build/pd0001.vcxproj b/build/pd0001.vcxproj index 0fdd84dab..5d93a0fe2 100644 --- a/build/pd0001.vcxproj +++ b/build/pd0001.vcxproj @@ -124,7 +124,7 @@ wsock32.lib;%(AdditionalDependencies) - ..\exe/pd0001.exe + $(OutDir)$(TargetName)$(TargetExt) true %(IgnoreSpecificDefaultLibraries) .\..\release/pd0001.pdb diff --git a/build/pd0350.vcxproj b/build/pd0350.vcxproj index b4262fd36..0412116fd 100644 --- a/build/pd0350.vcxproj +++ b/build/pd0350.vcxproj @@ -40,7 +40,7 @@ $(Configuration)\$(ProjectName)\ false ..\exe\ - $(Configuration)\$(ProjectName)\ + ..\obj\ false @@ -123,7 +123,7 @@ wsock32.lib;%(AdditionalDependencies) - D:\Release\campo100/pd0350.exe + $(OutDir)$(TargetName)$(TargetExt) true %(IgnoreSpecificDefaultLibraries) .\..\release/pd0350.pdb diff --git a/build/pd0666.vcxproj b/build/pd0666.vcxproj index 893fe2b67..9021e1dec 100644 --- a/build/pd0666.vcxproj +++ b/build/pd0666.vcxproj @@ -123,7 +123,7 @@ wsock32.lib;%(AdditionalDependencies) - D:\Release\campo100/pd0666.exe + $(OutDir)$(TargetName)$(TargetExt) true %(IgnoreSpecificDefaultLibraries) .\..\release/pd0666.pdb diff --git a/build/pd0777.vcxproj b/build/pd0777.vcxproj index b13f96aa4..77c2dc144 100644 --- a/build/pd0777.vcxproj +++ b/build/pd0777.vcxproj @@ -75,7 +75,7 @@ wsock32.lib;%(AdditionalDependencies) - D:\Release\campo100/pd0777.exe + $(OutDir)$(TargetName)$(TargetExt) true %(IgnoreSpecificDefaultLibraries) .\..\release/pd0777.pdb diff --git a/build/pd1890.vcxproj b/build/pd1890.vcxproj index d43950d8e..9992a677e 100644 --- a/build/pd1890.vcxproj +++ b/build/pd1890.vcxproj @@ -123,7 +123,7 @@ wsock32.lib;%(AdditionalDependencies) - D:\Release\campo100/pd1890.exe + $(OutDir)$(TargetName)$(TargetExt) true %(IgnoreSpecificDefaultLibraries) .\..\release/pd1890.pdb diff --git a/build/pd6142.vcxproj b/build/pd6142.vcxproj index e749c8f82..a7b84d156 100644 --- a/build/pd6142.vcxproj +++ b/build/pd6142.vcxproj @@ -124,7 +124,7 @@ wsock32.lib;%(AdditionalDependencies) - ..\exe/pd6142.exe + $(OutDir)$(TargetName)$(TargetExt) true %(IgnoreSpecificDefaultLibraries) .\..\release/pd6142.pdb diff --git a/build/pd6411.vcxproj b/build/pd6411.vcxproj index 3ccbecaa0..16a2aa634 100644 --- a/build/pd6411.vcxproj +++ b/build/pd6411.vcxproj @@ -124,7 +124,7 @@ wsock32.lib;%(AdditionalDependencies) - ..\exe/pd6411.exe + $(OutDir)$(TargetName)$(TargetExt) true %(IgnoreSpecificDefaultLibraries) .\..\release/pd6411.pdb diff --git a/build/pe.sln b/build/pe.sln index d6a601ef2..6e7a5bef6 100644 --- a/build/pe.sln +++ b/build/pe.sln @@ -1,11 +1,27 @@  Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual C++ Express 2010 +# Visual Studio 2010 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pe0", "pe0.vcxproj", "{2DB7F8EF-BABB-4A27-BC7D-8821B0D285C6}" + ProjectSection(ProjectDependencies) = postProject + {A1CE9743-A597-4F92-B55A-345A366C9E55} = {A1CE9743-A597-4F92-B55A-345A366C9E55} + {2D38A763-3D74-4338-9362-B891784EC90E} = {2D38A763-3D74-4338-9362-B891784EC90E} + {0042619A-6B7C-4D3D-9CD9-9BDD8D200C15} = {0042619A-6B7C-4D3D-9CD9-9BDD8D200C15} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pe_profiles", "pe_profiles.vcxproj", "{50411897-4D04-4906-A9D6-67FF865B513D}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pe1", "pe1.vcxproj", "{94368639-CEB1-44A1-A1D8-AF13A1027926}" + ProjectSection(ProjectDependencies) = postProject + {A1CE9743-A597-4F92-B55A-345A366C9E55} = {A1CE9743-A597-4F92-B55A-345A366C9E55} + {2D38A763-3D74-4338-9362-B891784EC90E} = {2D38A763-3D74-4338-9362-B891784EC90E} + {0042619A-6B7C-4D3D-9CD9-9BDD8D200C15} = {0042619A-6B7C-4D3D-9CD9-9BDD8D200C15} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AgaLib", "AgaLib.vcxproj", "{2D38A763-3D74-4338-9362-B891784EC90E}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vedoc", "vedoc.vcxproj", "{A1CE9743-A597-4F92-B55A-345A366C9E55}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vedocext", "vedocext.vcxproj", "{0042619A-6B7C-4D3D-9CD9-9BDD8D200C15}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -25,6 +41,18 @@ Global {94368639-CEB1-44A1-A1D8-AF13A1027926}.Debug|Win32.Build.0 = Debug|Win32 {94368639-CEB1-44A1-A1D8-AF13A1027926}.Release|Win32.ActiveCfg = Release|Win32 {94368639-CEB1-44A1-A1D8-AF13A1027926}.Release|Win32.Build.0 = Release|Win32 + {2D38A763-3D74-4338-9362-B891784EC90E}.Debug|Win32.ActiveCfg = Debug|Win32 + {2D38A763-3D74-4338-9362-B891784EC90E}.Debug|Win32.Build.0 = Debug|Win32 + {2D38A763-3D74-4338-9362-B891784EC90E}.Release|Win32.ActiveCfg = Release|Win32 + {2D38A763-3D74-4338-9362-B891784EC90E}.Release|Win32.Build.0 = Release|Win32 + {A1CE9743-A597-4F92-B55A-345A366C9E55}.Debug|Win32.ActiveCfg = Debug|Win32 + {A1CE9743-A597-4F92-B55A-345A366C9E55}.Debug|Win32.Build.0 = Debug|Win32 + {A1CE9743-A597-4F92-B55A-345A366C9E55}.Release|Win32.ActiveCfg = Release|Win32 + {A1CE9743-A597-4F92-B55A-345A366C9E55}.Release|Win32.Build.0 = Release|Win32 + {0042619A-6B7C-4D3D-9CD9-9BDD8D200C15}.Debug|Win32.ActiveCfg = Debug|Win32 + {0042619A-6B7C-4D3D-9CD9-9BDD8D200C15}.Debug|Win32.Build.0 = Debug|Win32 + {0042619A-6B7C-4D3D-9CD9-9BDD8D200C15}.Release|Win32.ActiveCfg = Release|Win32 + {0042619A-6B7C-4D3D-9CD9-9BDD8D200C15}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/build/pe0.vcxproj b/build/pe0.vcxproj index 34f473455..57f02fffc 100644 --- a/build/pe0.vcxproj +++ b/build/pe0.vcxproj @@ -145,6 +145,7 @@ + @@ -185,24 +186,15 @@ - - true - - - true - - - true - - - true - - - true - - - true - + + {2d38a763-3d74-4338-9362-b891784ec90e} + + + {a1ce9743-a597-4f92-b55a-345a366c9e55} + + + {0042619a-6b7c-4d3d-9cd9-9bdd8d200c15} + diff --git a/build/pe0.vcxproj.filters b/build/pe0.vcxproj.filters index 57817da7f..7a08b653e 100644 --- a/build/pe0.vcxproj.filters +++ b/build/pe0.vcxproj.filters @@ -58,6 +58,9 @@ Sources + + Sources + @@ -86,12 +89,4 @@ - - - - - - - - \ No newline at end of file diff --git a/build/pe1.vcxproj b/build/pe1.vcxproj index 997a5bf14..a453f9104 100644 --- a/build/pe1.vcxproj +++ b/build/pe1.vcxproj @@ -161,24 +161,6 @@ - - - true - - - true - - - true - - - true - - - true - - - @@ -198,6 +180,17 @@ + + + {2d38a763-3d74-4338-9362-b891784ec90e} + + + {a1ce9743-a597-4f92-b55a-345a366c9e55} + + + {0042619a-6b7c-4d3d-9cd9-9bdd8d200c15} + + diff --git a/build/pe1.vcxproj.filters b/build/pe1.vcxproj.filters index 6a5126459..b22ca58cb 100644 --- a/build/pe1.vcxproj.filters +++ b/build/pe1.vcxproj.filters @@ -17,10 +17,6 @@ {737fd282-7207-41f7-9e0b-8b250e48daf5} men - - {38776ff3-b242-4482-8639-872131008af9} - lib - {8237c51b-3a27-4e6d-9355-a0adf62c2938} rep @@ -42,26 +38,6 @@ - - - Libraries - - - Libraries - - - Libraries - - - Libraries - - - Libraries - - - Libraries - - Sources diff --git a/build/pg0001.vcxproj b/build/pg0001.vcxproj index d5a709f51..9374a028e 100644 --- a/build/pg0001.vcxproj +++ b/build/pg0001.vcxproj @@ -155,6 +155,7 @@ %(PreprocessorDefinitions) + diff --git a/build/pg0001.vcxproj.filters b/build/pg0001.vcxproj.filters index 42a485b04..35c1d3384 100644 --- a/build/pg0001.vcxproj.filters +++ b/build/pg0001.vcxproj.filters @@ -69,6 +69,9 @@ Sources + + Sources + diff --git a/build/pg0067.vcxproj b/build/pg0067.vcxproj index 65d56ee3b..90d387a89 100644 --- a/build/pg0067.vcxproj +++ b/build/pg0067.vcxproj @@ -82,7 +82,7 @@ version.lib;wsock32.lib;comctl32.lib;rpcrt4.lib;%(AdditionalDependencies) - ..\exed\pg0067.exe + $(OutDir)$(TargetName)$(TargetExt) true libc.lib;%(IgnoreSpecificDefaultLibraries) true @@ -131,7 +131,7 @@ version.lib;wsock32.lib;comctl32.lib;rpcrt4.lib;%(AdditionalDependencies) - D:\Release\campo100/pg0067.exe + $(OutDir)$(TargetName)$(TargetExt) true libc.lib;%(IgnoreSpecificDefaultLibraries) $(TargetDir)$(TargetName).pdb diff --git a/build/pg0068.vcxproj b/build/pg0068.vcxproj index 5e8a9f433..79a865ed0 100644 --- a/build/pg0068.vcxproj +++ b/build/pg0068.vcxproj @@ -62,7 +62,7 @@ MaxSpeed OnlyExplicitInline - ..\include;..\xvaga;..\xi;%(AdditionalIncludeDirectories) + ..\src\include;..\src\xvaga;%(AdditionalIncludeDirectories) NDEBUG;WIN32;_WINDOWS;XVT;%(PreprocessorDefinitions) true MultiThreaded @@ -82,7 +82,7 @@ version.lib;wsock32.lib;comctl32.lib;rpcrt4.lib;%(AdditionalDependencies) - D:\Release\campo100/pg0068.exe + $(OutDir)$(TargetName)$(TargetExt) true libc.lib;%(IgnoreSpecificDefaultLibraries) $(TargetDir)$(TargetName).pdb @@ -109,7 +109,7 @@ Disabled - ..\include;..\xvaga;..\xi;%(AdditionalIncludeDirectories) + ..\src\include;..\src\xvaga;%(AdditionalIncludeDirectories) _DEBUG;WIN32;__LONGDOUBLE__;_WINDOWS;%(PreprocessorDefinitions) true MultiThreadedDebug @@ -129,7 +129,7 @@ version.lib;wsock32.lib;comctl32.lib;rpcrt4.lib;%(AdditionalDependencies) - ..\exed\pg0068.exe + $(OutDir)$(TargetName)$(TargetExt) true libc.lib;%(IgnoreSpecificDefaultLibraries) true diff --git a/build/pg0069.vcxproj b/build/pg0069.vcxproj index df6c0668a..be5103906 100644 --- a/build/pg0069.vcxproj +++ b/build/pg0069.vcxproj @@ -82,7 +82,7 @@ version.lib;wsock32.lib;comctl32.lib;rpcrt4.lib;%(AdditionalDependencies) - D:\Release\campo100/pg0069.exe + $(OutDir)$(TargetName)$(TargetExt) true libc.lib;%(IgnoreSpecificDefaultLibraries) $(TargetDir)$(TargetName).pdb @@ -129,7 +129,7 @@ version.lib;wsock32.lib;comctl32.lib;rpcrt4.lib;%(AdditionalDependencies) - ..\exed\pg0069.exe + $(OutDir)$(TargetName)$(TargetExt) true libc.lib;%(IgnoreSpecificDefaultLibraries) true @@ -186,19 +186,6 @@ %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - @@ -231,7 +218,6 @@ Document true - Document true @@ -250,6 +236,14 @@ %(AdditionalIncludeDirectories) + + + {2d38a763-3d74-4338-9362-b891784ec90e} + + + {a1ce9743-a597-4f92-b55a-345a366c9e55} + + diff --git a/build/pg0069.vcxproj.filters b/build/pg0069.vcxproj.filters index 1d47912a1..0ebadc163 100644 --- a/build/pg0069.vcxproj.filters +++ b/build/pg0069.vcxproj.filters @@ -48,15 +48,6 @@ Sources - - Sources - - - Sources - - - Sources - @@ -66,17 +57,9 @@ Headers - - - - - - - - Masks diff --git a/build/pg0388.vcxproj b/build/pg0388.vcxproj index cec657fd1..008da01af 100644 --- a/build/pg0388.vcxproj +++ b/build/pg0388.vcxproj @@ -81,7 +81,7 @@ version.lib;wsock32.lib;comctl32.lib;rpcrt4.lib;%(AdditionalDependencies) - ..\exed\pg0388.exe + $(OutDir)$(TargetName)$(TargetExt) true libc.lib;%(IgnoreSpecificDefaultLibraries) true @@ -130,7 +130,7 @@ version.lib;wsock32.lib;comctl32.lib;rpcrt4.lib;%(AdditionalDependencies) - D:\Release\campo100/pg0388.exe + $(OutDir)$(TargetName)$(TargetExt) true libc.lib;%(IgnoreSpecificDefaultLibraries) $(TargetDir)$(TargetName).pdb @@ -237,7 +237,6 @@ Document true - Document true @@ -256,6 +255,14 @@ %(AdditionalIncludeDirectories) + + + {2d38a763-3d74-4338-9362-b891784ec90e} + + + {a1ce9743-a597-4f92-b55a-345a366c9e55} + + diff --git a/build/pg0388.vcxproj.filters b/build/pg0388.vcxproj.filters index e3a2b37f1..185612c68 100644 --- a/build/pg0388.vcxproj.filters +++ b/build/pg0388.vcxproj.filters @@ -40,17 +40,9 @@ Headers - - - - - - - - Masks diff --git a/build/pi.sln b/build/pi.sln index 63d425bd8..f446a9e95 100644 --- a/build/pi.sln +++ b/build/pi.sln @@ -1,24 +1,30 @@  Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual C++ Express 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pi0001", "pi0001.vcxproj", "{9D5735F1-EE47-4ED3-929A-048FFF8B6344}" +# Visual Studio 2010 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pi0001", "pi0001.vcxproj", "{5379F62B-868B-4469-9FC9-993AF9ADE381}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pi0002", "pi0002.vcxproj", "{F154352E-CF6F-44A1-B45F-BAE74281A0AD}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AgaLib", "AgaLib.vcxproj", "{2D38A763-3D74-4338-9362-B891784EC90E}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 Release|Win32 = Release|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {9D5735F1-EE47-4ED3-929A-048FFF8B6344}.Debug|Win32.ActiveCfg = Debug|Win32 - {9D5735F1-EE47-4ED3-929A-048FFF8B6344}.Debug|Win32.Build.0 = Debug|Win32 - {9D5735F1-EE47-4ED3-929A-048FFF8B6344}.Release|Win32.ActiveCfg = Release|Win32 - {9D5735F1-EE47-4ED3-929A-048FFF8B6344}.Release|Win32.Build.0 = Release|Win32 + {5379F62B-868B-4469-9FC9-993AF9ADE381}.Debug|Win32.ActiveCfg = Debug|Win32 + {5379F62B-868B-4469-9FC9-993AF9ADE381}.Debug|Win32.Build.0 = Debug|Win32 + {5379F62B-868B-4469-9FC9-993AF9ADE381}.Release|Win32.ActiveCfg = Release|Win32 + {5379F62B-868B-4469-9FC9-993AF9ADE381}.Release|Win32.Build.0 = Release|Win32 {F154352E-CF6F-44A1-B45F-BAE74281A0AD}.Debug|Win32.ActiveCfg = Debug|Win32 {F154352E-CF6F-44A1-B45F-BAE74281A0AD}.Debug|Win32.Build.0 = Debug|Win32 {F154352E-CF6F-44A1-B45F-BAE74281A0AD}.Release|Win32.ActiveCfg = Release|Win32 {F154352E-CF6F-44A1-B45F-BAE74281A0AD}.Release|Win32.Build.0 = Release|Win32 + {2D38A763-3D74-4338-9362-B891784EC90E}.Debug|Win32.ActiveCfg = Debug|Win32 + {2D38A763-3D74-4338-9362-B891784EC90E}.Debug|Win32.Build.0 = Debug|Win32 + {2D38A763-3D74-4338-9362-B891784EC90E}.Release|Win32.ActiveCfg = Release|Win32 + {2D38A763-3D74-4338-9362-B891784EC90E}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/build/pi0001.vcxproj b/build/pi0001.vcxproj index 2a06fd05d..c5ded3c5e 100644 --- a/build/pi0001.vcxproj +++ b/build/pi0001.vcxproj @@ -217,19 +217,16 @@ - - - true - - - true - - Document + + + {2d38a763-3d74-4338-9362-b891784ec90e} + + diff --git a/build/pi0001.vcxproj.filters b/build/pi0001.vcxproj.filters index 465573913..ead42e346 100644 --- a/build/pi0001.vcxproj.filters +++ b/build/pi0001.vcxproj.filters @@ -66,10 +66,6 @@ - - - - Masks diff --git a/build/pl0001.vcxproj b/build/pl0001.vcxproj index f23f7a0f0..1e9a8770e 100644 --- a/build/pl0001.vcxproj +++ b/build/pl0001.vcxproj @@ -84,7 +84,7 @@ version.lib;wsock32.lib;comctl32.lib;rpcrt4.lib;%(AdditionalDependencies) - D:\Release\campo100/pl0001.exe + $(OutDir)$(TargetName)$(TargetExt) true libc.lib;%(IgnoreSpecificDefaultLibraries) $(TargetDir)$(TargetName).pdb @@ -131,7 +131,7 @@ version.lib;wsock32.lib;comctl32.lib;rpcrt4.lib;%(AdditionalDependencies) - ..\exed\pl0001.exe + $(OutDir)$(TargetName)$(TargetExt) true libc.lib;%(IgnoreSpecificDefaultLibraries) true diff --git a/build/pr.sln b/build/pr.sln index bd9fd16b0..91c9da4fe 100644 --- a/build/pr.sln +++ b/build/pr.sln @@ -1,10 +1,14 @@  Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual C++ Express 2010 +# Visual Studio 2010 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pr0", "pr0.vcxproj", "{B5FD3FBE-9E0F-4FB8-9E38-178ED456A4F3}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pr1", "pr1.vcxproj", "{E15F0BE7-2269-4DB9-92C7-082912701A64}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AgaLib", "AgaLib.vcxproj", "{2D38A763-3D74-4338-9362-B891784EC90E}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vedoc", "vedoc.vcxproj", "{A1CE9743-A597-4F92-B55A-345A366C9E55}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -19,6 +23,14 @@ Global {E15F0BE7-2269-4DB9-92C7-082912701A64}.Debug|Win32.Build.0 = Debug|Win32 {E15F0BE7-2269-4DB9-92C7-082912701A64}.Release|Win32.ActiveCfg = Release|Win32 {E15F0BE7-2269-4DB9-92C7-082912701A64}.Release|Win32.Build.0 = Release|Win32 + {2D38A763-3D74-4338-9362-B891784EC90E}.Debug|Win32.ActiveCfg = Debug|Win32 + {2D38A763-3D74-4338-9362-B891784EC90E}.Debug|Win32.Build.0 = Debug|Win32 + {2D38A763-3D74-4338-9362-B891784EC90E}.Release|Win32.ActiveCfg = Release|Win32 + {2D38A763-3D74-4338-9362-B891784EC90E}.Release|Win32.Build.0 = Release|Win32 + {A1CE9743-A597-4F92-B55A-345A366C9E55}.Debug|Win32.ActiveCfg = Debug|Win32 + {A1CE9743-A597-4F92-B55A-345A366C9E55}.Debug|Win32.Build.0 = Debug|Win32 + {A1CE9743-A597-4F92-B55A-345A366C9E55}.Release|Win32.ActiveCfg = Release|Win32 + {A1CE9743-A597-4F92-B55A-345A366C9E55}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/build/pr0.vcxproj b/build/pr0.vcxproj index 7960c3b81..26a4c14d4 100644 --- a/build/pr0.vcxproj +++ b/build/pr0.vcxproj @@ -244,12 +244,6 @@ - - true - - - true - true @@ -257,6 +251,11 @@ true + + + {2d38a763-3d74-4338-9362-b891784ec90e} + + diff --git a/build/pr0.vcxproj.filters b/build/pr0.vcxproj.filters index 35d6ee21d..3f03e8e29 100644 --- a/build/pr0.vcxproj.filters +++ b/build/pr0.vcxproj.filters @@ -153,8 +153,6 @@ - - Sources diff --git a/build/pr1.vcxproj b/build/pr1.vcxproj index 5bd0d8b9c..faefd7206 100644 --- a/build/pr1.vcxproj +++ b/build/pr1.vcxproj @@ -207,23 +207,15 @@ - - Document - true - - - Document - true - - - true - - - true - + - + + {2d38a763-3d74-4338-9362-b891784ec90e} + + + {a1ce9743-a597-4f92-b55a-345a366c9e55} + diff --git a/build/pr1.vcxproj.filters b/build/pr1.vcxproj.filters index 0cb439118..e9f5305e1 100644 --- a/build/pr1.vcxproj.filters +++ b/build/pr1.vcxproj.filters @@ -80,12 +80,6 @@ Forms - - - - - - diff --git a/build/profiles.vcxproj b/build/profiles.vcxproj index e01fd1ec3..5a25f7268 100644 --- a/build/profiles.vcxproj +++ b/build/profiles.vcxproj @@ -140,21 +140,21 @@ - - - - - - + + + + + + + Document + + + + + + Document - - - - - - - Document - + diff --git a/build/profiles.vcxproj.filters b/build/profiles.vcxproj.filters index 08f0146d0..e56974874 100644 --- a/build/profiles.vcxproj.filters +++ b/build/profiles.vcxproj.filters @@ -10,33 +10,30 @@ - + Sources - - + + Sources - - + + Sources - - + + Sources - - + + Sources - - + + Sources - - + + Sources - - + + Sources - - - Sources - + @@ -44,12 +41,15 @@ - + Sources - - + + Dat - + + + Sources + diff --git a/build/ps0017.vcxproj b/build/ps0017.vcxproj index aa1ae26ae..c25812aaa 100644 --- a/build/ps0017.vcxproj +++ b/build/ps0017.vcxproj @@ -75,7 +75,7 @@ wsock32.lib;%(AdditionalDependencies) - D:\Release\campo100/ps0017.exe + $(OutDir)$(TargetName)$(TargetExt) true %(IgnoreSpecificDefaultLibraries) .\..\release/ps0017.pdb @@ -122,7 +122,7 @@ wsock32.lib;%(AdditionalDependencies) - ..\exed\ps0017.exe + $(OutDir)$(TargetName)$(TargetExt) true %(IgnoreSpecificDefaultLibraries) true diff --git a/build/ps0077.vcxproj b/build/ps0077.vcxproj index 4c68e9d6e..e19d36675 100644 --- a/build/ps0077.vcxproj +++ b/build/ps0077.vcxproj @@ -77,7 +77,7 @@ wsock32.lib;%(AdditionalDependencies) - ../exed/ps0077.exe + $(OutDir)$(TargetName)$(TargetExt) true %(IgnoreSpecificDefaultLibraries) true @@ -125,7 +125,7 @@ wsock32.lib;%(AdditionalDependencies) - ..\exe/ps0077.exe + $(OutDir)$(TargetName)$(TargetExt) true %(IgnoreSpecificDefaultLibraries) .\..\release/ps0077.pdb diff --git a/build/ps0099.vcxproj b/build/ps0099.vcxproj index 36ac65aa6..37ae7e0bb 100644 --- a/build/ps0099.vcxproj +++ b/build/ps0099.vcxproj @@ -76,7 +76,7 @@ wsock32.lib;%(AdditionalDependencies) - D:\Release\campo100/ps0099.exe + $(OutDir)$(TargetName)$(TargetExt) true %(IgnoreSpecificDefaultLibraries) .\..\release/ps0099.pdb @@ -123,7 +123,7 @@ wsock32.lib;%(AdditionalDependencies) - ..\exed\ps0099.exe + $(OutDir)$(TargetName)$(TargetExt) true %(IgnoreSpecificDefaultLibraries) true diff --git a/build/ps0330.vcxproj b/build/ps0330.vcxproj index db7ef6f54..9ab0b73b1 100644 --- a/build/ps0330.vcxproj +++ b/build/ps0330.vcxproj @@ -86,6 +86,7 @@ MachineX86 + $(OutDir)$(TargetName)$(TargetExt) true @@ -127,7 +128,7 @@ wsock32.lib;%(AdditionalDependencies) - D:\Release\campo100/ps0330.exe + $(OutDir)$(TargetName)$(TargetExt) true %(IgnoreSpecificDefaultLibraries) .\..\release/ps0330.pdb diff --git a/build/ps0431.vcxproj b/build/ps0431.vcxproj index cd19fe6cd..d150641a8 100644 --- a/build/ps0431.vcxproj +++ b/build/ps0431.vcxproj @@ -144,6 +144,7 @@ + @@ -158,17 +159,12 @@ - - Document - true - - - Document - true - + - + + {2d38a763-3d74-4338-9362-b891784ec90e} + diff --git a/build/ps0431.vcxproj.filters b/build/ps0431.vcxproj.filters index fd69625a4..8fd39fb5f 100644 --- a/build/ps0431.vcxproj.filters +++ b/build/ps0431.vcxproj.filters @@ -33,6 +33,9 @@ Sources + + Sources + @@ -56,10 +59,6 @@ Masks - - - - diff --git a/build/ps0544.vcxproj b/build/ps0544.vcxproj index 2b81e8782..21f33d3a1 100644 --- a/build/ps0544.vcxproj +++ b/build/ps0544.vcxproj @@ -75,7 +75,7 @@ wsock32.lib;%(AdditionalDependencies) - D:\Release\campo100/ps0544.exe + $(OutDir)$(TargetName)$(TargetExt) true %(IgnoreSpecificDefaultLibraries) .\..\release/ps0544.pdb @@ -122,7 +122,7 @@ wsock32.lib;%(AdditionalDependencies) - ..\exed\ps0544.exe + $(OutDir)$(TargetName)$(TargetExt) true %(IgnoreSpecificDefaultLibraries) true diff --git a/build/ps0816.vcxproj b/build/ps0816.vcxproj index 3d6ce165b..2f87f812c 100644 --- a/build/ps0816.vcxproj +++ b/build/ps0816.vcxproj @@ -75,7 +75,7 @@ wsock32.lib;%(AdditionalDependencies) - ..\exed\ps0816.exe + $(OutDir)$(TargetName)$(TargetExt) true %(IgnoreSpecificDefaultLibraries) true @@ -123,7 +123,7 @@ wsock32.lib;%(AdditionalDependencies) - D:\Release\campo100/ps0816.exe + $(OutDir)$(TargetName)$(TargetExt) true %(IgnoreSpecificDefaultLibraries) .\..\release/ps0816.pdb diff --git a/build/ps0830.vcxproj b/build/ps0830.vcxproj index cfaa3e99f..720883b3b 100644 --- a/build/ps0830.vcxproj +++ b/build/ps0830.vcxproj @@ -75,7 +75,7 @@ wsock32.lib;%(AdditionalDependencies) - ..\exed\ps0830.exe + $(OutDir)$(TargetName)$(TargetExt) true %(IgnoreSpecificDefaultLibraries) true @@ -123,7 +123,7 @@ wsock32.lib;%(AdditionalDependencies) - D:\Release\campo100/ps0830.exe + $(OutDir)$(TargetName)$(TargetExt) true %(IgnoreSpecificDefaultLibraries) .\..\release/ps0830.pdb diff --git a/build/ps0872.vcxproj b/build/ps0872.vcxproj index 86816ccf9..c6f0b4978 100644 --- a/build/ps0872.vcxproj +++ b/build/ps0872.vcxproj @@ -76,7 +76,7 @@ wsock32.lib;%(AdditionalDependencies) - D:\Release\campo100/ps0872.exe + $(OutDir)$(TargetName)$(TargetExt) true %(IgnoreSpecificDefaultLibraries) .\..\release/ps0872.pdb @@ -123,7 +123,7 @@ wsock32.lib;%(AdditionalDependencies) - ..\exed\ps0872.exe + $(OutDir)$(TargetName)$(TargetExt) true %(IgnoreSpecificDefaultLibraries) true diff --git a/build/ps0913 .vcxproj b/build/ps0913 .vcxproj index 28a19b96d..9030062fb 100644 --- a/build/ps0913 .vcxproj +++ b/build/ps0913 .vcxproj @@ -76,7 +76,7 @@ wsock32.lib;%(AdditionalDependencies) - ..\exed\ps0913.exe + $(OutDir)$(TargetName)$(TargetExt) true %(IgnoreSpecificDefaultLibraries) true @@ -124,7 +124,7 @@ wsock32.lib;%(AdditionalDependencies) - D:\Release\campo100/ps0913.exe + $(OutDir)$(TargetName)$(TargetExt) true %(IgnoreSpecificDefaultLibraries) .\..\release/ps0913.pdb diff --git a/build/ps0925.vcxproj b/build/ps0925.vcxproj index 2f5d63b94..f8bb532f9 100644 --- a/build/ps0925.vcxproj +++ b/build/ps0925.vcxproj @@ -75,7 +75,7 @@ wsock32.lib;%(AdditionalDependencies) - ..\exed\ps0925.exe + $(OutDir)$(TargetName)$(TargetExt) true %(IgnoreSpecificDefaultLibraries) true @@ -123,7 +123,7 @@ wsock32.lib;%(AdditionalDependencies) - D:\Release\campo100/ps0925.exe + $(OutDir)$(TargetName)$(TargetExt) true %(IgnoreSpecificDefaultLibraries) .\..\release/ps0925.pdb diff --git a/build/ps0982 .vcxproj b/build/ps0982 .vcxproj index 7ce634951..691c77547 100644 --- a/build/ps0982 .vcxproj +++ b/build/ps0982 .vcxproj @@ -76,7 +76,7 @@ wsock32.lib;%(AdditionalDependencies) - ..\exed\ps0982.exe + $(OutDir)$(TargetName)$(TargetExt) true %(IgnoreSpecificDefaultLibraries) true @@ -124,7 +124,7 @@ wsock32.lib;%(AdditionalDependencies) - D:\Release\campo100/ps0982.exe + $(OutDir)$(TargetName)$(TargetExt) true %(IgnoreSpecificDefaultLibraries) .\..\release/ps0982.pdb diff --git a/build/ps1001.vcxproj b/build/ps1001.vcxproj index 277ae7c75..944db079c 100644 --- a/build/ps1001.vcxproj +++ b/build/ps1001.vcxproj @@ -76,7 +76,7 @@ wsock32.lib;%(AdditionalDependencies) - ..\exed\ps1001.exe + $(OutDir)$(TargetName)$(TargetExt) true %(IgnoreSpecificDefaultLibraries) true @@ -124,7 +124,7 @@ wsock32.lib;%(AdditionalDependencies) - D:\Release\campo100/ps1001.exe + $(OutDir)$(TargetName)$(TargetExt) true %(IgnoreSpecificDefaultLibraries) .\..\release/ps1001.pdb diff --git a/build/ps1100.vcxproj b/build/ps1100.vcxproj index baf3ce8b3..28d706ab4 100644 --- a/build/ps1100.vcxproj +++ b/build/ps1100.vcxproj @@ -75,7 +75,7 @@ wsock32.lib;%(AdditionalDependencies) - ..\exed\ps1100.exe + $(OutDir)$(TargetName)$(TargetExt) true %(IgnoreSpecificDefaultLibraries) true @@ -123,7 +123,7 @@ wsock32.lib;%(AdditionalDependencies) - D:\Release\campo100/ps1100.exe + $(OutDir)$(TargetName)$(TargetExt) true %(IgnoreSpecificDefaultLibraries) .\..\release/ps1100.pdb diff --git a/build/ps1104.vcxproj b/build/ps1104.vcxproj index f14e27c68..700d66041 100644 --- a/build/ps1104.vcxproj +++ b/build/ps1104.vcxproj @@ -75,7 +75,7 @@ wsock32.lib;%(AdditionalDependencies) - ..\exed\ps1104.exe + $(OutDir)$(TargetName)$(TargetExt) true %(IgnoreSpecificDefaultLibraries) true @@ -123,7 +123,7 @@ wsock32.lib;%(AdditionalDependencies) - D:\Release\campo100/ps1104.exe + $(OutDir)$(TargetName)$(TargetExt) true %(IgnoreSpecificDefaultLibraries) .\..\release/ps1104.pdb diff --git a/build/pt0001.vcxproj b/build/pt0001.vcxproj index 53979a461..20e551636 100644 --- a/build/pt0001.vcxproj +++ b/build/pt0001.vcxproj @@ -82,7 +82,7 @@ version.lib;wsock32.lib;comctl32.lib;rpcrt4.lib;%(AdditionalDependencies) - D:\Release\campo100/pt0001.exe + $(OutDir)$(TargetName)$(TargetExt) true libc.lib;%(IgnoreSpecificDefaultLibraries) $(TargetDir)$(TargetName).pdb @@ -129,7 +129,7 @@ version.lib;wsock32.lib;comctl32.lib;rpcrt4.lib;%(AdditionalDependencies) - ..\exed\pt0001.exe + $(OutDir)$(TargetName)$(TargetExt) true libc.lib;%(IgnoreSpecificDefaultLibraries) true diff --git a/build/pt0003.vcxproj b/build/pt0003.vcxproj index 817ada7bb..42b330684 100644 --- a/build/pt0003.vcxproj +++ b/build/pt0003.vcxproj @@ -83,7 +83,7 @@ version.lib;wsock32.lib;comctl32.lib;rpcrt4.lib;%(AdditionalDependencies) - D:\Release\campo100/pt0003.exe + $(OutDir)$(TargetName)$(TargetExt) true libc.lib;%(IgnoreSpecificDefaultLibraries) $(TargetDir)$(TargetName).pdb @@ -130,7 +130,7 @@ version.lib;wsock32.lib;comctl32.lib;rpcrt4.lib;%(AdditionalDependencies) - ..\exed\pt0003.exe + $(OutDir)$(TargetName)$(TargetExt) true libc.lib;%(IgnoreSpecificDefaultLibraries) true diff --git a/build/pt0195.vcxproj b/build/pt0195.vcxproj index 76140c114..bb84e5a45 100644 --- a/build/pt0195.vcxproj +++ b/build/pt0195.vcxproj @@ -81,7 +81,7 @@ version.lib;wsock32.lib;comctl32.lib;rpcrt4.lib;%(AdditionalDependencies) - ..\exed\pt0195.exe + $(OutDir)$(TargetName)$(TargetExt) true libc.lib;%(IgnoreSpecificDefaultLibraries) true @@ -130,7 +130,7 @@ version.lib;wsock32.lib;comctl32.lib;rpcrt4.lib;%(AdditionalDependencies) - D:\Release\campo100/pt0195.exe + $(OutDir)$(TargetName)$(TargetExt) true libc.lib;%(IgnoreSpecificDefaultLibraries) $(TargetDir)$(TargetName).pdb diff --git a/build/ri.sln b/build/ri.sln index 4b8824beb..06555fe77 100644 --- a/build/ri.sln +++ b/build/ri.sln @@ -1,10 +1,12 @@  Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual C++ Express 2010 +# Visual Studio 2010 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ri0", "ri0.vcxproj", "{E3E7DE6C-EDE3-48D4-8F15-333B71AE4AC2}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ri1", "ri1.vcxproj", "{53A55171-13C0-4BDE-8325-1186461B9EAA}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AgaLib", "AgaLib.vcxproj", "{2D38A763-3D74-4338-9362-B891784EC90E}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -19,6 +21,10 @@ Global {53A55171-13C0-4BDE-8325-1186461B9EAA}.Debug|Win32.Build.0 = Debug|Win32 {53A55171-13C0-4BDE-8325-1186461B9EAA}.Release|Win32.ActiveCfg = Release|Win32 {53A55171-13C0-4BDE-8325-1186461B9EAA}.Release|Win32.Build.0 = Release|Win32 + {2D38A763-3D74-4338-9362-B891784EC90E}.Debug|Win32.ActiveCfg = Debug|Win32 + {2D38A763-3D74-4338-9362-B891784EC90E}.Debug|Win32.Build.0 = Debug|Win32 + {2D38A763-3D74-4338-9362-B891784EC90E}.Release|Win32.ActiveCfg = Release|Win32 + {2D38A763-3D74-4338-9362-B891784EC90E}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/build/ri0.vcxproj b/build/ri0.vcxproj index 56373a286..efed9d352 100644 --- a/build/ri0.vcxproj +++ b/build/ri0.vcxproj @@ -178,12 +178,9 @@ - - true - - - true - + + {2d38a763-3d74-4338-9362-b891784ec90e} + diff --git a/build/ri0.vcxproj.filters b/build/ri0.vcxproj.filters index 00b5fd0b4..a77cb64a4 100644 --- a/build/ri0.vcxproj.filters +++ b/build/ri0.vcxproj.filters @@ -77,10 +77,6 @@ - - - - Menu diff --git a/build/ri1.vcxproj b/build/ri1.vcxproj index d1bf1f754..ba72125c7 100644 --- a/build/ri1.vcxproj +++ b/build/ri1.vcxproj @@ -174,14 +174,9 @@ - - Document - true - - - Document - true - + + {2d38a763-3d74-4338-9362-b891784ec90e} + diff --git a/build/ri1.vcxproj.filters b/build/ri1.vcxproj.filters index 5aaea73f2..37fd2d1f5 100644 --- a/build/ri1.vcxproj.filters +++ b/build/ri1.vcxproj.filters @@ -71,8 +71,4 @@ - - - - \ No newline at end of file diff --git a/build/sl.sln b/build/sl.sln index 000fb305d..f0cf55345 100644 --- a/build/sl.sln +++ b/build/sl.sln @@ -1,8 +1,14 @@  Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual C++ Express 2010 +# Visual Studio 2010 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sl0", "sl0.vcxproj", "{9C91BACF-9A70-4973-B8CC-FA3D2AF9867C}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AgaLib", "AgaLib.vcxproj", "{2D38A763-3D74-4338-9362-B891784EC90E}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vedoc", "vedoc.vcxproj", "{A1CE9743-A597-4F92-B55A-345A366C9E55}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vedocext", "vedocext.vcxproj", "{0042619A-6B7C-4D3D-9CD9-9BDD8D200C15}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -13,6 +19,18 @@ Global {9C91BACF-9A70-4973-B8CC-FA3D2AF9867C}.Debug|Win32.Build.0 = Debug|Win32 {9C91BACF-9A70-4973-B8CC-FA3D2AF9867C}.Release|Win32.ActiveCfg = Release|Win32 {9C91BACF-9A70-4973-B8CC-FA3D2AF9867C}.Release|Win32.Build.0 = Release|Win32 + {2D38A763-3D74-4338-9362-B891784EC90E}.Debug|Win32.ActiveCfg = Debug|Win32 + {2D38A763-3D74-4338-9362-B891784EC90E}.Debug|Win32.Build.0 = Debug|Win32 + {2D38A763-3D74-4338-9362-B891784EC90E}.Release|Win32.ActiveCfg = Release|Win32 + {2D38A763-3D74-4338-9362-B891784EC90E}.Release|Win32.Build.0 = Release|Win32 + {A1CE9743-A597-4F92-B55A-345A366C9E55}.Debug|Win32.ActiveCfg = Debug|Win32 + {A1CE9743-A597-4F92-B55A-345A366C9E55}.Debug|Win32.Build.0 = Debug|Win32 + {A1CE9743-A597-4F92-B55A-345A366C9E55}.Release|Win32.ActiveCfg = Release|Win32 + {A1CE9743-A597-4F92-B55A-345A366C9E55}.Release|Win32.Build.0 = Release|Win32 + {0042619A-6B7C-4D3D-9CD9-9BDD8D200C15}.Debug|Win32.ActiveCfg = Debug|Win32 + {0042619A-6B7C-4D3D-9CD9-9BDD8D200C15}.Debug|Win32.Build.0 = Debug|Win32 + {0042619A-6B7C-4D3D-9CD9-9BDD8D200C15}.Release|Win32.ActiveCfg = Release|Win32 + {0042619A-6B7C-4D3D-9CD9-9BDD8D200C15}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/build/sl0.vcxproj b/build/sl0.vcxproj index 7ce02575d..9b524c5cb 100644 --- a/build/sl0.vcxproj +++ b/build/sl0.vcxproj @@ -181,26 +181,6 @@ - - - true - - - true - - - true - - - true - - - true - - - true - - Designer @@ -208,6 +188,17 @@ + + + {2d38a763-3d74-4338-9362-b891784ec90e} + + + {a1ce9743-a597-4f92-b55a-345a366c9e55} + + + {0042619a-6b7c-4d3d-9cd9-9bdd8d200c15} + + diff --git a/build/sl0.vcxproj.filters b/build/sl0.vcxproj.filters index 2808c3a06..6e7805d4a 100644 --- a/build/sl0.vcxproj.filters +++ b/build/sl0.vcxproj.filters @@ -67,14 +67,6 @@ - - - - - - - - Reports diff --git a/build/sv.sln b/build/sv.sln index cb76b836b..469debbc8 100644 --- a/build/sv.sln +++ b/build/sv.sln @@ -1,12 +1,16 @@  Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual C++ Express 2010 +# Visual Studio 2010 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sv0", "sv0.vcxproj", "{B24F30AB-C349-4579-BF5B-58548B763544}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sv1", "sv1.vcxproj", "{1AE03FAE-9ED0-482A-B3B2-F436BEB9DC0B}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sv2", "sv2.vcxproj", "{AC320BF8-44C5-403F-A582-94101C285A97}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AgaLib", "AgaLib.vcxproj", "{2D38A763-3D74-4338-9362-B891784EC90E}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vedoc", "vedoc.vcxproj", "{A1CE9743-A597-4F92-B55A-345A366C9E55}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -25,6 +29,14 @@ Global {AC320BF8-44C5-403F-A582-94101C285A97}.Debug|Win32.Build.0 = Debug|Win32 {AC320BF8-44C5-403F-A582-94101C285A97}.Release|Win32.ActiveCfg = Release|Win32 {AC320BF8-44C5-403F-A582-94101C285A97}.Release|Win32.Build.0 = Release|Win32 + {2D38A763-3D74-4338-9362-B891784EC90E}.Debug|Win32.ActiveCfg = Debug|Win32 + {2D38A763-3D74-4338-9362-B891784EC90E}.Debug|Win32.Build.0 = Debug|Win32 + {2D38A763-3D74-4338-9362-B891784EC90E}.Release|Win32.ActiveCfg = Release|Win32 + {2D38A763-3D74-4338-9362-B891784EC90E}.Release|Win32.Build.0 = Release|Win32 + {A1CE9743-A597-4F92-B55A-345A366C9E55}.Debug|Win32.ActiveCfg = Debug|Win32 + {A1CE9743-A597-4F92-B55A-345A366C9E55}.Debug|Win32.Build.0 = Debug|Win32 + {A1CE9743-A597-4F92-B55A-345A366C9E55}.Release|Win32.ActiveCfg = Release|Win32 + {A1CE9743-A597-4F92-B55A-345A366C9E55}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/build/sv0.vcxproj b/build/sv0.vcxproj index decab2772..a5cb37fc3 100644 --- a/build/sv0.vcxproj +++ b/build/sv0.vcxproj @@ -201,22 +201,15 @@ - - true - - - true - - - Document - true - - - Document - + - + + {2d38a763-3d74-4338-9362-b891784ec90e} + + + {a1ce9743-a597-4f92-b55a-345a366c9e55} + diff --git a/build/sv0.vcxproj.filters b/build/sv0.vcxproj.filters index e6e92d580..342a3fb65 100644 --- a/build/sv0.vcxproj.filters +++ b/build/sv0.vcxproj.filters @@ -68,12 +68,6 @@ - - - - - - diff --git a/build/sv1.vcxproj b/build/sv1.vcxproj index 7766a90e6..86a7c35ad 100644 --- a/build/sv1.vcxproj +++ b/build/sv1.vcxproj @@ -212,21 +212,15 @@ - - Document - true - - - Document - true - - - true - - + - + + {2d38a763-3d74-4338-9362-b891784ec90e} + + + {a1ce9743-a597-4f92-b55a-345a366c9e55} + diff --git a/build/sv1.vcxproj.filters b/build/sv1.vcxproj.filters index d48b4a366..a338f6428 100644 --- a/build/sv1.vcxproj.filters +++ b/build/sv1.vcxproj.filters @@ -110,12 +110,6 @@ Ini - - - - - - diff --git a/build/sv2.vcxproj b/build/sv2.vcxproj index af882fdca..81fff74b3 100644 --- a/build/sv2.vcxproj +++ b/build/sv2.vcxproj @@ -169,22 +169,12 @@ - - Document - true - - - Document - true - - - Document - true - - - Document - true - + + {2d38a763-3d74-4338-9362-b891784ec90e} + + + {a1ce9743-a597-4f92-b55a-345a366c9e55} + diff --git a/build/sv2.vcxproj.filters b/build/sv2.vcxproj.filters index f70be1e49..4f9a1ea38 100644 --- a/build/sv2.vcxproj.filters +++ b/build/sv2.vcxproj.filters @@ -33,10 +33,4 @@ - - - - - - \ No newline at end of file diff --git a/build/tc3.vcxproj b/build/tc3.vcxproj index f90e9a18e..dd9b9ae62 100644 --- a/build/tc3.vcxproj +++ b/build/tc3.vcxproj @@ -154,11 +154,9 @@ %(PreprocessorDefinitions) - - @@ -169,7 +167,6 @@ - diff --git a/build/tc3.vcxproj.filters b/build/tc3.vcxproj.filters index de56e87d6..6154e0b4b 100644 --- a/build/tc3.vcxproj.filters +++ b/build/tc3.vcxproj.filters @@ -10,9 +10,6 @@ Sources - - Sources - Sources @@ -27,9 +24,6 @@ Headers - - Headers - Headers @@ -56,9 +50,6 @@ Masks - - Masks - Masks diff --git a/build/tf0.vcxproj b/build/tf0.vcxproj index 1a7880679..682c0e150 100644 --- a/build/tf0.vcxproj +++ b/build/tf0.vcxproj @@ -171,7 +171,6 @@ - @@ -180,8 +179,6 @@ - - diff --git a/build/tf0.vcxproj.filters b/build/tf0.vcxproj.filters index 97eac9807..3ba731b15 100644 --- a/build/tf0.vcxproj.filters +++ b/build/tf0.vcxproj.filters @@ -36,9 +36,6 @@ Headers - - Headers - @@ -56,12 +53,6 @@ Sources - - Sources - - - Sources - diff --git a/build/tp.sln b/build/tp.sln index a6cd39e4e..6d26c1dd9 100644 --- a/build/tp.sln +++ b/build/tp.sln @@ -1,8 +1,12 @@  Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual C++ Express 2010 +# Visual Studio 2010 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tp0", "tp0.vcxproj", "{7F47BB01-1600-4ED1-852A-6111116DB1F6}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AgaLib", "AgaLib.vcxproj", "{2D38A763-3D74-4338-9362-B891784EC90E}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vedoc", "vedoc.vcxproj", "{A1CE9743-A597-4F92-B55A-345A366C9E55}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -13,6 +17,14 @@ Global {7F47BB01-1600-4ED1-852A-6111116DB1F6}.Debug|Win32.Build.0 = Debug|Win32 {7F47BB01-1600-4ED1-852A-6111116DB1F6}.Release|Win32.ActiveCfg = Release|Win32 {7F47BB01-1600-4ED1-852A-6111116DB1F6}.Release|Win32.Build.0 = Release|Win32 + {2D38A763-3D74-4338-9362-B891784EC90E}.Debug|Win32.ActiveCfg = Debug|Win32 + {2D38A763-3D74-4338-9362-B891784EC90E}.Debug|Win32.Build.0 = Debug|Win32 + {2D38A763-3D74-4338-9362-B891784EC90E}.Release|Win32.ActiveCfg = Release|Win32 + {2D38A763-3D74-4338-9362-B891784EC90E}.Release|Win32.Build.0 = Release|Win32 + {A1CE9743-A597-4F92-B55A-345A366C9E55}.Debug|Win32.ActiveCfg = Debug|Win32 + {A1CE9743-A597-4F92-B55A-345A366C9E55}.Debug|Win32.Build.0 = Debug|Win32 + {A1CE9743-A597-4F92-B55A-345A366C9E55}.Release|Win32.ActiveCfg = Release|Win32 + {A1CE9743-A597-4F92-B55A-345A366C9E55}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/build/tp0.vcxproj b/build/tp0.vcxproj index b84f33d03..9ebd3636b 100644 --- a/build/tp0.vcxproj +++ b/build/tp0.vcxproj @@ -256,18 +256,12 @@ - - true - - - true - - - true - - - true - + + {2d38a763-3d74-4338-9362-b891784ec90e} + + + {a1ce9743-a597-4f92-b55a-345a366c9e55} + diff --git a/build/tp0.vcxproj.filters b/build/tp0.vcxproj.filters index ff6e554bd..36bf60837 100644 --- a/build/tp0.vcxproj.filters +++ b/build/tp0.vcxproj.filters @@ -185,12 +185,6 @@ - - - - - - Menu diff --git a/build/ve0.vcxproj b/build/ve0.vcxproj index ef103dd45..548abc02a 100644 --- a/build/ve0.vcxproj +++ b/build/ve0.vcxproj @@ -211,6 +211,9 @@ {2d38a763-3d74-4338-9362-b891784ec90e} + + {c575788b-0be4-4f68-b9c9-3c204ec04e07} + {a1ce9743-a597-4f92-b55a-345a366c9e55} false diff --git a/build/ve8.vcxproj b/build/ve8.vcxproj index d87e9a490..3cd5ced0e 100644 --- a/build/ve8.vcxproj +++ b/build/ve8.vcxproj @@ -152,6 +152,7 @@ + %(AdditionalIncludeDirectories) diff --git a/build/ve8.vcxproj.filters b/build/ve8.vcxproj.filters index 560b404c3..88c9c2714 100644 --- a/build/ve8.vcxproj.filters +++ b/build/ve8.vcxproj.filters @@ -43,6 +43,9 @@ Sources + + Sources + diff --git a/build/vedoc.vcxproj b/build/vedoc.vcxproj index 3f8d51fe9..fb2586a3a 100644 --- a/build/vedoc.vcxproj +++ b/build/vedoc.vcxproj @@ -83,7 +83,7 @@ Disabled ..\src\include;..\src\xvaga;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_LIB;__LONGDOUBLE__;%(PreprocessorDefinitions) + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true true EnableFastChecks