From 2120dd662c919a884e73e68736cb9b806c818367 Mon Sep 17 00:00:00 2001 From: Evgeny Vrublevsky Date: Sun, 18 Apr 2021 20:07:43 +0300 Subject: [PATCH] Move all common project settings into cc65.props. --- src/.gitignore | 1 + src/ar65.vcxproj | 35 ++------------ src/ca65.vcxproj | 35 ++------------ src/cc65.props | 62 +++++++++++++++++++++++++ src/cc65.vcxproj | 35 ++------------ src/chrcvt65.vcxproj | 35 ++------------ src/cl65.vcxproj | 35 ++------------ src/co65.vcxproj | 35 ++------------ src/common.vcxproj | 106 +++++++++++++------------------------------ src/da65.vcxproj | 35 ++------------ src/grc65.vcxproj | 35 ++------------ src/ld65.vcxproj | 37 ++------------- src/od65.vcxproj | 35 ++------------ src/sim65.vcxproj | 36 ++------------- src/sp65.vcxproj | 35 ++------------ 15 files changed, 132 insertions(+), 460 deletions(-) create mode 100644 src/cc65.props diff --git a/src/.gitignore b/src/.gitignore index a2c8bb5d4..3b4d0f7ad 100644 --- a/src/.gitignore +++ b/src/.gitignore @@ -1,3 +1,4 @@ +.vs/ ipch/ *.suo *.sdf diff --git a/src/ar65.vcxproj b/src/ar65.vcxproj index a57bec813..6f2d5329a 100644 --- a/src/ar65.vcxproj +++ b/src/ar65.vcxproj @@ -13,66 +13,37 @@ {5E8C19C6-B167-440C-8BEF-3CBF109CDB49} Win32Proj - ar65 - 10.0.16299.0 + true - v141 false - true - v141 - - - - - - - true - $(SolutionDir)..\bin\ - $(SolutionDir)..\wrk\$(ProjectName)\$(Configuration)\ - $(SolutionDir)..\bin\ - $(SolutionDir)..\wrk\$(ProjectName)\$(Configuration)\ - - - Level3 - _CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CONSOLE;_DEBUG - common - true + _CONSOLE;_DEBUG;%(PreprocessorDefinitions) Console - true - $(IntDir)..\..\common\$(Configuration)\common.lib - Level3 - - - _CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CONSOLE;NDEBUG - common - true + _CONSOLE;NDEBUG;%(PreprocessorDefinitions) Console - false - $(IntDir)..\..\common\$(Configuration)\common.lib diff --git a/src/ca65.vcxproj b/src/ca65.vcxproj index df246a59f..c4d8c17ef 100644 --- a/src/ca65.vcxproj +++ b/src/ca65.vcxproj @@ -13,66 +13,37 @@ {D28CB737-E6CA-49C4-8CE9-FF05F86DD4EC} Win32Proj - ca65 - 10.0.16299.0 + true - v141 false - true - v141 - - - - - - - $(SolutionDir)..\wrk\$(ProjectName)\$(Configuration)\ - $(SolutionDir)..\bin\ - true - $(SolutionDir)..\wrk\$(ProjectName)\$(Configuration)\ - $(SolutionDir)..\bin\ - - - Level3 - _CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CONSOLE;_DEBUG - true - common + _CONSOLE;_DEBUG;%(PreprocessorDefinitions) Console - true - $(IntDir)..\..\common\$(Configuration)\common.lib - Level3 - - - _CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CONSOLE;NDEBUG - true - common + _CONSOLE;NDEBUG;%(PreprocessorDefinitions) Console - false - $(IntDir)..\..\common\$(Configuration)\common.lib diff --git a/src/cc65.props b/src/cc65.props new file mode 100644 index 000000000..bd0eb6024 --- /dev/null +++ b/src/cc65.props @@ -0,0 +1,62 @@ + + + + + v141 + $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0')) + + + + + v142 + 10.0 + $(SolutionDir)..\wrk\$(MSBuildProjectName)\$(Configuration)\ + $(SolutionDir)..\bin\ + $(IntDir) + + + + + Level3 + true + _CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;WINVER=0x0601;NTDDI_VERSION=0x06010000;%(PreprocessorDefinitions) + common + + + $(IntDir)..\..\common\$(Configuration)\common.lib + + + + + + true + + + + MultiThreadedDebugDLL + true + + + true + + + + + + false + true + + + + true + MultiThreaded + false + + + false + true + true + UseLinkTimeCodeGeneration + + + \ No newline at end of file diff --git a/src/cc65.vcxproj b/src/cc65.vcxproj index 0f63a1022..f631672aa 100644 --- a/src/cc65.vcxproj +++ b/src/cc65.vcxproj @@ -13,66 +13,37 @@ {B17EDBD5-DC04-4970-9CBD-56A98B6A3FCA} Win32Proj - cc65 - 10.0.16299.0 + true - v141 false - true - v141 - - - - - - - $(SolutionDir)..\wrk\$(ProjectName)\$(Configuration)\ - $(SolutionDir)..\bin\ - true - $(SolutionDir)..\wrk\$(ProjectName)\$(Configuration)\ - $(SolutionDir)..\bin\ - - - _CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CONSOLE;_DEBUG - common - Level3 - true + _CONSOLE;_DEBUG;%(PreprocessorDefinitions) Console - true - $(IntDir)..\..\common\$(Configuration)\common.lib - Level3 - - - _CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CONSOLE;NDEBUG - common - true + _CONSOLE;NDEBUG;%(PreprocessorDefinitions) Console - false - $(IntDir)..\..\common\$(Configuration)\common.lib diff --git a/src/chrcvt65.vcxproj b/src/chrcvt65.vcxproj index 351f6077e..1f517e11a 100644 --- a/src/chrcvt65.vcxproj +++ b/src/chrcvt65.vcxproj @@ -13,66 +13,37 @@ {1C7A3FEF-DD0B-4B10-BC33-C3BE29BF67CC} Win32Proj - chrcvt65 - 10.0.16299.0 + true - v141 false - true - v141 - - - - - - - true - $(SolutionDir)..\bin\ - $(SolutionDir)..\wrk\$(ProjectName)\$(Configuration)\ - $(SolutionDir)..\bin\ - $(SolutionDir)..\wrk\$(ProjectName)\$(Configuration)\ - - - Level3 - _CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CONSOLE;_DEBUG - common - true + _CONSOLE;_DEBUG;%(PreprocessorDefinitions) Console - true - $(IntDir)..\..\common\$(Configuration)\common.lib - Level3 - - - _CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CONSOLE;NDEBUG - common - true + _CONSOLE;NDEBUG;%(PreprocessorDefinitions) Console - false - $(IntDir)..\..\common\$(Configuration)\common.lib diff --git a/src/cl65.vcxproj b/src/cl65.vcxproj index dab77e196..14fcf06bd 100644 --- a/src/cl65.vcxproj +++ b/src/cl65.vcxproj @@ -13,66 +13,37 @@ {F657912F-050A-488B-B203-50ED5715CDD7} Win32Proj - cl65 - 10.0.16299.0 + true - v141 false - true - v141 - - - - - - - true - $(SolutionDir)..\bin\ - $(SolutionDir)..\wrk\$(ProjectName)\$(Configuration)\ - $(SolutionDir)..\bin\ - $(SolutionDir)..\wrk\$(ProjectName)\$(Configuration)\ - - - Level3 - _CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CONSOLE;_DEBUG - common - true + _CONSOLE;_DEBUG;%(PreprocessorDefinitions) Console - true - $(IntDir)..\..\common\$(Configuration)\common.lib - Level3 - - - _CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CONSOLE;NDEBUG - common - true + _CONSOLE;NDEBUG;%(PreprocessorDefinitions) Console - false - $(IntDir)..\..\common\$(Configuration)\common.lib diff --git a/src/co65.vcxproj b/src/co65.vcxproj index 9b4f18786..8fab51c53 100644 --- a/src/co65.vcxproj +++ b/src/co65.vcxproj @@ -13,66 +13,37 @@ {F5DB5D1A-05BC-48FE-B346-4E96DD522AA2} Win32Proj - co65 - 10.0.16299.0 + true - v141 false - true - v141 - - - - - - - true - $(SolutionDir)..\bin\ - $(SolutionDir)..\wrk\$(ProjectName)\$(Configuration)\ - $(SolutionDir)..\bin\ - $(SolutionDir)..\wrk\$(ProjectName)\$(Configuration)\ - - - Level3 - _CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CONSOLE;_DEBUG - common - true + _CONSOLE;_DEBUG;%(PreprocessorDefinitions) Console - true - $(IntDir)..\..\common\$(Configuration)\common.lib - Level3 - - - _CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CONSOLE;NDEBUG - common - true + _CONSOLE;NDEBUG;%(PreprocessorDefinitions) Console - false - $(IntDir)..\..\common\$(Configuration)\common.lib diff --git a/src/common.vcxproj b/src/common.vcxproj index eb0dffd66..957ba55ad 100644 --- a/src/common.vcxproj +++ b/src/common.vcxproj @@ -10,6 +10,38 @@ Win32 + + {71DC1F68-BFC4-478C-8655-C8E9C9654D2B} + Win32Proj + + + + + StaticLibrary + true + + + StaticLibrary + false + + + + + + + + + + + + _LIB;_DEBUG;%(PreprocessorDefinitions) + + + + + _LIB;NDEBUG;%(PreprocessorDefinitions) + + @@ -106,80 +138,6 @@ - - {71DC1F68-BFC4-478C-8655-C8E9C9654D2B} - Win32Proj - common - 10.0.16299.0 - - - - StaticLibrary - true - v141 - - - false - true - StaticLibrary - v141 - - - - - - - - - - - - - $(SolutionDir)..\wrk\$(ProjectName)\$(Configuration)\ - $(SolutionDir)..\wrk\$(ProjectName)\$(Configuration)\ - - - - $(SolutionDir)..\wrk\$(ProjectName)\$(Configuration)\ - $(SolutionDir)..\wrk\$(ProjectName)\$(Configuration)\ - - - - - - Level3 - _CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_LIB;_DEBUG - true - - - Windows - true - - - - $(IntDir)$(TargetName)$(TargetExt) - - - - - Level3 - - - true - _CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_LIB;NDEBUG - true - - - Windows - true - true - true - - - - $(IntDir)$(TargetName)$(TargetExt) - - diff --git a/src/da65.vcxproj b/src/da65.vcxproj index 090c3030f..ae7c9a7f4 100644 --- a/src/da65.vcxproj +++ b/src/da65.vcxproj @@ -13,66 +13,37 @@ {0BCFB793-2B25-40E2-B265-75848824AC4C} Win32Proj - da65 - 10.0.16299.0 + true - v141 false - true - v141 - - - - - - - true - $(SolutionDir)..\bin\ - $(SolutionDir)..\wrk\$(ProjectName)\$(Configuration)\ - $(SolutionDir)..\bin\ - $(SolutionDir)..\wrk\$(ProjectName)\$(Configuration)\ - - - Level3 - _CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CONSOLE;_DEBUG - common - true + _CONSOLE;_DEBUG;%(PreprocessorDefinitions) Console - true - $(IntDir)..\..\common\$(Configuration)\common.lib - Level3 - - - _CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CONSOLE;NDEBUG - common - true + _CONSOLE;NDEBUG;%(PreprocessorDefinitions) Console - false - $(IntDir)..\..\common\$(Configuration)\common.lib diff --git a/src/grc65.vcxproj b/src/grc65.vcxproj index 841ec635a..1c61bc82e 100644 --- a/src/grc65.vcxproj +++ b/src/grc65.vcxproj @@ -13,66 +13,37 @@ {E0FD0AB3-3BEE-496F-8108-A8E0F8933F39} Win32Proj - grc65 - 10.0.16299.0 + true - v141 false - true - v141 - - - - - - - true - $(SolutionDir)..\bin\ - $(SolutionDir)..\wrk\$(ProjectName)\$(Configuration)\ - $(SolutionDir)..\bin\ - $(SolutionDir)..\wrk\$(ProjectName)\$(Configuration)\ - - - Level3 - _CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CONSOLE;_DEBUG - common - true + _CONSOLE;_DEBUG;%(PreprocessorDefinitions) Console - true - $(IntDir)..\..\common\$(Configuration)\common.lib - Level3 - - - _CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CONSOLE;NDEBUG - common - true + _CONSOLE;NDEBUG;%(PreprocessorDefinitions) Console - false - $(IntDir)..\..\common\$(Configuration)\common.lib diff --git a/src/ld65.vcxproj b/src/ld65.vcxproj index a78f3128b..0e7ac7346 100644 --- a/src/ld65.vcxproj +++ b/src/ld65.vcxproj @@ -13,66 +13,37 @@ {26C749A0-814C-47A2-9D36-AE92AE932FE4} Win32Proj - ld65 - 10.0.16299.0 + true - v141 false - true - v141 - - - - - - - true - $(SolutionDir)..\bin\ - $(SolutionDir)..\wrk\$(ProjectName)\$(Configuration)\ - $(SolutionDir)..\bin\ - $(SolutionDir)..\wrk\$(ProjectName)\$(Configuration)\ - - - Level3 - _CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CONSOLE;_DEBUG - common - true + _CONSOLE;_DEBUG;%(PreprocessorDefinitions) Console - true - $(IntDir)..\..\common\$(Configuration)\common.lib - Level3 - - - _CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CONSOLE;NDEBUG - common - true + _CONSOLE;NDEBUG;%(PreprocessorDefinitions) Console - false - $(IntDir)..\..\common\$(Configuration)\common.lib @@ -145,4 +116,4 @@ - + \ No newline at end of file diff --git a/src/od65.vcxproj b/src/od65.vcxproj index 03ea41fce..125452e5b 100644 --- a/src/od65.vcxproj +++ b/src/od65.vcxproj @@ -13,66 +13,37 @@ {FF8576C2-1253-44FE-A51B-D9AE35F3CEAD} Win32Proj - od65 - 10.0.16299.0 + true - v141 false - true - v141 - - - - - - - true - $(SolutionDir)..\bin\ - $(SolutionDir)..\wrk\$(ProjectName)\$(Configuration)\ - $(SolutionDir)..\bin\ - $(SolutionDir)..\wrk\$(ProjectName)\$(Configuration)\ - - - Level3 - _CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CONSOLE;_DEBUG - common - true + _CONSOLE;_DEBUG;%(PreprocessorDefinitions) Console - true - $(IntDir)..\..\common\$(Configuration)\common.lib - Level3 - - - _CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CONSOLE;NDEBUG - common - true + _CONSOLE;NDEBUG;%(PreprocessorDefinitions) Console - false - $(IntDir)..\..\common\$(Configuration)\common.lib diff --git a/src/sim65.vcxproj b/src/sim65.vcxproj index 9dc61e53f..26bf3cf5b 100644 --- a/src/sim65.vcxproj +++ b/src/sim65.vcxproj @@ -13,67 +13,37 @@ {002A366E-2863-46A8-BDDE-DDF534AAEC73} Win32Proj - sim65 - 10.0.16299.0 + true - v141 false - true - v141 - - - - - - - true - $(SolutionDir)..\bin\ - $(SolutionDir)..\wrk\$(ProjectName)\$(Configuration)\ - false - $(SolutionDir)..\bin\ - $(SolutionDir)..\wrk\$(ProjectName)\$(Configuration)\ - - - Level3 - _CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CONSOLE;_DEBUG - common - true + _CONSOLE;_DEBUG;%(PreprocessorDefinitions) Console - true - $(IntDir)..\..\common\$(Configuration)\common.lib - Level3 - - - _CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CONSOLE;NDEBUG - common - true + _CONSOLE;NDEBUG;%(PreprocessorDefinitions) Console - false - $(IntDir)..\..\common\$(Configuration)\common.lib diff --git a/src/sp65.vcxproj b/src/sp65.vcxproj index 3b770ec57..12b45c9e1 100644 --- a/src/sp65.vcxproj +++ b/src/sp65.vcxproj @@ -13,66 +13,37 @@ {4388D1AF-C7EA-4AD4-8E80-CA1FB7BF76BF} Win32Proj - sp65 - 10.0.16299.0 + true - v141 false - true - v141 - - - - - - - true - $(SolutionDir)..\bin\ - $(SolutionDir)..\wrk\$(ProjectName)\$(Configuration)\ - $(SolutionDir)..\bin\ - $(SolutionDir)..\wrk\$(ProjectName)\$(Configuration)\ - - - Level3 - _CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CONSOLE;_DEBUG - common - true + _CONSOLE;_DEBUG;%(PreprocessorDefinitions) Console - true - $(IntDir)..\..\common\$(Configuration)\common.lib - Level3 - - - _CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CONSOLE;NDEBUG - common - true + _CONSOLE;NDEBUG;%(PreprocessorDefinitions) Console - false - $(IntDir)..\..\common\$(Configuration)\common.lib