diff --git a/build/770.vcxproj b/build/770.vcxproj index 8fc3b98d4..88e254b20 100644 --- a/build/770.vcxproj +++ b/build/770.vcxproj @@ -39,9 +39,9 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false false false diff --git a/build/771mod.vcxproj b/build/771mod.vcxproj index 4c55ec715..48b91a0b4 100644 --- a/build/771mod.vcxproj +++ b/build/771mod.vcxproj @@ -39,10 +39,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false false false diff --git a/build/772mod.vcxproj b/build/772mod.vcxproj index d7d62188d..ce5956427 100644 --- a/build/772mod.vcxproj +++ b/build/772mod.vcxproj @@ -39,10 +39,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false false false diff --git a/build/773mod.vcxproj b/build/773mod.vcxproj index 7e9874954..20933e207 100644 --- a/build/773mod.vcxproj +++ b/build/773mod.vcxproj @@ -39,10 +39,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false false false diff --git a/build/774.vcxproj b/build/774.vcxproj index af7fc0b5e..86c486f6e 100644 --- a/build/774.vcxproj +++ b/build/774.vcxproj @@ -41,13 +41,13 @@ ..\exe\ false ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false false false false false - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ diff --git a/build/775.vcxproj b/build/775.vcxproj index 95da34756..355d4246b 100644 --- a/build/775.vcxproj +++ b/build/775.vcxproj @@ -39,10 +39,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false false false diff --git a/build/776mod.vcxproj b/build/776mod.vcxproj index 398eb28c9..46f76c18b 100644 --- a/build/776mod.vcxproj +++ b/build/776mod.vcxproj @@ -39,10 +39,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false false false diff --git a/build/777.vcxproj b/build/777.vcxproj index 1704aaedd..2bffbb920 100644 --- a/build/777.vcxproj +++ b/build/777.vcxproj @@ -39,10 +39,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false false false @@ -81,7 +81,7 @@ true %(IgnoreSpecificDefaultLibraries) true - .\..\debug/777.pdb + $(TargetDir)$(TargetName).pdb Windows false @@ -123,13 +123,14 @@ wsock32.lib;%(AdditionalDependencies) true %(IgnoreSpecificDefaultLibraries) - .\..\release/777.pdb + $(TargetDir)$(TargetName).pdb Windows false MachineX86 false + $(OutDir)$(TargetName)$(TargetExt) true diff --git a/build/AgaLib.vcxproj b/build/AgaLib.vcxproj index b9e3fd01e..c724057e4 100644 --- a/build/AgaLib.vcxproj +++ b/build/AgaLib.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -12,15 +12,18 @@ {2D38A763-3D74-4338-9362-B891784EC90E} + 10.0.16299.0 StaticLibrary false + v141 StaticLibrary false + v141 @@ -37,9 +40,9 @@ <_ProjectFileVersion>10.0.30319.1 ..\lib\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ ..\lib\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ $(ProjectName) $(ProjectName) @@ -861,9 +864,6 @@ true - - - diff --git a/build/Ba1.vcxproj b/build/Ba1.vcxproj index da469e4f3..39b88fb00 100644 --- a/build/Ba1.vcxproj +++ b/build/Ba1.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -13,15 +13,18 @@ {49C74C37-E090-49C1-9097-6F6F63EDC662} ba1 + 10.0.16299.0 Application false + v141 Application false + v141 @@ -39,9 +42,9 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false false false diff --git a/build/Ba1.vcxproj.user b/build/Ba1.vcxproj.user new file mode 100644 index 000000000..4169bb3f9 --- /dev/null +++ b/build/Ba1.vcxproj.user @@ -0,0 +1,8 @@ + + + + $(TargetDir) + WindowsLocalDebugger + -0 /uADMIN + + \ No newline at end of file diff --git a/build/Ba2.vcxproj b/build/Ba2.vcxproj index 8f5d80499..d60f32d10 100644 --- a/build/Ba2.vcxproj +++ b/build/Ba2.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -13,15 +13,18 @@ {BA2E872C-B136-4E66-AC13-F68BC866F3F6} ba2 + 10.0.16299.0 Application false + v141 Application false + v141 @@ -39,10 +42,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true false false diff --git a/build/Ba3.vcxproj b/build/Ba3.vcxproj index dbee9ff9c..4e5b6288f 100644 --- a/build/Ba3.vcxproj +++ b/build/Ba3.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -13,15 +13,18 @@ {FC9EFDA2-0C7E-4E23-A4E9-2FA75FB67A9D} ba3 + 10.0.16299.0 Application false + v141 Application false + v141 @@ -39,10 +42,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false false false diff --git a/build/Ba4.vcxproj b/build/Ba4.vcxproj index 8412aef50..7b8ddc3b9 100644 --- a/build/Ba4.vcxproj +++ b/build/Ba4.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -13,15 +13,18 @@ {25720AEB-5522-49EF-95C3-01A2CB94E5AC} ba4 + 10.0.16299.0 Application false + v141 Application false + v141 @@ -39,10 +42,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true false false diff --git a/build/Ba5.vcxproj b/build/Ba5.vcxproj index 37a9454e3..689c1bf21 100644 --- a/build/Ba5.vcxproj +++ b/build/Ba5.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -13,15 +13,18 @@ {D221B0AB-8D4C-4781-B496-C3C0641FF13B} ba5 + 10.0.16299.0 Application false + v141 Application false + v141 @@ -39,10 +42,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false false false diff --git a/build/Ba6.vcxproj b/build/Ba6.vcxproj index 39441738b..136e7aa55 100644 --- a/build/Ba6.vcxproj +++ b/build/Ba6.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -12,15 +12,18 @@ {E7F9C169-23F8-4140-AEF2-F995149DE295} + 10.0.16299.0 Application false + v141 Application false + v141 @@ -38,10 +41,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false false false diff --git a/build/Ba7.vcxproj b/build/Ba7.vcxproj index 6a42c33c1..35a9f4c76 100644 --- a/build/Ba7.vcxproj +++ b/build/Ba7.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -13,15 +13,18 @@ {F6D2167A-3F9E-42DD-A037-10AF8B5FF03B} ba7 + 10.0.16299.0 Application false + v141 Application false + v141 @@ -39,10 +42,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false false false diff --git a/build/Bacnv.vcxproj b/build/Bacnv.vcxproj index f8f15f059..ce770a169 100644 --- a/build/Bacnv.vcxproj +++ b/build/Bacnv.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -13,15 +13,18 @@ {D93637B7-B291-4E77-99E5-7FCFEE2F20C7} bacnv + 10.0.16299.0 Application false + v141 Application false + v141 @@ -39,10 +42,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true false false diff --git a/build/Bainst.vcxproj b/build/Bainst.vcxproj index 25ad04453..e729103c2 100644 --- a/build/Bainst.vcxproj +++ b/build/Bainst.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -13,15 +13,18 @@ {9B892979-53D5-4482-8E46-057C79D3692A} bainst + 10.0.16299.0 Application false + v141 Application false + v141 @@ -39,10 +42,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false false false diff --git a/build/Cacnv.vcxproj b/build/Cacnv.vcxproj index 74068d3c7..99f6f13b0 100644 --- a/build/Cacnv.vcxproj +++ b/build/Cacnv.vcxproj @@ -39,10 +39,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false false false diff --git a/build/Cb6.vcxproj b/build/Cb6.vcxproj index fad01cd4c..cd963225d 100644 --- a/build/Cb6.vcxproj +++ b/build/Cb6.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -12,15 +12,18 @@ {99683594-420F-4DD9-BB41-7DC48278B931} + 10.0.16299.0 DynamicLibrary false + v141 DynamicLibrary false + v141 @@ -37,14 +40,14 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false true false false $(ProjectName) ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false false $(ProjectName) diff --git a/build/Cg0.vcxproj b/build/Cg0.vcxproj index 15f0d4607..0ece6fee2 100644 --- a/build/Cg0.vcxproj +++ b/build/Cg0.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -13,15 +13,18 @@ {6F2EAB30-4FD7-41DE-BCE3-8CD5D4C880B4} cg0 + 10.0.16299.0 Application false + v141 Application false + v141 @@ -39,10 +42,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false false false diff --git a/build/Cg1.vcxproj b/build/Cg1.vcxproj index 97e705a37..6e0e560bc 100644 --- a/build/Cg1.vcxproj +++ b/build/Cg1.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -13,15 +13,18 @@ {9B42C6FD-9B50-42E6-A215-B641B44A931E} cg1 + 10.0.16299.0 Application false + v141 Application false + v141 @@ -39,10 +42,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false false false diff --git a/build/Cg2.vcxproj b/build/Cg2.vcxproj index e43bb4579..83a6a7d30 100644 --- a/build/Cg2.vcxproj +++ b/build/Cg2.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -13,15 +13,18 @@ {9304E774-E631-495D-A29D-774222BBF8C9} cg2 + 10.0.16299.0 Application false + v141 Application false + v141 @@ -39,10 +42,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true false false diff --git a/build/Cg3.vcxproj b/build/Cg3.vcxproj index 55393e058..1a85edbd6 100644 --- a/build/Cg3.vcxproj +++ b/build/Cg3.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -13,15 +13,18 @@ {8F1FD835-004E-4BFA-A754-42A87AFA5343} cg3 + 10.0.16299.0 Application false + v141 Application false + v141 @@ -39,10 +42,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false false false diff --git a/build/Cg4.vcxproj b/build/Cg4.vcxproj index 1663b4c92..a2f20bd47 100644 --- a/build/Cg4.vcxproj +++ b/build/Cg4.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -13,15 +13,18 @@ {F1589A59-C3AC-430E-88EC-925461405E57} cg4 + 10.0.16299.0 Application false + v141 Application false + v141 @@ -39,10 +42,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false false false diff --git a/build/Cg4.vcxproj.filters b/build/Cg4.vcxproj.filters index da666e5e4..fb4a1d8d3 100644 --- a/build/Cg4.vcxproj.filters +++ b/build/Cg4.vcxproj.filters @@ -18,9 +18,6 @@ Sources - - Sources - Sources @@ -84,6 +81,7 @@ Sources + diff --git a/build/Cg5.vcxproj b/build/Cg5.vcxproj index cccccd27a..217e75962 100644 --- a/build/Cg5.vcxproj +++ b/build/Cg5.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -13,15 +13,18 @@ {4661E972-5AAC-4B3E-92C7-C267D5070793} cg5 + 10.0.16299.0 Application false + v141 Application false + v141 @@ -39,10 +42,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false false false diff --git a/build/Cg6.vcxproj b/build/Cg6.vcxproj index 7d7fcf4f5..ab43be7e5 100644 --- a/build/Cg6.vcxproj +++ b/build/Cg6.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -13,15 +13,18 @@ {4FD17D56-D966-4F85-A04A-28EC6E0824CF} cg6 + 10.0.16299.0 Application false + v141 Application false + v141 @@ -39,10 +42,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false false false diff --git a/build/Cg7.vcxproj b/build/Cg7.vcxproj index 1e1d4b369..ba3a54550 100644 --- a/build/Cg7.vcxproj +++ b/build/Cg7.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -13,15 +13,18 @@ {95FED395-F24E-4E5B-95B5-227A99CA255F} cg7 + 10.0.16299.0 Application false + v141 Application false + v141 @@ -39,10 +42,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false false false diff --git a/build/Ef0.vcxproj b/build/Ef0.vcxproj index 0ea54a917..e519ea9c1 100644 --- a/build/Ef0.vcxproj +++ b/build/Ef0.vcxproj @@ -39,10 +39,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true false false diff --git a/build/Ef1.vcxproj b/build/Ef1.vcxproj index 33c66190e..71896c85a 100644 --- a/build/Ef1.vcxproj +++ b/build/Ef1.vcxproj @@ -39,10 +39,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true false false diff --git a/build/Or1.vcxproj b/build/Or1.vcxproj index 65c6cd5f1..67ec5e58f 100644 --- a/build/Or1.vcxproj +++ b/build/Or1.vcxproj @@ -39,10 +39,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true false false @@ -232,7 +232,9 @@ - + + ..\libraries\wx28X\include;%(AdditionalIncludeDirectories) + diff --git a/build/SSAservice.vcxproj b/build/SSAservice.vcxproj index e3c9a610e..3f79f0d2e 100644 --- a/build/SSAservice.vcxproj +++ b/build/SSAservice.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -22,25 +22,30 @@ {DE70E2D1-6A4D-4984-BD82-CE750889F0D3} CppWindowsService Win32Proj + 10.0.16299.0 Application Unicode true + v141 Application Unicode + v141 Application Unicode true + v141 Application Unicode + v141 @@ -82,8 +87,8 @@ AllRules.ruleset - ..\obj\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ + ..\obj\$(SolutionName)\$(ProjectName)\ diff --git a/build/Sc0.vcxproj b/build/Sc0.vcxproj index d8e124fc5..5ea0c755b 100644 --- a/build/Sc0.vcxproj +++ b/build/Sc0.vcxproj @@ -39,10 +39,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true false false diff --git a/build/Sc1.vcxproj b/build/Sc1.vcxproj index 586961ba2..f37ce54d3 100644 --- a/build/Sc1.vcxproj +++ b/build/Sc1.vcxproj @@ -39,10 +39,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true false false diff --git a/build/Sc2.vcxproj b/build/Sc2.vcxproj index ef2655da1..cd1c3b834 100644 --- a/build/Sc2.vcxproj +++ b/build/Sc2.vcxproj @@ -39,10 +39,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true false false diff --git a/build/Uno.vcxproj b/build/Uno.vcxproj index 41a95535c..240c35201 100644 --- a/build/Uno.vcxproj +++ b/build/Uno.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -12,15 +12,18 @@ {8B0477F1-5D74-46C3-97B6-8879E2460A71} + 10.0.16299.0 StaticLibrary false + v141 StaticLibrary false + v141 @@ -37,9 +40,9 @@ <_ProjectFileVersion>10.0.30319.1 ..\lib\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ ..\lib\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ $(ProjectName) $(ProjectName) diff --git a/build/ab0.vcxproj b/build/ab0.vcxproj index e560fe878..65fc013b4 100644 --- a/build/ab0.vcxproj +++ b/build/ab0.vcxproj @@ -39,14 +39,14 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false false false false false ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ diff --git a/build/ab1.vcxproj b/build/ab1.vcxproj index 59add789e..dd80dab1f 100644 --- a/build/ab1.vcxproj +++ b/build/ab1.vcxproj @@ -37,10 +37,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false false false diff --git a/build/ab2.vcxproj b/build/ab2.vcxproj index 55ba89b4f..979765aa8 100644 --- a/build/ab2.vcxproj +++ b/build/ab2.vcxproj @@ -37,10 +37,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false false false diff --git a/build/ab3.vcxproj b/build/ab3.vcxproj index 01a0d1129..e35000fbc 100644 --- a/build/ab3.vcxproj +++ b/build/ab3.vcxproj @@ -37,10 +37,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false false false diff --git a/build/agalib_alx.vcxproj b/build/agalib_alx.vcxproj index e6a0d4074..a0787ea49 100644 --- a/build/agalib_alx.vcxproj +++ b/build/agalib_alx.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -17,17 +17,20 @@ {A8A46EF5-0400-429C-A6AF-E4EDBDEB10CE} agalib_alx + 10.0.16299.0 Application false MultiByte + v141 Utility false MultiByte + v141 @@ -45,11 +48,11 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false false ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false false diff --git a/build/agalib_bagn.vcxproj b/build/agalib_bagn.vcxproj index a04108885..d0830afba 100644 --- a/build/agalib_bagn.vcxproj +++ b/build/agalib_bagn.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -12,17 +12,20 @@ {C95ABCE4-2C5E-4C41-B6C3-4AE57F639103} + 10.0.16299.0 Utility false MultiByte + v141 Application false MultiByte + v141 @@ -40,11 +43,11 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false false ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false false diff --git a/build/agalib_rep.vcxproj b/build/agalib_rep.vcxproj index 4997b1ebd..49c6dcac4 100644 --- a/build/agalib_rep.vcxproj +++ b/build/agalib_rep.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -13,17 +13,20 @@ {31442041-CF09-4D29-80EF-485C09310A93} agalib_rep + 10.0.16299.0 Application false MultiByte + v141 Utility false MultiByte + v141 @@ -41,11 +44,11 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false false ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false false diff --git a/build/at0.vcxproj b/build/at0.vcxproj index c1a9908bd..f1d0b4c65 100644 --- a/build/at0.vcxproj +++ b/build/at0.vcxproj @@ -37,10 +37,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false false false diff --git a/build/at1.vcxproj b/build/at1.vcxproj index f7c152fe9..653f9a286 100644 --- a/build/at1.vcxproj +++ b/build/at1.vcxproj @@ -37,13 +37,13 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false ..\exe\ false false false - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ diff --git a/build/at2.vcxproj b/build/at2.vcxproj index 4d567a13d..322397ed1 100644 --- a/build/at2.vcxproj +++ b/build/at2.vcxproj @@ -37,10 +37,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false false false diff --git a/build/at3.vcxproj b/build/at3.vcxproj index 74e3364d6..41ac2e250 100644 --- a/build/at3.vcxproj +++ b/build/at3.vcxproj @@ -37,10 +37,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false false false diff --git a/build/at4.vcxproj b/build/at4.vcxproj index a76b602ac..cbcf1c17c 100644 --- a/build/at4.vcxproj +++ b/build/at4.vcxproj @@ -37,10 +37,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false false false diff --git a/build/at6.vcxproj b/build/at6.vcxproj index 39a575c72..072cea22a 100644 --- a/build/at6.vcxproj +++ b/build/at6.vcxproj @@ -37,10 +37,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false false false diff --git a/build/at7.vcxproj b/build/at7.vcxproj index 8c84934cd..17d83704c 100644 --- a/build/at7.vcxproj +++ b/build/at7.vcxproj @@ -37,10 +37,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false false false diff --git a/build/at8.vcxproj b/build/at8.vcxproj index d99b2185f..3d596824c 100644 --- a/build/at8.vcxproj +++ b/build/at8.vcxproj @@ -37,10 +37,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false false false diff --git a/build/at9.vcxproj b/build/at9.vcxproj index 446b87613..a0ede5515 100644 --- a/build/at9.vcxproj +++ b/build/at9.vcxproj @@ -37,10 +37,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false false false diff --git a/build/at_forms.vcxproj b/build/at_forms.vcxproj index a0c80234c..9fc4cdcbb 100644 --- a/build/at_forms.vcxproj +++ b/build/at_forms.vcxproj @@ -41,10 +41,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false diff --git a/build/at_masktab.vcxproj b/build/at_masktab.vcxproj index 117dcec79..26552ea9b 100644 --- a/build/at_masktab.vcxproj +++ b/build/at_masktab.vcxproj @@ -41,10 +41,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false diff --git a/build/autorun.vcxproj b/build/autorun.vcxproj index 558b63d05..1c42ffc1a 100644 --- a/build/autorun.vcxproj +++ b/build/autorun.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -14,18 +14,21 @@ {D748A0B3-109B-4315-B121-79C09A01E2B0} Win32Proj autorun + 10.0.16299.0 Application true Unicode + v141 Application false true Unicode + v141 @@ -41,7 +44,7 @@ true ..\cd\ Setup - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false diff --git a/build/ba0.vcxproj b/build/ba0.vcxproj index 51d545e8b..074f677d6 100644 --- a/build/ba0.vcxproj +++ b/build/ba0.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -13,15 +13,18 @@ {C0B02B54-470C-4567-9BF2-6955794A56B6} ba0 + 10.0.16299.0 Application false + v141 Application false + v141 @@ -41,9 +44,9 @@ ..\exe\ true ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false false false @@ -63,7 +66,7 @@ Disabled - ..\src\include;..\src\xvaga;..\src\xi;%(AdditionalIncludeDirectories) + ..\ext_libraries\curlpp\include\libcurl_compiled\include;..\ext_libraries\curlpp\include\;..\src\include;..\src\xvaga;..\src\xi;%(AdditionalIncludeDirectories) _DEBUG;WIN32;_WINDOWS;__LONGDOUBLE__;%(PreprocessorDefinitions) MultiThreadedDebug $(IntDir)$(TargetName).pdb @@ -211,7 +214,7 @@ - ..\wx28X\include;%(AdditionalIncludeDirectories) + ..\libraries\wx28X\include;%(AdditionalIncludeDirectories) ..\libraries\wx28X\include;%(AdditionalIncludeDirectories) diff --git a/build/ba8.vcxproj b/build/ba8.vcxproj index 4dbacdf0c..890812dab 100644 --- a/build/ba8.vcxproj +++ b/build/ba8.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -13,15 +13,18 @@ {142BE81D-36A6-4F3D-8336-DCB028983216} ba8 + 10.0.16299.0 Application false + v141 Application false + v141 @@ -39,10 +42,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true false false diff --git a/build/ba9.vcxproj b/build/ba9.vcxproj index 6400194a8..691695989 100644 --- a/build/ba9.vcxproj +++ b/build/ba9.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -13,15 +13,18 @@ {1A66F6D4-F7BF-4363-AB8F-98FEEC920CAA} ba9 + 10.0.16299.0 Application false + v141 Application false + v141 @@ -39,10 +42,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true false false diff --git a/build/ba_masktab.vcxproj b/build/ba_masktab.vcxproj index b6b36d8f8..630508a8c 100644 --- a/build/ba_masktab.vcxproj +++ b/build/ba_masktab.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -13,15 +13,18 @@ {D53794B2-2BDD-4D8F-BEFF-A65DA01D5B03} ba_masktab + 10.0.16299.0 Utility false + v141 Utility false + v141 @@ -39,10 +42,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - $(Configuration)\$(ProjectName)\ + ..\obj\$(SolutionName)\$(ProjectName)\ false ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false diff --git a/build/bs0.vcxproj b/build/bs0.vcxproj index 3a1035eb0..d5967729f 100644 --- a/build/bs0.vcxproj +++ b/build/bs0.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -13,15 +13,18 @@ {9C91BACF-9A70-4973-B8CC-FA3D2AF9867C} bs0 + 10.0.16299.0 Application false + v141 Application false + v141 @@ -39,10 +42,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false false false @@ -164,7 +167,10 @@ - + + ..\libraries\wx28X\include;%(AdditionalIncludeDirectories) + ..\libraries\wx28X\include;%(AdditionalIncludeDirectories) + diff --git a/build/ca0.vcxproj b/build/ca0.vcxproj index 2335342ec..dcf6bff7a 100644 --- a/build/ca0.vcxproj +++ b/build/ca0.vcxproj @@ -39,10 +39,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false false false diff --git a/build/ca1.vcxproj b/build/ca1.vcxproj index f01ad84ed..39493d632 100644 --- a/build/ca1.vcxproj +++ b/build/ca1.vcxproj @@ -39,10 +39,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true false false diff --git a/build/ca2.vcxproj b/build/ca2.vcxproj index f8c3b4883..a524198b6 100644 --- a/build/ca2.vcxproj +++ b/build/ca2.vcxproj @@ -39,7 +39,7 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false ..\exe\ true @@ -47,7 +47,7 @@ false false false - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ diff --git a/build/ca2.vcxproj.filters b/build/ca2.vcxproj.filters index b41b843ad..71aea526d 100644 --- a/build/ca2.vcxproj.filters +++ b/build/ca2.vcxproj.filters @@ -42,6 +42,9 @@ Sources + + Sources + diff --git a/build/ca3.vcxproj b/build/ca3.vcxproj index 0eb1bc933..2eb2c6c66 100644 --- a/build/ca3.vcxproj +++ b/build/ca3.vcxproj @@ -39,10 +39,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false false false diff --git a/build/ca9.vcxproj b/build/ca9.vcxproj index c8701c10c..fcb4a38d9 100644 --- a/build/ca9.vcxproj +++ b/build/ca9.vcxproj @@ -39,10 +39,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false false diff --git a/build/ce0.vcxproj b/build/ce0.vcxproj index d360e6631..42beffb3f 100644 --- a/build/ce0.vcxproj +++ b/build/ce0.vcxproj @@ -39,10 +39,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false false false diff --git a/build/ce1.vcxproj b/build/ce1.vcxproj index f0470635b..63ddc0934 100644 --- a/build/ce1.vcxproj +++ b/build/ce1.vcxproj @@ -39,10 +39,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true false false diff --git a/build/ce2.vcxproj b/build/ce2.vcxproj index 98fc0813c..025bb795f 100644 --- a/build/ce2.vcxproj +++ b/build/ce2.vcxproj @@ -39,10 +39,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true false false diff --git a/build/ce3.vcxproj b/build/ce3.vcxproj index 05bec8447..236198d64 100644 --- a/build/ce3.vcxproj +++ b/build/ce3.vcxproj @@ -39,10 +39,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true false false diff --git a/build/ce4.vcxproj b/build/ce4.vcxproj index d17557dfa..74595abd5 100644 --- a/build/ce4.vcxproj +++ b/build/ce4.vcxproj @@ -39,10 +39,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true false false diff --git a/build/cg_masktab.vcxproj b/build/cg_masktab.vcxproj index 799ac469e..c56fcfc54 100644 --- a/build/cg_masktab.vcxproj +++ b/build/cg_masktab.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -13,17 +13,20 @@ {97368DC9-8B0D-4F75-A89F-9A58701226B6} cg_masktab + 10.0.16299.0 Utility false NotSet + v141 Utility false MultiByte + v141 @@ -41,10 +44,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false diff --git a/build/ci0.vcxproj b/build/ci0.vcxproj index 800d1bebf..f86c44d29 100644 --- a/build/ci0.vcxproj +++ b/build/ci0.vcxproj @@ -39,10 +39,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true false false diff --git a/build/ci1.vcxproj b/build/ci1.vcxproj index 09d02c152..06f864bfd 100644 --- a/build/ci1.vcxproj +++ b/build/ci1.vcxproj @@ -39,14 +39,14 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true false false false false ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true diff --git a/build/ci2.vcxproj b/build/ci2.vcxproj index 8fadd15ff..6694cf8d4 100644 --- a/build/ci2.vcxproj +++ b/build/ci2.vcxproj @@ -40,13 +40,13 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true false false false false - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true diff --git a/build/ct0.vcxproj b/build/ct0.vcxproj index 0eb9f0a92..e2cb1b831 100644 --- a/build/ct0.vcxproj +++ b/build/ct0.vcxproj @@ -42,7 +42,7 @@ $(Configuration)\$(ProjectName)\ true ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false false false diff --git a/build/db0.vcxproj b/build/db0.vcxproj index dde5782b2..a8997e457 100644 --- a/build/db0.vcxproj +++ b/build/db0.vcxproj @@ -39,10 +39,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true false false diff --git a/build/db1.vcxproj b/build/db1.vcxproj index 201c8c9a0..55e1f5473 100644 --- a/build/db1.vcxproj +++ b/build/db1.vcxproj @@ -39,10 +39,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true false false diff --git a/build/db2.vcxproj b/build/db2.vcxproj index 68afbd88c..7eca4c68e 100644 --- a/build/db2.vcxproj +++ b/build/db2.vcxproj @@ -39,10 +39,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true false false diff --git a/build/fastrip.vcxproj b/build/fastrip.vcxproj index 256771f34..d5d41e9ea 100644 --- a/build/fastrip.vcxproj +++ b/build/fastrip.vcxproj @@ -39,13 +39,13 @@ true - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ $(ProjectDir)\ false $(ProjectDir)\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ diff --git a/build/fd.sln b/build/fd.sln index 7d3b5f78e..eef7e466a 100644 --- a/build/fd.sln +++ b/build/fd.sln @@ -1,7 +1,9 @@  Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual C++ Express 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fd", "fd.vcxproj", "{5CF8C249-CB8A-432B-851B-E0B375BE6CB6}" +# Visual Studio 2010 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fd0", "fd.vcxproj", "{5CF8C249-CB8A-432B-851B-E0B375BE6CB6}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AgaLib", "AgaLib.vcxproj", "{2D38A763-3D74-4338-9362-B891784EC90E}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -13,6 +15,10 @@ Global {5CF8C249-CB8A-432B-851B-E0B375BE6CB6}.Debug|Win32.Build.0 = Debug|Win32 {5CF8C249-CB8A-432B-851B-E0B375BE6CB6}.Release|Win32.ActiveCfg = Release|Win32 {5CF8C249-CB8A-432B-851B-E0B375BE6CB6}.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/fd.vcxproj b/build/fd.vcxproj index 783a293e7..889e4f72f 100644 --- a/build/fd.vcxproj +++ b/build/fd.vcxproj @@ -41,8 +41,8 @@ false - ..\exed\ - $(Configuration)\$(ProjectName)\ + ..\exe\ + ..\obj\$(SolutionName)\$(ProjectName)\ false false @@ -51,7 +51,7 @@ false false ..\exe\ - $(Configuration)\$(ProjectName)\ + ..\obj\$(SolutionName)\$(ProjectName)\ @@ -154,6 +154,11 @@ + + + {2d38a763-3d74-4338-9362-b891784ec90e} + + diff --git a/build/fe.vcxproj b/build/fe.vcxproj index 922080716..acc8f1230 100644 --- a/build/fe.vcxproj +++ b/build/fe.vcxproj @@ -41,8 +41,8 @@ false - ..\exed\ - $(Configuration)\$(ProjectName)\ + ..\exe\ + ..\obj\$(SolutionName)\$(ProjectName)\ false false @@ -51,7 +51,7 @@ false false ..\exe\ - $(Configuration)\$(ProjectName)\ + ..\obj\$(SolutionName)\$(ProjectName)\ @@ -98,7 +98,7 @@ - + diff --git a/build/gfm.vcxproj b/build/gfm.vcxproj index 18c1623e8..9c080dc30 100644 --- a/build/gfm.vcxproj +++ b/build/gfm.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -12,17 +12,20 @@ {37C3DDAE-3A63-4C1C-A419-242141B262ED} + 10.0.16299.0 DynamicLibrary false MultiByte + v141 DynamicLibrary false MultiByte + v141 @@ -39,10 +42,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false $(ProjectName) false diff --git a/build/gv0.vcxproj b/build/gv0.vcxproj index 55d108c11..6eaa54338 100644 --- a/build/gv0.vcxproj +++ b/build/gv0.vcxproj @@ -39,10 +39,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true false false diff --git a/build/ic0.vcxproj b/build/ic0.vcxproj index 8b7b19087..d896e0c8b 100644 --- a/build/ic0.vcxproj +++ b/build/ic0.vcxproj @@ -39,10 +39,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false false false diff --git a/build/li0.vcxproj b/build/li0.vcxproj index a26f6119b..41744961b 100644 --- a/build/li0.vcxproj +++ b/build/li0.vcxproj @@ -39,10 +39,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false false false diff --git a/build/lilib.vcxproj b/build/lilib.vcxproj index 77c3d7248..cc40b8190 100644 --- a/build/lilib.vcxproj +++ b/build/lilib.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -13,15 +13,18 @@ {C575788B-0BE4-4F68-B9C9-3C204EC04E07} li0 + 10.0.16299.0 StaticLibrary false + v141 StaticLibrary false + v141 @@ -39,10 +42,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\lib\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false ..\lib\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false false false diff --git a/build/lv0.vcxproj b/build/lv0.vcxproj index daf119cf0..1aeb7802e 100644 --- a/build/lv0.vcxproj +++ b/build/lv0.vcxproj @@ -39,10 +39,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true false false diff --git a/build/lv1.vcxproj b/build/lv1.vcxproj index 5d8a24f2e..c51e23026 100644 --- a/build/lv1.vcxproj +++ b/build/lv1.vcxproj @@ -38,10 +38,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true false false diff --git a/build/lv2.vcxproj b/build/lv2.vcxproj index 7cfb49e89..5781b8bb8 100644 --- a/build/lv2.vcxproj +++ b/build/lv2.vcxproj @@ -38,10 +38,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true false false diff --git a/build/lv3.vcxproj b/build/lv3.vcxproj index e7e810251..f24e9415a 100644 --- a/build/lv3.vcxproj +++ b/build/lv3.vcxproj @@ -39,10 +39,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true false false diff --git a/build/lv4.vcxproj b/build/lv4.vcxproj index 9c5580129..00060fd30 100644 --- a/build/lv4.vcxproj +++ b/build/lv4.vcxproj @@ -39,10 +39,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true false false diff --git a/build/mg0.vcxproj b/build/mg0.vcxproj index 2229ee6e9..82dae5745 100644 --- a/build/mg0.vcxproj +++ b/build/mg0.vcxproj @@ -41,13 +41,13 @@ ..\exe\ true ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false false false false false - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ diff --git a/build/mg1.vcxproj b/build/mg1.vcxproj index d1e73be28..fb06fae02 100644 --- a/build/mg1.vcxproj +++ b/build/mg1.vcxproj @@ -39,10 +39,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true false false diff --git a/build/mg3.vcxproj b/build/mg3.vcxproj index d19209655..e7413e802 100644 --- a/build/mg3.vcxproj +++ b/build/mg3.vcxproj @@ -38,10 +38,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true false false diff --git a/build/mg4.vcxproj b/build/mg4.vcxproj index 9518a38ac..5e723b2a2 100644 --- a/build/mg4.vcxproj +++ b/build/mg4.vcxproj @@ -39,10 +39,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true false false diff --git a/build/mr0.vcxproj b/build/mr0.vcxproj index 821605154..6d76f6cb0 100644 --- a/build/mr0.vcxproj +++ b/build/mr0.vcxproj @@ -39,14 +39,14 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false false false false false ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ @@ -184,6 +184,7 @@ + diff --git a/build/mr0.vcxproj.filters b/build/mr0.vcxproj.filters index 3937d77a2..351ffbb63 100644 --- a/build/mr0.vcxproj.filters +++ b/build/mr0.vcxproj.filters @@ -83,6 +83,9 @@ Masks + + Masks + diff --git a/build/mr1.vcxproj b/build/mr1.vcxproj index c5cb9f272..d2baf0e9a 100644 --- a/build/mr1.vcxproj +++ b/build/mr1.vcxproj @@ -39,10 +39,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true false false diff --git a/build/mr2.vcxproj b/build/mr2.vcxproj index 1d506833a..97eae8be7 100644 --- a/build/mr2.vcxproj +++ b/build/mr2.vcxproj @@ -40,13 +40,13 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false false false false false - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ diff --git a/build/np0.vcxproj b/build/np0.vcxproj index 38d06ee3a..58a410fc9 100644 --- a/build/np0.vcxproj +++ b/build/np0.vcxproj @@ -36,10 +36,10 @@ <_ProjectFileVersion>10.0.21006.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true false false diff --git a/build/pa0.vcxproj b/build/pa0.vcxproj index 7b8980ccf..89bd2df65 100644 --- a/build/pa0.vcxproj +++ b/build/pa0.vcxproj @@ -38,11 +38,21 @@ <_ProjectFileVersion>10.0.30319.1 +<<<<<<< .mine ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ + false +||||||| .r24161 + ..\exed\ + $(Configuration)\$(ProjectName)\ + false +======= + ..\exe\ + ..\obj\$(SolutionName)\$(ProjectName)\ true +>>>>>>> .r24173 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false false false diff --git a/build/pd0350.vcxproj b/build/pd0350.vcxproj index 0412116fd..7a366ff6a 100644 --- a/build/pd0350.vcxproj +++ b/build/pd0350.vcxproj @@ -40,7 +40,7 @@ $(Configuration)\$(ProjectName)\ false ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false diff --git a/build/pdflib_dll.vcxproj b/build/pdflib_dll.vcxproj index 5b0d753e8..f7d2bb050 100644 --- a/build/pdflib_dll.vcxproj +++ b/build/pdflib_dll.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -14,16 +14,19 @@ pdflib {A294C667-27A9-4125-82AF-5093447505EC} pdf + 10.0.16299.0 DynamicLibrary false + v141 DynamicLibrary false MultiByte + v141 @@ -40,10 +43,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ $(ProjectName) false false diff --git a/build/pdflibwrap.vcxproj b/build/pdflibwrap.vcxproj index 35ab6e3e0..8a787af9b 100644 --- a/build/pdflibwrap.vcxproj +++ b/build/pdflibwrap.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -14,15 +14,18 @@ {21876C3B-F5A9-4AAA-9D58-F8DDDAF6F10C} pdflibwrap Win32Proj + 10.0.16299.0 StaticLibrary false + v141 StaticLibrary NotSet + v141 @@ -37,9 +40,9 @@ <_ProjectFileVersion>10.0.30319.1 ..\lib\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ ..\lib\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ $(ProjectName) $(ProjectName) diff --git a/build/pe0.vcxproj b/build/pe0.vcxproj index b0c60ad10..981040fc0 100644 --- a/build/pe0.vcxproj +++ b/build/pe0.vcxproj @@ -42,8 +42,8 @@ false true ..\exe\ - ..\obj\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ + ..\obj\$(SolutionName)\$(ProjectName)\ diff --git a/build/pe1.vcxproj b/build/pe1.vcxproj index 3eef6ca25..0021f3f47 100644 --- a/build/pe1.vcxproj +++ b/build/pe1.vcxproj @@ -45,8 +45,8 @@ false false false - ..\obj\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ + ..\obj\$(SolutionName)\$(ProjectName)\ diff --git a/build/profiles.vcxproj b/build/profiles.vcxproj index 0338be5de..278634f63 100644 --- a/build/profiles.vcxproj +++ b/build/profiles.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -13,17 +13,20 @@ {50411897-4D04-4906-A9D6-67FF865B513D} profiles + 10.0.16299.0 Utility false MultiByte + v141 Application false MultiByte + v141 @@ -41,13 +44,16 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false false ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false + + true + NDEBUG;%(PreprocessorDefinitions) diff --git a/build/ps0398.vcxproj b/build/ps0398.vcxproj index b278f2e82..3709a57f6 100644 --- a/build/ps0398.vcxproj +++ b/build/ps0398.vcxproj @@ -37,10 +37,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false diff --git a/build/ps0398.vcxproj.filters b/build/ps0398.vcxproj.filters index b52a5f31f..787d3ba88 100644 --- a/build/ps0398.vcxproj.filters +++ b/build/ps0398.vcxproj.filters @@ -35,9 +35,6 @@ Masks - - - diff --git a/build/ps0430.vcxproj b/build/ps0430.vcxproj index 6b6401360..3c0fa6e39 100644 --- a/build/ps0430.vcxproj +++ b/build/ps0430.vcxproj @@ -37,10 +37,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false @@ -126,7 +126,7 @@ true %(IgnoreSpecificDefaultLibraries) true - .\..\debug/ps0430.pdb + $(TargetDir)$(TargetName).pdb Windows false diff --git a/build/ps0430.vcxproj.filters b/build/ps0430.vcxproj.filters index d67f723c3..e217ac1e5 100644 --- a/build/ps0430.vcxproj.filters +++ b/build/ps0430.vcxproj.filters @@ -40,6 +40,9 @@ Sources + + Sources + @@ -51,15 +54,18 @@ Headers - - Sources - Headers Headers + + Headers + + + Headers + @@ -68,22 +74,25 @@ Masks + + Masks + + + Masks + + + Masks + + + Masks + - - Masks - Reports - - Masks - - - Masks - \ No newline at end of file diff --git a/build/ps0431.vcxproj b/build/ps0431.vcxproj index bebff8f4e..411271ed5 100644 --- a/build/ps0431.vcxproj +++ b/build/ps0431.vcxproj @@ -39,7 +39,7 @@ $(Configuration)\$(ProjectName)\ false ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true false false @@ -70,7 +70,7 @@ NDEBUG;%(PreprocessorDefinitions) 0x0410 - ..\wx28X\include;%(AdditionalIncludeDirectories) + ..\libraries\wx28X\include;%(AdditionalIncludeDirectories) wsock32.lib;%(AdditionalDependencies) @@ -114,7 +114,7 @@ _DEBUG;%(PreprocessorDefinitions) 0x0410 - ..\wx28X\include;%(AdditionalIncludeDirectories) + ..\libraries\wx28X\include;%(AdditionalIncludeDirectories) %(AdditionalDependencies) @@ -159,7 +159,10 @@ - + + ..\libraries\wx28X\include;%(AdditionalIncludeDirectories) + ..\libraries\wx28X\include;%(AdditionalIncludeDirectories) + diff --git a/build/ps0713.vcxproj b/build/ps0713.vcxproj index aaabff243..33cb7d896 100644 --- a/build/ps0713.vcxproj +++ b/build/ps0713.vcxproj @@ -38,7 +38,7 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false ..\exe\ $(Configuration)\$(ProjectName)\ @@ -230,7 +230,9 @@ - + + ..\libraries\wx28X\include;%(AdditionalIncludeDirectories) + diff --git a/build/ps0920.vcxproj b/build/ps0920.vcxproj index 70b201acf..0fecf43d9 100644 --- a/build/ps0920.vcxproj +++ b/build/ps0920.vcxproj @@ -37,10 +37,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false diff --git a/build/ri0.vcxproj b/build/ri0.vcxproj index a748f579d..f6ad961d7 100644 --- a/build/ri0.vcxproj +++ b/build/ri0.vcxproj @@ -39,10 +39,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false false false diff --git a/build/ri1.vcxproj b/build/ri1.vcxproj index 92ee03dcc..81cb85b3a 100644 --- a/build/ri1.vcxproj +++ b/build/ri1.vcxproj @@ -39,10 +39,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false false false diff --git a/build/setup.vcxproj b/build/setup.vcxproj index cf1976fd6..ec38b1c4e 100644 --- a/build/setup.vcxproj +++ b/build/setup.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -15,16 +15,19 @@ Setup Win32Proj SetCmpUp + 10.0.16299.0 Application NotSet true + v141 Application NotSet + v141 @@ -40,10 +43,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\setup\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false ..\exe\setup\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false false false diff --git a/build/sl0.vcxproj b/build/sl0.vcxproj index 6ddaf2351..4c45a343e 100644 --- a/build/sl0.vcxproj +++ b/build/sl0.vcxproj @@ -39,10 +39,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false false false diff --git a/build/tc0.vcxproj b/build/tc0.vcxproj index 714f63ab3..8ac92d6ba 100644 --- a/build/tc0.vcxproj +++ b/build/tc0.vcxproj @@ -39,10 +39,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false false false diff --git a/build/tc1.vcxproj b/build/tc1.vcxproj index edee3b68f..27e82d9dd 100644 --- a/build/tc1.vcxproj +++ b/build/tc1.vcxproj @@ -39,10 +39,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true false false diff --git a/build/tc2.vcxproj b/build/tc2.vcxproj index a5ab3f589..9fbad23c6 100644 --- a/build/tc2.vcxproj +++ b/build/tc2.vcxproj @@ -39,10 +39,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true false false diff --git a/build/tc3.vcxproj b/build/tc3.vcxproj index ad7826dd5..7a1c8bb93 100644 --- a/build/tc3.vcxproj +++ b/build/tc3.vcxproj @@ -39,10 +39,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true false false diff --git a/build/tc8.vcxproj b/build/tc8.vcxproj index 881e7ed76..47eaa42b8 100644 --- a/build/tc8.vcxproj +++ b/build/tc8.vcxproj @@ -39,10 +39,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false false false diff --git a/build/tc9.vcxproj b/build/tc9.vcxproj index 34a62823b..dd3a49104 100644 --- a/build/tc9.vcxproj +++ b/build/tc9.vcxproj @@ -39,10 +39,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true false false diff --git a/build/tf0.vcxproj b/build/tf0.vcxproj index f074a85af..4f558be09 100644 --- a/build/tf0.vcxproj +++ b/build/tf0.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -13,15 +13,18 @@ {9C91BACF-9A70-4973-B8CC-FA3D2AF9867C} tf0 + 10.0.16299.0 Application false + v141 Application false + v141 @@ -39,10 +42,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false false false @@ -61,7 +64,7 @@ Disabled - ..\src\cg;..\src\include;..\src\xvaga;..\src\fe;%(AdditionalIncludeDirectories) + ..\src\xvtext\;..\src\cg;..\src\include;..\src\xvaga;..\src\fe;%(AdditionalIncludeDirectories) _DEBUG;WIN32;__LONGDOUBLE__;_WINDOWS;%(PreprocessorDefinitions) false MultiThreadedDebug @@ -71,6 +74,8 @@ ProgramDatabase + + _DEBUG;%(PreprocessorDefinitions) @@ -155,7 +160,9 @@ - + + ..\libraries\wx28X\include;%(AdditionalIncludeDirectories) + diff --git a/build/ve0.vcxproj b/build/ve0.vcxproj index d2c8997bd..fbcdb548d 100644 --- a/build/ve0.vcxproj +++ b/build/ve0.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -13,15 +13,18 @@ {15F2937A-7DB1-4462-9FC7-9621FC9ACF17} ve0 + 10.0.16299.0 Application false + v141 Application false + v141 @@ -39,10 +42,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false false false @@ -61,7 +64,7 @@ Disabled - ../src/include;../src/xvaga;%(AdditionalIncludeDirectories) + ..\src\li;../src/include;../src/xvaga;../src/xvtdb;../src/xvturl;%(AdditionalIncludeDirectories) _DEBUG;WIN32;_WINDOWS;__LONGDOUBLE__ false MultiThreadedDebug @@ -224,7 +227,9 @@ - + + ..\libraries\wx28X\include;%(AdditionalIncludeDirectories) + diff --git a/build/ve1.vcxproj b/build/ve1.vcxproj index 4a28850f2..992ba8536 100644 --- a/build/ve1.vcxproj +++ b/build/ve1.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -13,15 +13,18 @@ {3A7DC7C5-D10B-47FC-A8E9-BF696B5A2F1E} ve1 + 10.0.16299.0 Application false + v141 Application false + v141 @@ -39,10 +42,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true false false diff --git a/build/ve2.vcxproj b/build/ve2.vcxproj index 1ee71f77c..872a5a8e0 100644 --- a/build/ve2.vcxproj +++ b/build/ve2.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -13,15 +13,18 @@ {8C4464D8-10CE-4FF0-A371-5D5A35DFE06D} ve2 + 10.0.16299.0 Application false + v141 Application false + v141 @@ -39,10 +42,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false false false diff --git a/build/ve3.vcxproj b/build/ve3.vcxproj index 29ac12272..6ed88650e 100644 --- a/build/ve3.vcxproj +++ b/build/ve3.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -13,15 +13,18 @@ {8D923FAD-EA83-4FCF-8322-99EA3E76AAE6} ve3 + 10.0.16299.0 Application false + v141 Application false + v141 @@ -39,10 +42,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false false false diff --git a/build/ve4.vcxproj b/build/ve4.vcxproj index 42491a85e..1929ebb5c 100644 --- a/build/ve4.vcxproj +++ b/build/ve4.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -13,15 +13,18 @@ {F4BA5949-4FCD-4AF4-ABC5-CDADA21E1663} ve4 + 10.0.16299.0 Application false + v141 Application false + v141 @@ -39,10 +42,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false false false diff --git a/build/ve5.vcxproj b/build/ve5.vcxproj index 50f477b22..f9b4af679 100644 --- a/build/ve5.vcxproj +++ b/build/ve5.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -13,15 +13,18 @@ {31F3D895-F3DD-42CC-AFB5-5BA65B38F8FA} ve5 + 10.0.16299.0 Application false + v141 Application false + v141 @@ -39,10 +42,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true false false diff --git a/build/ve6.vcxproj b/build/ve6.vcxproj index 85c48e7fb..b599dc59d 100644 --- a/build/ve6.vcxproj +++ b/build/ve6.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -13,15 +13,18 @@ {E7485070-16E1-4735-AD9D-B450C19B71C6} ve6 + 10.0.16299.0 Application false + v141 Application false + v141 @@ -39,10 +42,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false false false diff --git a/build/ve8.vcxproj b/build/ve8.vcxproj index 14fc1d915..57ba83aec 100644 --- a/build/ve8.vcxproj +++ b/build/ve8.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -13,15 +13,18 @@ {EDA3A6A6-7706-43A4-A3BD-F544F7187B98} ve8 + 10.0.16299.0 Application false + v141 Application false + v141 @@ -39,10 +42,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false false false diff --git a/build/ve_maskrighe.vcxproj b/build/ve_maskrighe.vcxproj index afe707537..d52b922f0 100644 --- a/build/ve_maskrighe.vcxproj +++ b/build/ve_maskrighe.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -12,17 +12,20 @@ {7B5D2114-9F72-4046-B895-2A524DA295BA} + 10.0.16299.0 Utility false MultiByte + v141 Application false MultiByte + v141 @@ -40,7 +43,7 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false false ..\exe\ diff --git a/build/ve_masktab.vcxproj b/build/ve_masktab.vcxproj index 6e60ae0d5..dbab0869c 100644 --- a/build/ve_masktab.vcxproj +++ b/build/ve_masktab.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -13,17 +13,20 @@ {7CE30E4F-FF39-4819-B11D-BC08E87EB309} ve_masktab + 10.0.16299.0 Application false MultiByte + v141 Utility false NotSet + v141 @@ -41,10 +44,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false false .msk diff --git a/build/vedoc.vcxproj b/build/vedoc.vcxproj index 25e71b066..05971b5f3 100644 --- a/build/vedoc.vcxproj +++ b/build/vedoc.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -12,17 +12,20 @@ {A1CE9743-A597-4F92-B55A-345A366C9E55} + 10.0.16299.0 StaticLibrary false MultiByte + v141 StaticLibrary false MultiByte + v141 @@ -39,9 +42,9 @@ <_ProjectFileVersion>10.0.30319.1 ..\lib\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ ..\lib\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ $(ProjectName) $(ProjectName) AllRules.ruleset diff --git a/build/vedocext.vcxproj b/build/vedocext.vcxproj index 06f8f2e81..483ae0f0e 100644 --- a/build/vedocext.vcxproj +++ b/build/vedocext.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -12,17 +12,20 @@ {0042619A-6B7C-4D3D-9CD9-9BDD8D200C15} + 10.0.16299.0 StaticLibrary false MultiByte + v141 StaticLibrary false MultiByte + v141 @@ -40,9 +43,9 @@ <_ProjectFileVersion>10.0.30319.1 ..\lib\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ ..\lib\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ $(ProjectName) $(ProjectName) diff --git a/build/xi.vcxproj b/build/xi.vcxproj index b6786fd1c..04948f8ea 100644 --- a/build/xi.vcxproj +++ b/build/xi.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -12,17 +12,20 @@ {3A5B0119-6DAD-4407-9EE1-3B739B0581E8} + 10.0.16299.0 DynamicLibrary false MultiByte + v141 DynamicLibrary false MultiByte + v141 @@ -39,10 +42,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false $(ProjectName) false diff --git a/build/xvaga.vcxproj b/build/xvaga.vcxproj index 7140c2399..4b3557098 100644 --- a/build/xvaga.vcxproj +++ b/build/xvaga.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -13,17 +13,20 @@ {4A2FC619-2461-4F58-8F1D-92FA153E39A2} xvaga + 10.0.16299.0 DynamicLibrary false MultiByte + v141 DynamicLibrary false MultiByte + v141 @@ -40,10 +43,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true $(ProjectName) false @@ -104,7 +107,7 @@ Disabled ..\libraries\wx28X\lib\vc_dll\mswd\;..\libraries\wx28X\include\;..\libraries\wxPG\propgrid\include\;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;XVAGADLL;%(PreprocessorDefinitions) + DBG;WIN32;_DEBUG;_WINDOWS;_USRDLL;XVAGADLL;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebug diff --git a/build/xvaga.vcxproj.filters b/build/xvaga.vcxproj.filters index 9dac814da..ff61c6d8f 100644 --- a/build/xvaga.vcxproj.filters +++ b/build/xvaga.vcxproj.filters @@ -202,8 +202,5 @@ Libraries - - Libraries - \ No newline at end of file diff --git a/build/xvapp.vcxproj b/build/xvapp.vcxproj index b1ab270d9..7b26c2c8b 100644 --- a/build/xvapp.vcxproj +++ b/build/xvapp.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -12,17 +12,20 @@ {153C04B0-1F72-4DA9-8AC1-7DF76FFACFD2} + 10.0.16299.0 StaticLibrary false MultiByte + v141 StaticLibrary false MultiByte + v141 @@ -39,9 +42,9 @@ <_ProjectFileVersion>10.0.30319.1 ..\lib\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ ..\lib\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ $(ProjectName) $(ProjectName) diff --git a/build/xvtdb.vcxproj b/build/xvtdb.vcxproj index d4b330958..fdb4ea141 100644 --- a/build/xvtdb.vcxproj +++ b/build/xvtdb.vcxproj @@ -41,10 +41,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true $(ProjectName) false @@ -64,7 +64,7 @@ Disabled ..\libraries\SQLAPI\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + DBDLL_EXPORT;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) MultiThreaded Level3 @@ -105,7 +105,7 @@ Disabled ..\libraries\SQLAPI\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + DBDLL_EXPORT;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebug diff --git a/build/xvturl.vcxproj b/build/xvturl.vcxproj index af4a58c97..85a16b38e 100644 --- a/build/xvturl.vcxproj +++ b/build/xvturl.vcxproj @@ -41,10 +41,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ false ..\exe\ - ..\obj\ + ..\obj\$(SolutionName)\$(ProjectName)\ true $(ProjectName) false @@ -64,7 +64,7 @@ Disabled ..\libraries\curl\builds\include\ - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + URLDLL_EXPORT;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) MultiThreadedDLL Level3 @@ -108,7 +108,7 @@ Disabled ..\libraries\curl\builds\include\ - WIN32;_DEBUG;_WINDOWS;_USRDLL;CURL_STATICLIB;%(PreprocessorDefinitions) + URLDLL_EXPORT;WIN32;_DEBUG;_WINDOWS;_USRDLL;CURL_STATICLIB;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL