diff --git a/build/AgaLib.vcxproj.filters b/build/AgaLib.vcxproj.filters index 596a4dec8..db46852a7 100644 --- a/build/AgaLib.vcxproj.filters +++ b/build/AgaLib.vcxproj.filters @@ -8,12 +8,12 @@ {a0a53c76-a3e7-4e7e-956f-6802f73db664} - - {d1f150cf-e69b-476e-a3af-2fa8bf25d78a} - {9aa9fc1e-2710-4785-8126-72536cfcee9d} + + {d1f150cf-e69b-476e-a3af-2fa8bf25d78a} + @@ -756,7 +756,7 @@ - Libraries + Sources\Libraries \ No newline at end of file diff --git a/build/Cg7.vcxproj b/build/Cg7.vcxproj index 5db1b2479..deabece7d 100644 --- a/build/Cg7.vcxproj +++ b/build/Cg7.vcxproj @@ -171,6 +171,7 @@ + @@ -206,6 +207,7 @@ + @@ -229,6 +231,12 @@ + + + + + + diff --git a/build/Cg7.vcxproj.filters b/build/Cg7.vcxproj.filters index c4eb19486..eae20bba2 100644 --- a/build/Cg7.vcxproj.filters +++ b/build/Cg7.vcxproj.filters @@ -34,6 +34,9 @@ Source Files + + Source Files + @@ -110,6 +113,9 @@ Mask Files + + Mask Files + @@ -169,6 +175,24 @@ Report Files + + Report Files + + + Report Files + + + Report Files + + + Report Files + + + Report Files + + + Report Files + diff --git a/build/Sc0.vcxproj b/build/Sc0.vcxproj index 8c1ef8796..c90b49bbf 100644 --- a/build/Sc0.vcxproj +++ b/build/Sc0.vcxproj @@ -39,11 +39,11 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - $(Configuration)\$(ProjectName)\ - false - ..\exed\ - $(Configuration)\$(ProjectName)\ - false + ..\obj\ + true + ..\exe\ + ..\obj\ + true false false false @@ -67,12 +67,13 @@ true MultiThreaded true - .\..\release/Sc0.pch - .\..\release/ - .\..\release/ - .\..\release/ + $(IntDir) + $(IntDir) + $(IntDir) + $(IntDir) Level3 true + EditAndContinue NDEBUG;%(PreprocessorDefinitions) @@ -84,18 +85,22 @@ ..\exe/sc0.exe true %(IgnoreSpecificDefaultLibraries) - .\..\release/sc0.pdb + $(IntDir) Windows false MachineX86 false + $(IntDir) true .\..\release/Sc0.bsc + + $(IntDir) + @@ -116,8 +121,12 @@ true Level3 true - ProgramDatabase + EditAndContinue true + $(IntDir) + $(IntDir) + $(IntDir) + $(IntDir) _DEBUG;%(PreprocessorDefinitions) @@ -129,16 +138,20 @@ true %(IgnoreSpecificDefaultLibraries) true - .\..\debug/sc0.pdb + $(IntDir) Windows false MachineX86 + $(IntDir) true + + $(IntDir) + @@ -219,12 +232,9 @@ - - true - - - true - + + {2d38a763-3d74-4338-9362-b891784ec90e} + diff --git a/build/Sc0.vcxproj.filters b/build/Sc0.vcxproj.filters index 6d84d6096..61287c173 100644 --- a/build/Sc0.vcxproj.filters +++ b/build/Sc0.vcxproj.filters @@ -101,8 +101,4 @@ Headers - - - - \ No newline at end of file diff --git a/build/Sc1.vcxproj b/build/Sc1.vcxproj index 40dad187d..c744e1273 100644 --- a/build/Sc1.vcxproj +++ b/build/Sc1.vcxproj @@ -38,12 +38,12 @@ <_ProjectFileVersion>10.0.30319.1 - ..\exed\ - $(Configuration)\$(ProjectName)\ - false + ..\exe\ + ..\obj\ + true ..\exe\ - $(Configuration)\$(ProjectName)\ - false + ..\obj\ + true false false false @@ -68,8 +68,10 @@ true Level3 true - ProgramDatabase + EditAndContinue true + $(IntDir) + $(IntDir) _DEBUG;%(PreprocessorDefinitions) @@ -81,12 +83,13 @@ true %(IgnoreSpecificDefaultLibraries) true - .\..\debug/sc1.pdb + $(IntDir) Windows false MachineX86 + $(IntDir) true @@ -111,12 +114,13 @@ true MultiThreaded true - .\..\release/Sc1.pch + $(IntDir) .\..\release/ .\..\release/ .\..\release/ Level3 true + EditAndContinue NDEBUG;%(PreprocessorDefinitions) @@ -133,6 +137,8 @@ MachineX86 false + $(IntDir) + $(IntDir) true @@ -206,20 +212,16 @@ + - - Document - true - - - Document - true - + - + + {2d38a763-3d74-4338-9362-b891784ec90e} + diff --git a/build/Sc1.vcxproj.filters b/build/Sc1.vcxproj.filters index 4893f4dc5..ad90549d5 100644 --- a/build/Sc1.vcxproj.filters +++ b/build/Sc1.vcxproj.filters @@ -73,10 +73,9 @@ Headers - - - - + + Headers + diff --git a/build/Sc2.vcxproj b/build/Sc2.vcxproj index 9dd581fed..d50a06174 100644 --- a/build/Sc2.vcxproj +++ b/build/Sc2.vcxproj @@ -39,11 +39,11 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - $(Configuration)\$(ProjectName)\ + ..\obj\ true ..\exe\ - $(Configuration)\$(ProjectName)\ - false + ..\obj\ + true false false false @@ -81,12 +81,13 @@ true %(IgnoreSpecificDefaultLibraries) true - .\..\debug/sc2.pdb + $(IntDir) Windows false MachineX86 + $(IntDir) true @@ -131,6 +132,8 @@ MachineX86 + $(IntDir) + $(IntDir) true diff --git a/build/dt.sln b/build/dt.sln index 3d4c15e39..83a3bd56e 100644 --- a/build/dt.sln +++ b/build/dt.sln @@ -1,12 +1,12 @@  -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}") = "dt0", "dt0.vcproj", "{A85CE675-35D0-40FD-BCF7-505246AE3B9F}" ProjectSection(ProjectDependencies) = postProject {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 Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/build/li0.vcxproj b/build/li0.vcxproj index 9e2165e61..365185120 100644 --- a/build/li0.vcxproj +++ b/build/li0.vcxproj @@ -38,11 +38,11 @@ <_ProjectFileVersion>10.0.30319.1 - .\..\debug\ - .\..\debug\ - false + ..\exe\ + ..\obj\ + true ..\exe\ - $(Configuration)\$(ProjectName)\ + ..\obj\ false false false @@ -70,7 +70,7 @@ true Level3 true - ProgramDatabase + EditAndContinue _DEBUG;%(PreprocessorDefinitions) @@ -79,7 +79,7 @@ wsock32.lib;%(AdditionalDependencies) - ../exed/li0.exe + $(OutDir)$(TargetName)$(TargetExt) true %(IgnoreSpecificDefaultLibraries) true @@ -131,6 +131,7 @@ MachineX86 12.0 false + $(OutDir)$(TargetName)$(TargetExt) true diff --git a/build/ps0920.vcxproj b/build/ps0920.vcxproj index f831ded70..70b201acf 100644 --- a/build/ps0920.vcxproj +++ b/build/ps0920.vcxproj @@ -55,7 +55,7 @@ Disabled - ..\src\include;..\src\xvaga;%(AdditionalIncludeDirectories) + ..\src\include;..\src\xvaga;..\src\xi;%(AdditionalIncludeDirectories) _DEBUG;WIN32;__LONGDOUBLE__;_WINDOWS;%(PreprocessorDefinitions) true MultiThreadedDebug @@ -75,7 +75,7 @@ wsock32.lib;%(AdditionalDependencies) - ..\exed\ps0920.exe + $(OutDir)$(TargetName)$(TargetExt) true %(IgnoreSpecificDefaultLibraries) true @@ -206,6 +206,7 @@ + @@ -233,20 +234,29 @@ Document msk32 %(FullPath) $(TargetDir)%(Filename).msk - Compiling mask %(FullPath)... + Performing Custom Build Tools $(TargetDir)%(Filename).msk;%(Outputs) + msk32 %(FullPath) $(TargetDir)%(Filename).msk + $(TargetDir)%(Filename).msk;%(Outputs) + Performing Custom Build Tools Document msk32 %(FullPath) $(TargetDir)%(Filename).msk - Compiling mask %(FullPath)... + Performing Custom Build Tools $(TargetDir)%(Filename).msk;%(Outputs) + $(TargetDir)%(Filename).msk;%(Outputs) + msk32 %(FullPath) $(TargetDir)%(Filename).msk + Performing Custom Build Tools Document msk32 %(FullPath) $(TargetDir)%(Filename).msk - Compiling mask %(FullPath)... + Performing Custom Build Tools $(TargetDir)%(Filename).msk;%(Outputs) + msk32 %(FullPath) $(TargetDir)%(Filename).msk + $(TargetDir)%(Filename).msk;%(Outputs) + Performing Custom Build Tools diff --git a/build/ps0920.vcxproj.filters b/build/ps0920.vcxproj.filters index 3c2918f6a..86f875817 100644 --- a/build/ps0920.vcxproj.filters +++ b/build/ps0920.vcxproj.filters @@ -59,6 +59,9 @@ Headers + + Headers + diff --git a/build/ve.sln b/build/ve.sln index c026ad6f0..2075aaad9 100644 --- a/build/ve.sln +++ b/build/ve.sln @@ -32,6 +32,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "profiles", "profiles.vcxpro EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AgaLib", "AgaLib.vcxproj", "{2D38A763-3D74-4338-9362-B891784EC90E}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xi", "xi.vcxproj", "{3A5B0119-6DAD-4407-9EE1-3B739B0581E8}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xvaga", "xvaga.vcxproj", "{4A2FC619-2461-4F58-8F1D-92FA153E39A2}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -94,6 +98,14 @@ Global {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 + {3A5B0119-6DAD-4407-9EE1-3B739B0581E8}.Debug|Win32.ActiveCfg = Debug|Win32 + {3A5B0119-6DAD-4407-9EE1-3B739B0581E8}.Debug|Win32.Build.0 = Debug|Win32 + {3A5B0119-6DAD-4407-9EE1-3B739B0581E8}.Release|Win32.ActiveCfg = Release|Win32 + {3A5B0119-6DAD-4407-9EE1-3B739B0581E8}.Release|Win32.Build.0 = Release|Win32 + {4A2FC619-2461-4F58-8F1D-92FA153E39A2}.Debug|Win32.ActiveCfg = Debug|Win32 + {4A2FC619-2461-4F58-8F1D-92FA153E39A2}.Debug|Win32.Build.0 = Debug|Win32 + {4A2FC619-2461-4F58-8F1D-92FA153E39A2}.Release|Win32.ActiveCfg = Release|Win32 + {4A2FC619-2461-4F58-8F1D-92FA153E39A2}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/build/ve6.vcxproj b/build/ve6.vcxproj index 623141441..716fd40e0 100644 --- a/build/ve6.vcxproj +++ b/build/ve6.vcxproj @@ -153,7 +153,6 @@ %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -192,6 +191,8 @@ + + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -209,6 +210,7 @@ + @@ -221,6 +223,7 @@ + diff --git a/build/ve6.vcxproj.filters b/build/ve6.vcxproj.filters index 200c907f1..0862a5a63 100644 --- a/build/ve6.vcxproj.filters +++ b/build/ve6.vcxproj.filters @@ -55,7 +55,10 @@ Sources - + + Sources + + Sources @@ -87,6 +90,9 @@ Masks + + Masks + @@ -125,6 +131,9 @@ Headers + + Headers + diff --git a/build/vedoc.vcxproj b/build/vedoc.vcxproj index 151470d7d..3f8d51fe9 100644 --- a/build/vedoc.vcxproj +++ b/build/vedoc.vcxproj @@ -44,6 +44,12 @@ ..\obj\ $(ProjectName) $(ProjectName) + AllRules.ruleset + + + AllRules.ruleset + +