From 322bfda07e5b461dfb860070326f67f66a1da0a9 Mon Sep 17 00:00:00 2001 From: bonazzi Date: Tue, 20 Dec 2016 21:25:40 +0000 Subject: [PATCH] Patch level : 12.0 Files correlati : Modificati progetti git-svn-id: svn://10.65.10.50/branches/R_10_00@23468 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- build/Or1.vcxproj | 50 +++++---- build/Or1.vcxproj.filters | 6 - build/agalib_rep.vcxproj | 4 +- build/ba.sln | 16 +++ build/ba9.vcxproj | 229 ++++++++++++++++++++++++++++++++++++++ build/ba9.vcxproj.filters | 121 ++++++++++++++++++++ build/lv.sln | 20 +++- build/lv0.vcxproj | 56 +++++----- build/lv0.vcxproj.filters | 27 +---- build/lv1.vcxproj | 60 +++++----- build/lv1.vcxproj.filters | 8 -- build/lv2.vcxproj | 55 +++++---- build/lv2.vcxproj.filters | 27 +---- build/lv3.vcxproj | 60 +++++----- build/lv3.vcxproj.filters | 28 +---- build/lv4.vcxproj | 65 ++++++----- build/lv4.vcxproj.filters | 27 +---- build/or.sln | 14 ++- 18 files changed, 580 insertions(+), 293 deletions(-) create mode 100644 build/ba9.vcxproj create mode 100644 build/ba9.vcxproj.filters diff --git a/build/Or1.vcxproj b/build/Or1.vcxproj index 60207b9c3..cd13bf351 100644 --- a/build/Or1.vcxproj +++ b/build/Or1.vcxproj @@ -39,10 +39,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - $(Configuration)\$(ProjectName)\ + ..\obj\ false - ..\exed\ - $(Configuration)\$(ProjectName)\ + ..\exe\ + ..\obj\ true false false @@ -68,6 +68,7 @@ true Level3 true + $(IntDir)$(TargetName).pdb NDEBUG;%(PreprocessorDefinitions) @@ -84,11 +85,19 @@ MachineX86 12.0 false + $(IntDir)$(TargetName).pdb + $(IntDir)$(TargetName).pgd true - .\..\release/Or1.bsc + $(IntDir)$(TargetName).bsc + + $(IntDir)$(TargetName).manifest + + + $(IntDir)$(TargetName).xml + @@ -109,8 +118,9 @@ true Level3 true - ProgramDatabase + EditAndContinue true + $(IntDir)$(TargetName).pdb _DEBUG;%(PreprocessorDefinitions) @@ -128,11 +138,19 @@ MachineX86 12.0 + $(IntDir)$(TargetName).pdb + $(IntDir)$(TargetName).pgd true - .\..\debug/Or1.bsc + $(IntDir)$(TargetName).bsc + + $(IntDir)$(TargetName).manifest + + + $(IntDir)$(TargetName).xml + @@ -213,21 +231,15 @@ - - true - - - true - - - true - - - true - + - + + {2d38a763-3d74-4338-9362-b891784ec90e} + + + {a1ce9743-a597-4f92-b55a-345a366c9e55} + diff --git a/build/Or1.vcxproj.filters b/build/Or1.vcxproj.filters index cfcca16a4..7ef85e08d 100644 --- a/build/Or1.vcxproj.filters +++ b/build/Or1.vcxproj.filters @@ -95,12 +95,6 @@ Forms - - - - - - diff --git a/build/agalib_rep.vcxproj b/build/agalib_rep.vcxproj index c870d77c0..4997b1ebd 100644 --- a/build/agalib_rep.vcxproj +++ b/build/agalib_rep.vcxproj @@ -142,7 +142,9 @@ Designer - + + Designer + diff --git a/build/ba.sln b/build/ba.sln index ee802507c..5ff52c5ea 100644 --- a/build/ba.sln +++ b/build/ba.sln @@ -37,6 +37,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AgaLib", "AgaLib.vcxproj", EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vedoc", "vedoc.vcxproj", "{A1CE9743-A597-4F92-B55A-345A366C9E55}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ba9", "ba9.vcxproj", "{1A66F6D4-F7BF-4363-AB8F-98FEEC920CAA}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vedocext", "vedocext.vcxproj", "{0042619A-6B7C-4D3D-9CD9-9BDD8D200C15}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -155,6 +159,18 @@ Global {A1CE9743-A597-4F92-B55A-345A366C9E55}.Release|Win32.ActiveCfg = Release|Win32 {A1CE9743-A597-4F92-B55A-345A366C9E55}.Release|Win32.Build.0 = Release|Win32 {A1CE9743-A597-4F92-B55A-345A366C9E55}.Release|x64.ActiveCfg = Release|Win32 + {1A66F6D4-F7BF-4363-AB8F-98FEEC920CAA}.Debug|Win32.ActiveCfg = Debug|Win32 + {1A66F6D4-F7BF-4363-AB8F-98FEEC920CAA}.Debug|Win32.Build.0 = Debug|Win32 + {1A66F6D4-F7BF-4363-AB8F-98FEEC920CAA}.Debug|x64.ActiveCfg = Debug|Win32 + {1A66F6D4-F7BF-4363-AB8F-98FEEC920CAA}.Release|Win32.ActiveCfg = Release|Win32 + {1A66F6D4-F7BF-4363-AB8F-98FEEC920CAA}.Release|Win32.Build.0 = Release|Win32 + {1A66F6D4-F7BF-4363-AB8F-98FEEC920CAA}.Release|x64.ActiveCfg = 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}.Debug|x64.ActiveCfg = Debug|Win32 + {0042619A-6B7C-4D3D-9CD9-9BDD8D200C15}.Release|Win32.ActiveCfg = Release|Win32 + {0042619A-6B7C-4D3D-9CD9-9BDD8D200C15}.Release|Win32.Build.0 = Release|Win32 + {0042619A-6B7C-4D3D-9CD9-9BDD8D200C15}.Release|x64.ActiveCfg = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/build/ba9.vcxproj b/build/ba9.vcxproj new file mode 100644 index 000000000..43e6ea117 --- /dev/null +++ b/build/ba9.vcxproj @@ -0,0 +1,229 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {1A66F6D4-F7BF-4363-AB8F-98FEEC920CAA} + ba9 + + + + Application + false + + + Application + false + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + ..\exe\ + ..\obj\ + false + ..\exe\ + ..\obj\ + true + false + false + false + false + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\..\release/ba9.tlb + + + + + MaxSpeed + OnlyExplicitInline + ..\src\include;..\src\xvaga;..\src\xi;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_WINDOWS;%(PreprocessorDefinitions) + true + MultiThreaded + true + Level3 + true + ProgramDatabase + $(IntDir)$(TargetName).pdb + + + NDEBUG;%(PreprocessorDefinitions) + 0x0410 + ..\wx28X\include;%(AdditionalIncludeDirectories) + + + wsock32.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName)$(TargetExt) + true + %(IgnoreSpecificDefaultLibraries) + false + $(IntDir)$(TargetName).pdb + Windows + false + + + MachineX86 + 12.0 + $(IntDir)$(TargetName).pgd + + + true + $(IntDir)$(TargetName).bsc + + + $(IntDir)$(TargetName).xml + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\..\Debug/ba9.tlb + + + + + Disabled + ..\src\include;..\src\xvaga;..\src\xi;%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_WINDOWS;__LONGDOUBLE__;%(PreprocessorDefinitions) + true + MultiThreadedDebug + true + Level3 + true + EditAndContinue + $(IntDir)$(TargetName).pdb + + + _DEBUG;%(PreprocessorDefinitions) + 0x0410 + ..\wx28X\include;%(AdditionalIncludeDirectories) + + + wsock32.lib;%(AdditionalDependencies) + true + %(IgnoreSpecificDefaultLibraries) + true + $(IntDir)$(TargetName).pdb + Windows + false + + + MachineX86 + $(OutDir)$(TargetName)$(TargetExt) + 12.0 + $(IntDir)$(TargetName).pgd + + + true + $(IntDir)$(TargetName).bsc + + + $(IntDir)$(TargetName).xml + + + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Document + true + + + Document + true + + + + + + + + {2d38a763-3d74-4338-9362-b891784ec90e} + + + {a1ce9743-a597-4f92-b55a-345a366c9e55} + + + {0042619a-6b7c-4d3d-9cd9-9bdd8d200c15} + + + + + + + + + + + \ No newline at end of file diff --git a/build/ba9.vcxproj.filters b/build/ba9.vcxproj.filters new file mode 100644 index 000000000..e49324637 --- /dev/null +++ b/build/ba9.vcxproj.filters @@ -0,0 +1,121 @@ + + + + + Sources + + + Sources + + + + + + + + Masks + + + Masks + + + Masks + + + Masks + + + Masks + + + Masks + + + Masks + + + Masks + + + Masks + + + Masks + + + Masks + + + Masks + + + Masks + + + Masks + + + Masks + + + Masks + + + Masks + + + Masks + + + Masks + + + Masks + + + Masks + + + Masks + + + Masks + + + Masks + + + + + {39a57a53-56a3-4655-b196-82085ccaf9d3} + *.msk + + + {a2ea55de-cdf5-44a2-99ea-4c23d4ef81d9} + .h + + + {7a2a9429-a0c5-4acc-a433-7f829479d530} + + + {f4ebd3cd-8565-42ac-abed-9ae94c3ba1f3} + *.rep + + + + + Headers + + + Headers + + + + + Reports + + + Reports + + + \ No newline at end of file diff --git a/build/lv.sln b/build/lv.sln index 3ec084bdc..a4014f486 100644 --- a/build/lv.sln +++ b/build/lv.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}") = "lv0", "lv0.vcxproj", "{2DB7F8EF-BABB-4A27-BC7D-8821B0D285C6}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lv2", "lv2.vcxproj", "{8F2CFD2E-BDE5-44CC-B27D-BCEC31F5E55D}" @@ -15,6 +15,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lv1", "lv1.vcxproj", "{A3CA EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lv4", "lv4.vcxproj", "{1F1F976E-25BA-4891-9B63-6E8879A9ED24}" 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 @@ -49,6 +55,18 @@ Global {1F1F976E-25BA-4891-9B63-6E8879A9ED24}.Debug|Win32.Build.0 = Debug|Win32 {1F1F976E-25BA-4891-9B63-6E8879A9ED24}.Release|Win32.ActiveCfg = Release|Win32 {1F1F976E-25BA-4891-9B63-6E8879A9ED24}.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/lv0.vcxproj b/build/lv0.vcxproj index c5d1da767..daf119cf0 100644 --- a/build/lv0.vcxproj +++ b/build/lv0.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,9 +67,10 @@ true MultiThreaded true - .\..\release/lv0.pch + $(IntDir)$(TargetName).pch Level3 true + $(IntDir)$(TargetName).pdb NDEBUG;%(PreprocessorDefinitions) @@ -80,7 +81,7 @@ wsock32.lib;%(AdditionalDependencies) true %(IgnoreSpecificDefaultLibraries) - .\..\release/lv0.pdb + $(IntDir)$(TargetName).pdb Windows false @@ -88,10 +89,11 @@ MachineX86 12.0 false + $(IntDir)$(TargetName).pgd true - .\..\release/lv0.bsc + $(IntDir)$(TargetName).bsc @@ -110,12 +112,13 @@ _DEBUG;WIN32;_WINDOWS;__LONGDOUBLE__;%(PreprocessorDefinitions) false MultiThreadedDebug - .\..\debug/lv0.pch + $(IntDir)$(TargetName).pch true Level3 true ProgramDatabase true + $(IntDir)$(TargetName).pdb _DEBUG;%(PreprocessorDefinitions) @@ -133,11 +136,16 @@ MachineX86 $(OutDir)$(TargetName)$(TargetExt) 12.0 + $(IntDir)$(TargetName).pgd + $(IntDir)$(TargetName).pdb true - .\..\debug/lv0.bsc + $(IntDir)$(TargetName).bsc + + $(IntDir)$(TargetName).xml + @@ -431,25 +439,15 @@ - - true - - - Document - true - - - true - - - true - - - true - - - true - + + {2d38a763-3d74-4338-9362-b891784ec90e} + + + {a1ce9743-a597-4f92-b55a-345a366c9e55} + + + {0042619a-6b7c-4d3d-9cd9-9bdd8d200c15} + diff --git a/build/lv0.vcxproj.filters b/build/lv0.vcxproj.filters index 47a702b02..64c73a5e0 100644 --- a/build/lv0.vcxproj.filters +++ b/build/lv0.vcxproj.filters @@ -39,9 +39,6 @@ {b2d2db1b-a454-4c3a-b337-a9ce56648a00} uml - - {6481c4ab-dc01-47a0-a4b6-eaf0c3365d25} - @@ -533,26 +530,6 @@ Txts - - - Libraries - - - Libraries - - - Libraries - - - Libraries - - - Libraries - - - Libraries - - Menu @@ -562,8 +539,6 @@ - - Libraries - + \ No newline at end of file diff --git a/build/lv1.vcxproj b/build/lv1.vcxproj index 0207bfe79..5d8a24f2e 100644 --- a/build/lv1.vcxproj +++ b/build/lv1.vcxproj @@ -38,11 +38,11 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - $(Configuration)\$(ProjectName)\ - false - ..\exed\ - $(Configuration)\$(ProjectName)\ - false + ..\obj\ + true + ..\exe\ + ..\obj\ + true false false false @@ -66,9 +66,10 @@ true MultiThreaded true - .\..\release/lv1.pch + $(IntDir)$(TargetName).pch Level3 true + $(IntDir)$(TargetName).pdb NDEBUG;%(PreprocessorDefinitions) @@ -79,7 +80,7 @@ wsock32.lib;%(AdditionalDependencies) true %(IgnoreSpecificDefaultLibraries) - .\..\release/lv1.pdb + $(IntDir)$(TargetName).pdb Windows false @@ -87,11 +88,15 @@ MachineX86 12.0 false + $(IntDir)$(TargetName).pgd true - .\..\release/lv1.bsc + $(IntDir)$(TargetName).bsc + + $(IntDir)$(TargetName).xml + @@ -109,12 +114,13 @@ _DEBUG;WIN32;_WINDOWS;__LONGDOUBLE__;%(PreprocessorDefinitions) false MultiThreadedDebug - .\..\debug/lv1.pch + $(IntDir)$(TargetName).pch true Level3 true ProgramDatabase true + $(IntDir)$(TargetName).pdb _DEBUG;%(PreprocessorDefinitions) @@ -132,11 +138,17 @@ MachineX86 12.0 + $(IntDir)$(TargetName).pgd + $(IntDir)$(TargetName).pdb true - .\..\debug/lv1.bsc + $(IntDir)$(TargetName).bsc + + $(IntDir)$(TargetName).xml + + @@ -192,25 +204,15 @@ - - Document - true - - - Document - - - true - - - Document - - - true - - - Document - + + {2d38a763-3d74-4338-9362-b891784ec90e} + + + {a1ce9743-a597-4f92-b55a-345a366c9e55} + + + {0042619a-6b7c-4d3d-9cd9-9bdd8d200c15} + diff --git a/build/lv1.vcxproj.filters b/build/lv1.vcxproj.filters index 0ddf2576b..2e3260ba1 100644 --- a/build/lv1.vcxproj.filters +++ b/build/lv1.vcxproj.filters @@ -77,12 +77,4 @@ - - - - - - - - \ No newline at end of file diff --git a/build/lv2.vcxproj b/build/lv2.vcxproj index 40bb72186..7cfb49e89 100644 --- a/build/lv2.vcxproj +++ b/build/lv2.vcxproj @@ -38,11 +38,11 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - $(Configuration)\$(ProjectName)\ - false - ..\exed\ - $(Configuration)\$(ProjectName)\ - false + ..\obj\ + true + ..\exe\ + ..\obj\ + true false false false @@ -66,9 +66,10 @@ true MultiThreaded true - .\..\release/lv2.pch + $(IntDir)$(TargetName).pch Level3 true + $(IntDir)$(TargetName).pdb NDEBUG;%(PreprocessorDefinitions) @@ -79,7 +80,7 @@ wsock32.lib;%(AdditionalDependencies) true %(IgnoreSpecificDefaultLibraries) - .\..\release/lv2.pdb + $(IntDir)$(TargetName).pdb Windows false @@ -87,10 +88,11 @@ MachineX86 12.0 false + $(IntDir)$(TargetName).pgd true - .\..\release/lv2.bsc + $(IntDir)$(TargetName).bsc @@ -109,12 +111,13 @@ _DEBUG;WIN32;_WINDOWS;__LONGDOUBLE__;%(PreprocessorDefinitions) false MultiThreadedDebug - .\..\debug/lv2.pch + $(IntDir)$(TargetName).pch true Level3 true ProgramDatabase true + $(IntDir)$(TargetName).pdb _DEBUG;%(PreprocessorDefinitions) @@ -132,11 +135,16 @@ MachineX86 $(OutDir)$(TargetName)$(TargetExt) 12.0 + $(IntDir)$(TargetName).pgd + $(IntDir)$(TargetName).pdb true - .\..\debug/lv2.bsc + $(IntDir)$(TargetName).bsc + + $(IntDir)$(TargetName).xml + @@ -227,24 +235,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/lv2.vcxproj.filters b/build/lv2.vcxproj.filters index d3fa3db5b..db71351bb 100644 --- a/build/lv2.vcxproj.filters +++ b/build/lv2.vcxproj.filters @@ -17,9 +17,6 @@ {09c0a36c-2468-4beb-82a7-309d3fb5dcce} rep - - {44c6ec13-1158-4cfd-b69c-262c99eee7eb} - @@ -165,28 +162,6 @@ - - Libraries - - - Libraries - - - Libraries - - - Libraries - - - Libraries - - - Libraries - - - - - Libraries - + \ No newline at end of file diff --git a/build/lv3.vcxproj b/build/lv3.vcxproj index 959e262bf..51178a703 100644 --- a/build/lv3.vcxproj +++ b/build/lv3.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,9 +67,10 @@ true MultiThreaded true - .\..\release/lv3.pch + $(IntDir)$(TargetName).pch Level3 true + $(IntDir)$(TargetName).pdb NDEBUG;%(PreprocessorDefinitions) @@ -80,7 +81,7 @@ wsock32.lib;%(AdditionalDependencies) true %(IgnoreSpecificDefaultLibraries) - .\..\release/lv3.pdb + $(IntDir)$(TargetName).pdb Windows false @@ -88,10 +89,11 @@ MachineX86 12.0 false + $(IntDir)$(TargetName).pgd true - .\..\release/lv3.bsc + $(IntDir)$(TargetName).bsc @@ -110,12 +112,13 @@ _DEBUG;WIN32;_WINDOWS;__LONGDOUBLE__;%(PreprocessorDefinitions) false MultiThreadedDebug - .\..\debug/lv3.pch + $(IntDir)$(TargetName).pch true Level3 true ProgramDatabase true + $(IntDir)$(TargetName).pdb _DEBUG;%(PreprocessorDefinitions) @@ -133,14 +136,19 @@ MachineX86 12.0 + $(IntDir)$(TargetName).pgd + $(IntDir)$(TargetName).pdb true - .\..\debug/lv3.bsc + $(IntDir)$(TargetName).bsc $(IntDir)$(TargetName)$(TargetExt).manifest + + $(IntDir)$(TargetName).xml + @@ -204,29 +212,15 @@ - - Document - true - - - 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/lv3.vcxproj.filters b/build/lv3.vcxproj.filters index ac946331c..7356dad35 100644 --- a/build/lv3.vcxproj.filters +++ b/build/lv3.vcxproj.filters @@ -13,10 +13,6 @@ {c1b98b12-77cf-43c6-9dec-8d71aeebc94f} h - - {e3a7a4ab-c0b1-4214-bb30-ee5498c0ded4} - lib - @@ -103,28 +99,6 @@ - - Libraries - - - Libraries - - - Libraries - - - Libraries - - - Libraries - - - Libraries - - - - - Libraries - + \ No newline at end of file diff --git a/build/lv4.vcxproj b/build/lv4.vcxproj index e7674a3ec..9c5580129 100644 --- a/build/lv4.vcxproj +++ b/build/lv4.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,9 +67,10 @@ true MultiThreaded true - .\..\release/lv4.pch + $(IntDir)$(TargetName).pch Level3 true + $(IntDir)$(TargetName).pdb NDEBUG;%(PreprocessorDefinitions) @@ -80,7 +81,7 @@ wsock32.lib;%(AdditionalDependencies) true %(IgnoreSpecificDefaultLibraries) - .\..\release/lv4.pdb + $(IntDir)$(TargetName).pdb Windows false @@ -88,11 +89,15 @@ MachineX86 12.0 false + $(IntDir)$(TargetName).pgd true - .\..\release/lv4.bsc + $(IntDir)$(TargetName).bsc + + $(IntDir)$(TargetName).xml + @@ -110,12 +115,13 @@ _DEBUG;WIN32;_WINDOWS;__LONGDOUBLE__;%(PreprocessorDefinitions) false MultiThreadedDebug - .\..\debug/lv4.pch + $(IntDir)$(TargetName).pch true Level3 true ProgramDatabase true + $(IntDir)$(TargetName).pdb _DEBUG;%(PreprocessorDefinitions) @@ -133,11 +139,16 @@ MachineX86 $(OutDir)$(TargetName)$(TargetExt) 12.0 + $(IntDir)$(TargetName).pgd + $(IntDir)$(TargetName).pdb true - .\..\debug/lv4.bsc + $(IntDir)$(TargetName).bsc + + $(IntDir)$(TargetName).xml + @@ -198,34 +209,22 @@ - - - Document - true - - - true - - - Document - true - - - true - - - Document - true - - - true - - Designer + + + {2d38a763-3d74-4338-9362-b891784ec90e} + + + {a1ce9743-a597-4f92-b55a-345a366c9e55} + + + {0042619a-6b7c-4d3d-9cd9-9bdd8d200c15} + + diff --git a/build/lv4.vcxproj.filters b/build/lv4.vcxproj.filters index 7599f1be4..c56f37c90 100644 --- a/build/lv4.vcxproj.filters +++ b/build/lv4.vcxproj.filters @@ -16,9 +16,6 @@ {ed3dba69-07c2-490f-8d57-8dd6ebb36117} - - {0d8c6f78-1be5-4ea9-a594-cba5c0017310} - @@ -98,34 +95,12 @@ Headers - - - Libraries - - - Libraries - - - Libraries - - - Libraries - - - Libraries - - - Libraries - - Reports - - Libraries - + \ No newline at end of file diff --git a/build/or.sln b/build/or.sln index 8c80a8911..f1510f1dc 100644 --- a/build/or.sln +++ b/build/or.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}") = "Or1", "Or1.vcxproj", "{BBB4EEFA-F24B-4B6C-9632-D7F42283869D}" 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 {BBB4EEFA-F24B-4B6C-9632-D7F42283869D}.Debug|Win32.Build.0 = Debug|Win32 {BBB4EEFA-F24B-4B6C-9632-D7F42283869D}.Release|Win32.ActiveCfg = Release|Win32 {BBB4EEFA-F24B-4B6C-9632-D7F42283869D}.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