From 08341aae3026453cf1b7777e7fc31ef2395772af Mon Sep 17 00:00:00 2001 From: paul moore Date: Thu, 14 Dec 2023 14:25:35 -0800 Subject: [PATCH] second try at fixing win64 build --- .github/workflows/build-on-pull-request.yml | 16 ++++-- src/ar65.vcxproj | 33 ++++++++++++ src/ca65.vcxproj | 33 ++++++++++++ src/cc65.sln | 60 ++++++++++++++++++++- src/cc65.vcxproj | 35 +++++++++++- src/chrcvt65.vcxproj | 33 ++++++++++++ src/cl65.vcxproj | 33 ++++++++++++ src/cl65/main.c | 2 +- src/co65.vcxproj | 31 +++++++++++ src/common.vcxproj | 29 ++++++++++ src/common/filetype.c | 3 +- src/common/filetype.h | 2 +- src/da65.vcxproj | 33 ++++++++++++ src/grc65.vcxproj | 33 ++++++++++++ src/ld65.vcxproj | 39 +++++++++++++- src/ld65/main.c | 2 +- src/od65.vcxproj | 33 ++++++++++++ src/sim65.vcxproj | 33 ++++++++++++ src/sp65.vcxproj | 35 +++++++++++- 19 files changed, 504 insertions(+), 14 deletions(-) diff --git a/.github/workflows/build-on-pull-request.yml b/.github/workflows/build-on-pull-request.yml index 55be5db1e..55ee3df2d 100644 --- a/.github/workflows/build-on-pull-request.yml +++ b/.github/workflows/build-on-pull-request.yml @@ -67,8 +67,16 @@ jobs: - name: Add msbuild to PATH uses: microsoft/setup-msbuild@v1.1 - - name: Build app (debug) - run: msbuild src\cc65.sln -t:rebuild -property:Configuration=Debug + - name: Build app (x86 debug) + run: msbuild src\cc65.sln -t:rebuild -property:Configuration=Debug Platform=Win32 + + - name: Build app (x86 release) + run: msbuild src\cc65.sln -t:rebuild -property:Configuration=Release Platform=Win32 + + - name: Build app (x64 release) + run: msbuild src\cc65.sln -t:rebuild -property:Configuration=Debug Platform=x64 + + - name: Build app (x64 release) + run: msbuild src\cc65.sln -t:rebuild -property:Configuration=Release Platform=x64 + - - name: Build app (release) - run: msbuild src\cc65.sln -t:rebuild -property:Configuration=Release diff --git a/src/ar65.vcxproj b/src/ar65.vcxproj index 27d12dadc..0fd788e06 100644 --- a/src/ar65.vcxproj +++ b/src/ar65.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {5E8C19C6-B167-440C-8BEF-3CBF109CDB49} @@ -21,15 +29,22 @@ true + + true + false + + false + + @@ -40,6 +55,15 @@ Console + + + _CONSOLE;_DEBUG;%(PreprocessorDefinitions) + 4267;%(DisableSpecificWarnings) + + + Console + + _CONSOLE;NDEBUG;%(PreprocessorDefinitions) @@ -48,6 +72,15 @@ Console + + + _CONSOLE;NDEBUG;%(PreprocessorDefinitions) + 4267;%(DisableSpecificWarnings) + + + Console + + diff --git a/src/ca65.vcxproj b/src/ca65.vcxproj index 3cc6019f2..d8fd39303 100644 --- a/src/ca65.vcxproj +++ b/src/ca65.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {D28CB737-E6CA-49C4-8CE9-FF05F86DD4EC} @@ -21,15 +29,22 @@ true + + true + false + + false + + @@ -40,6 +55,15 @@ Console + + + _CONSOLE;_DEBUG;%(PreprocessorDefinitions) + 4244;4267;%(DisableSpecificWarnings) + + + Console + + _CONSOLE;NDEBUG;%(PreprocessorDefinitions) @@ -48,6 +72,15 @@ Console + + + _CONSOLE;NDEBUG;%(PreprocessorDefinitions) + 4244;4267;%(DisableSpecificWarnings) + + + Console + + diff --git a/src/cc65.sln b/src/cc65.sln index 4ae2816ad..8e31ef909 100644 --- a/src/cc65.sln +++ b/src/cc65.sln @@ -1,6 +1,8 @@  -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual C++ Express 2010 +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.6.33829.357 +MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common", "common.vcxproj", "{71DC1F68-BFC4-478C-8655-C8E9C9654D2B}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cc65", "cc65.vcxproj", "{B17EDBD5-DC04-4970-9CBD-56A98B6A3FCA}" @@ -66,61 +68,115 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 Release|Win32 = Release|Win32 + Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {71DC1F68-BFC4-478C-8655-C8E9C9654D2B}.Debug|Win32.ActiveCfg = Debug|Win32 {71DC1F68-BFC4-478C-8655-C8E9C9654D2B}.Debug|Win32.Build.0 = Debug|Win32 + {71DC1F68-BFC4-478C-8655-C8E9C9654D2B}.Debug|x64.ActiveCfg = Debug|x64 + {71DC1F68-BFC4-478C-8655-C8E9C9654D2B}.Debug|x64.Build.0 = Debug|x64 {71DC1F68-BFC4-478C-8655-C8E9C9654D2B}.Release|Win32.ActiveCfg = Release|Win32 {71DC1F68-BFC4-478C-8655-C8E9C9654D2B}.Release|Win32.Build.0 = Release|Win32 + {71DC1F68-BFC4-478C-8655-C8E9C9654D2B}.Release|x64.ActiveCfg = Release|x64 + {71DC1F68-BFC4-478C-8655-C8E9C9654D2B}.Release|x64.Build.0 = Release|x64 {B17EDBD5-DC04-4970-9CBD-56A98B6A3FCA}.Debug|Win32.ActiveCfg = Debug|Win32 {B17EDBD5-DC04-4970-9CBD-56A98B6A3FCA}.Debug|Win32.Build.0 = Debug|Win32 + {B17EDBD5-DC04-4970-9CBD-56A98B6A3FCA}.Debug|x64.ActiveCfg = Debug|x64 + {B17EDBD5-DC04-4970-9CBD-56A98B6A3FCA}.Debug|x64.Build.0 = Debug|x64 {B17EDBD5-DC04-4970-9CBD-56A98B6A3FCA}.Release|Win32.ActiveCfg = Release|Win32 {B17EDBD5-DC04-4970-9CBD-56A98B6A3FCA}.Release|Win32.Build.0 = Release|Win32 + {B17EDBD5-DC04-4970-9CBD-56A98B6A3FCA}.Release|x64.ActiveCfg = Release|x64 + {B17EDBD5-DC04-4970-9CBD-56A98B6A3FCA}.Release|x64.Build.0 = Release|x64 {D28CB737-E6CA-49C4-8CE9-FF05F86DD4EC}.Debug|Win32.ActiveCfg = Debug|Win32 {D28CB737-E6CA-49C4-8CE9-FF05F86DD4EC}.Debug|Win32.Build.0 = Debug|Win32 + {D28CB737-E6CA-49C4-8CE9-FF05F86DD4EC}.Debug|x64.ActiveCfg = Debug|x64 + {D28CB737-E6CA-49C4-8CE9-FF05F86DD4EC}.Debug|x64.Build.0 = Debug|x64 {D28CB737-E6CA-49C4-8CE9-FF05F86DD4EC}.Release|Win32.ActiveCfg = Release|Win32 {D28CB737-E6CA-49C4-8CE9-FF05F86DD4EC}.Release|Win32.Build.0 = Release|Win32 + {D28CB737-E6CA-49C4-8CE9-FF05F86DD4EC}.Release|x64.ActiveCfg = Release|x64 + {D28CB737-E6CA-49C4-8CE9-FF05F86DD4EC}.Release|x64.Build.0 = Release|x64 {5E8C19C6-B167-440C-8BEF-3CBF109CDB49}.Debug|Win32.ActiveCfg = Debug|Win32 {5E8C19C6-B167-440C-8BEF-3CBF109CDB49}.Debug|Win32.Build.0 = Debug|Win32 + {5E8C19C6-B167-440C-8BEF-3CBF109CDB49}.Debug|x64.ActiveCfg = Debug|x64 + {5E8C19C6-B167-440C-8BEF-3CBF109CDB49}.Debug|x64.Build.0 = Debug|x64 {5E8C19C6-B167-440C-8BEF-3CBF109CDB49}.Release|Win32.ActiveCfg = Release|Win32 {5E8C19C6-B167-440C-8BEF-3CBF109CDB49}.Release|Win32.Build.0 = Release|Win32 + {5E8C19C6-B167-440C-8BEF-3CBF109CDB49}.Release|x64.ActiveCfg = Release|x64 + {5E8C19C6-B167-440C-8BEF-3CBF109CDB49}.Release|x64.Build.0 = Release|x64 {26C749A0-814C-47A2-9D36-AE92AE932FE4}.Debug|Win32.ActiveCfg = Debug|Win32 {26C749A0-814C-47A2-9D36-AE92AE932FE4}.Debug|Win32.Build.0 = Debug|Win32 + {26C749A0-814C-47A2-9D36-AE92AE932FE4}.Debug|x64.ActiveCfg = Debug|x64 + {26C749A0-814C-47A2-9D36-AE92AE932FE4}.Debug|x64.Build.0 = Debug|x64 {26C749A0-814C-47A2-9D36-AE92AE932FE4}.Release|Win32.ActiveCfg = Release|Win32 {26C749A0-814C-47A2-9D36-AE92AE932FE4}.Release|Win32.Build.0 = Release|Win32 + {26C749A0-814C-47A2-9D36-AE92AE932FE4}.Release|x64.ActiveCfg = Release|x64 + {26C749A0-814C-47A2-9D36-AE92AE932FE4}.Release|x64.Build.0 = Release|x64 {F657912F-050A-488B-B203-50ED5715CDD7}.Debug|Win32.ActiveCfg = Debug|Win32 {F657912F-050A-488B-B203-50ED5715CDD7}.Debug|Win32.Build.0 = Debug|Win32 + {F657912F-050A-488B-B203-50ED5715CDD7}.Debug|x64.ActiveCfg = Debug|x64 + {F657912F-050A-488B-B203-50ED5715CDD7}.Debug|x64.Build.0 = Debug|x64 {F657912F-050A-488B-B203-50ED5715CDD7}.Release|Win32.ActiveCfg = Release|Win32 {F657912F-050A-488B-B203-50ED5715CDD7}.Release|Win32.Build.0 = Release|Win32 + {F657912F-050A-488B-B203-50ED5715CDD7}.Release|x64.ActiveCfg = Release|x64 + {F657912F-050A-488B-B203-50ED5715CDD7}.Release|x64.Build.0 = Release|x64 {0BCFB793-2B25-40E2-B265-75848824AC4C}.Debug|Win32.ActiveCfg = Debug|Win32 {0BCFB793-2B25-40E2-B265-75848824AC4C}.Debug|Win32.Build.0 = Debug|Win32 + {0BCFB793-2B25-40E2-B265-75848824AC4C}.Debug|x64.ActiveCfg = Debug|x64 + {0BCFB793-2B25-40E2-B265-75848824AC4C}.Debug|x64.Build.0 = Debug|x64 {0BCFB793-2B25-40E2-B265-75848824AC4C}.Release|Win32.ActiveCfg = Release|Win32 {0BCFB793-2B25-40E2-B265-75848824AC4C}.Release|Win32.Build.0 = Release|Win32 + {0BCFB793-2B25-40E2-B265-75848824AC4C}.Release|x64.ActiveCfg = Release|x64 + {0BCFB793-2B25-40E2-B265-75848824AC4C}.Release|x64.Build.0 = Release|x64 {F5DB5D1A-05BC-48FE-B346-4E96DD522AA2}.Debug|Win32.ActiveCfg = Debug|Win32 {F5DB5D1A-05BC-48FE-B346-4E96DD522AA2}.Debug|Win32.Build.0 = Debug|Win32 + {F5DB5D1A-05BC-48FE-B346-4E96DD522AA2}.Debug|x64.ActiveCfg = Debug|x64 + {F5DB5D1A-05BC-48FE-B346-4E96DD522AA2}.Debug|x64.Build.0 = Debug|x64 {F5DB5D1A-05BC-48FE-B346-4E96DD522AA2}.Release|Win32.ActiveCfg = Release|Win32 {F5DB5D1A-05BC-48FE-B346-4E96DD522AA2}.Release|Win32.Build.0 = Release|Win32 + {F5DB5D1A-05BC-48FE-B346-4E96DD522AA2}.Release|x64.ActiveCfg = Release|x64 + {F5DB5D1A-05BC-48FE-B346-4E96DD522AA2}.Release|x64.Build.0 = Release|x64 {E0FD0AB3-3BEE-496F-8108-A8E0F8933F39}.Debug|Win32.ActiveCfg = Debug|Win32 {E0FD0AB3-3BEE-496F-8108-A8E0F8933F39}.Debug|Win32.Build.0 = Debug|Win32 + {E0FD0AB3-3BEE-496F-8108-A8E0F8933F39}.Debug|x64.ActiveCfg = Debug|x64 + {E0FD0AB3-3BEE-496F-8108-A8E0F8933F39}.Debug|x64.Build.0 = Debug|x64 {E0FD0AB3-3BEE-496F-8108-A8E0F8933F39}.Release|Win32.ActiveCfg = Release|Win32 {E0FD0AB3-3BEE-496F-8108-A8E0F8933F39}.Release|Win32.Build.0 = Release|Win32 + {E0FD0AB3-3BEE-496F-8108-A8E0F8933F39}.Release|x64.ActiveCfg = Release|x64 + {E0FD0AB3-3BEE-496F-8108-A8E0F8933F39}.Release|x64.Build.0 = Release|x64 {FF8576C2-1253-44FE-A51B-D9AE35F3CEAD}.Debug|Win32.ActiveCfg = Debug|Win32 {FF8576C2-1253-44FE-A51B-D9AE35F3CEAD}.Debug|Win32.Build.0 = Debug|Win32 + {FF8576C2-1253-44FE-A51B-D9AE35F3CEAD}.Debug|x64.ActiveCfg = Debug|x64 + {FF8576C2-1253-44FE-A51B-D9AE35F3CEAD}.Debug|x64.Build.0 = Debug|x64 {FF8576C2-1253-44FE-A51B-D9AE35F3CEAD}.Release|Win32.ActiveCfg = Release|Win32 {FF8576C2-1253-44FE-A51B-D9AE35F3CEAD}.Release|Win32.Build.0 = Release|Win32 + {FF8576C2-1253-44FE-A51B-D9AE35F3CEAD}.Release|x64.ActiveCfg = Release|x64 + {FF8576C2-1253-44FE-A51B-D9AE35F3CEAD}.Release|x64.Build.0 = Release|x64 {4388D1AF-C7EA-4AD4-8E80-CA1FB7BF76BF}.Debug|Win32.ActiveCfg = Debug|Win32 {4388D1AF-C7EA-4AD4-8E80-CA1FB7BF76BF}.Debug|Win32.Build.0 = Debug|Win32 + {4388D1AF-C7EA-4AD4-8E80-CA1FB7BF76BF}.Debug|x64.ActiveCfg = Debug|x64 + {4388D1AF-C7EA-4AD4-8E80-CA1FB7BF76BF}.Debug|x64.Build.0 = Debug|x64 {4388D1AF-C7EA-4AD4-8E80-CA1FB7BF76BF}.Release|Win32.ActiveCfg = Release|Win32 {4388D1AF-C7EA-4AD4-8E80-CA1FB7BF76BF}.Release|Win32.Build.0 = Release|Win32 + {4388D1AF-C7EA-4AD4-8E80-CA1FB7BF76BF}.Release|x64.ActiveCfg = Release|x64 + {4388D1AF-C7EA-4AD4-8E80-CA1FB7BF76BF}.Release|x64.Build.0 = Release|x64 {002A366E-2863-46A8-BDDE-DDF534AAEC73}.Debug|Win32.ActiveCfg = Debug|Win32 {002A366E-2863-46A8-BDDE-DDF534AAEC73}.Debug|Win32.Build.0 = Debug|Win32 + {002A366E-2863-46A8-BDDE-DDF534AAEC73}.Debug|x64.ActiveCfg = Debug|x64 + {002A366E-2863-46A8-BDDE-DDF534AAEC73}.Debug|x64.Build.0 = Debug|x64 {002A366E-2863-46A8-BDDE-DDF534AAEC73}.Release|Win32.ActiveCfg = Release|Win32 {002A366E-2863-46A8-BDDE-DDF534AAEC73}.Release|Win32.Build.0 = Release|Win32 + {002A366E-2863-46A8-BDDE-DDF534AAEC73}.Release|x64.ActiveCfg = Release|x64 + {002A366E-2863-46A8-BDDE-DDF534AAEC73}.Release|x64.Build.0 = Release|x64 {1C7A3FEF-DD0B-4B10-BC33-C3BE29BF67CC}.Debug|Win32.ActiveCfg = Debug|Win32 {1C7A3FEF-DD0B-4B10-BC33-C3BE29BF67CC}.Debug|Win32.Build.0 = Debug|Win32 + {1C7A3FEF-DD0B-4B10-BC33-C3BE29BF67CC}.Debug|x64.ActiveCfg = Debug|x64 + {1C7A3FEF-DD0B-4B10-BC33-C3BE29BF67CC}.Debug|x64.Build.0 = Debug|x64 {1C7A3FEF-DD0B-4B10-BC33-C3BE29BF67CC}.Release|Win32.ActiveCfg = Release|Win32 {1C7A3FEF-DD0B-4B10-BC33-C3BE29BF67CC}.Release|Win32.Build.0 = Release|Win32 + {1C7A3FEF-DD0B-4B10-BC33-C3BE29BF67CC}.Release|x64.ActiveCfg = Release|x64 + {1C7A3FEF-DD0B-4B10-BC33-C3BE29BF67CC}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/cc65.vcxproj b/src/cc65.vcxproj index 9c1719538..75ee92276 100644 --- a/src/cc65.vcxproj +++ b/src/cc65.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {B17EDBD5-DC04-4970-9CBD-56A98B6A3FCA} @@ -21,15 +29,22 @@ true + + true + false + + false + + @@ -40,6 +55,15 @@ Console + + + _CONSOLE;_DEBUG;%(PreprocessorDefinitions) + 4244;4267;%(DisableSpecificWarnings) + + + Console + + _CONSOLE;NDEBUG;%(PreprocessorDefinitions) @@ -48,6 +72,15 @@ Console + + + _CONSOLE;NDEBUG;%(PreprocessorDefinitions) + 4244;4267;%(DisableSpecificWarnings) + + + Console + + @@ -216,4 +249,4 @@ - + \ No newline at end of file diff --git a/src/chrcvt65.vcxproj b/src/chrcvt65.vcxproj index 1e5c753b5..d44380c4e 100644 --- a/src/chrcvt65.vcxproj +++ b/src/chrcvt65.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {1C7A3FEF-DD0B-4B10-BC33-C3BE29BF67CC} @@ -21,15 +29,22 @@ true + + true + false + + false + + @@ -40,6 +55,15 @@ Console + + + _CONSOLE;_DEBUG;%(PreprocessorDefinitions) + 4244;%(DisableSpecificWarnings) + + + Console + + _CONSOLE;NDEBUG;%(PreprocessorDefinitions) @@ -48,6 +72,15 @@ Console + + + _CONSOLE;NDEBUG;%(PreprocessorDefinitions) + 4244;%(DisableSpecificWarnings) + + + Console + + diff --git a/src/cl65.vcxproj b/src/cl65.vcxproj index 67b7eb087..688926557 100644 --- a/src/cl65.vcxproj +++ b/src/cl65.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {F657912F-050A-488B-B203-50ED5715CDD7} @@ -21,15 +29,22 @@ true + + true + false + + false + + @@ -40,6 +55,15 @@ Console + + + _CONSOLE;_DEBUG;%(PreprocessorDefinitions) + 4244;4267;%(DisableSpecificWarnings) + + + Console + + _CONSOLE;NDEBUG;%(PreprocessorDefinitions) @@ -48,6 +72,15 @@ Console + + + _CONSOLE;NDEBUG;%(PreprocessorDefinitions) + 4244;4267;%(DisableSpecificWarnings) + + + Console + + diff --git a/src/cl65/main.c b/src/cl65/main.c index 553fb9ca6..0148ad1e3 100644 --- a/src/cl65/main.c +++ b/src/cl65/main.c @@ -1610,7 +1610,7 @@ int main (int argc, char* argv []) } /* Determine the file type by the extension */ - switch (GetFileType (Arg)) { + switch (GetTypeOfFile (Arg)) { case FILETYPE_C: /* Compile the file */ diff --git a/src/co65.vcxproj b/src/co65.vcxproj index 9f5959d89..fa6a1e315 100644 --- a/src/co65.vcxproj +++ b/src/co65.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {F5DB5D1A-05BC-48FE-B346-4E96DD522AA2} @@ -21,15 +29,22 @@ true + + true + false + + false + + @@ -40,6 +55,14 @@ Console + + + _CONSOLE;_DEBUG;%(PreprocessorDefinitions) + + + Console + + _CONSOLE;NDEBUG;%(PreprocessorDefinitions) @@ -48,6 +71,14 @@ Console + + + _CONSOLE;NDEBUG;%(PreprocessorDefinitions) + + + Console + + diff --git a/src/common.vcxproj b/src/common.vcxproj index df99fc4a9..6098c98a0 100644 --- a/src/common.vcxproj +++ b/src/common.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {71DC1F68-BFC4-478C-8655-C8E9C9654D2B} @@ -22,16 +30,25 @@ StaticLibrary true + + StaticLibrary + true + StaticLibrary false + + StaticLibrary + false + + @@ -39,11 +56,23 @@ _LIB;_DEBUG;%(PreprocessorDefinitions) + + + _LIB;_DEBUG;%(PreprocessorDefinitions) + 4244;4267;%(DisableSpecificWarnings) + + _LIB;NDEBUG;%(PreprocessorDefinitions) + + + _LIB;NDEBUG;%(PreprocessorDefinitions) + 4244;4267;%(DisableSpecificWarnings) + + diff --git a/src/common/filetype.c b/src/common/filetype.c index a5bac640d..ae8b636dc 100644 --- a/src/common/filetype.c +++ b/src/common/filetype.c @@ -92,8 +92,7 @@ static const FileId TypeTable[] = { /*****************************************************************************/ - -FILETYPE GetFileType (const char* Name) +FILETYPE GetTypeOfFile (const char* Name) /* Determine the type of the given file by looking at the name. If the file ** type could not be determined, the function returns FILETYPE_UNKOWN. */ diff --git a/src/common/filetype.h b/src/common/filetype.h index f4beae73a..0738078ba 100644 --- a/src/common/filetype.h +++ b/src/common/filetype.h @@ -63,7 +63,7 @@ typedef enum { -FILETYPE GetFileType (const char* Name); +FILETYPE GetTypeOfFile (const char* Name); /* Determine the type of the given file by looking at the name. If the file ** type could not be determined, the function returns FILETYPE_UNKOWN. */ diff --git a/src/da65.vcxproj b/src/da65.vcxproj index a40daf1d6..9d2b0ded6 100644 --- a/src/da65.vcxproj +++ b/src/da65.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {0BCFB793-2B25-40E2-B265-75848824AC4C} @@ -21,15 +29,22 @@ true + + true + false + + false + + @@ -40,6 +55,15 @@ Console + + + _CONSOLE;_DEBUG;%(PreprocessorDefinitions) + 4244;4267;%(DisableSpecificWarnings) + + + Console + + _CONSOLE;NDEBUG;%(PreprocessorDefinitions) @@ -48,6 +72,15 @@ Console + + + _CONSOLE;NDEBUG;%(PreprocessorDefinitions) + 4244;4267;%(DisableSpecificWarnings) + + + Console + + diff --git a/src/grc65.vcxproj b/src/grc65.vcxproj index fbd44fa3e..742003899 100644 --- a/src/grc65.vcxproj +++ b/src/grc65.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {E0FD0AB3-3BEE-496F-8108-A8E0F8933F39} @@ -21,15 +29,22 @@ true + + true + false + + false + + @@ -40,6 +55,15 @@ Console + + + _CONSOLE;_DEBUG;%(PreprocessorDefinitions) + 4267;%(DisableSpecificWarnings) + + + Console + + _CONSOLE;NDEBUG;%(PreprocessorDefinitions) @@ -48,6 +72,15 @@ Console + + + _CONSOLE;NDEBUG;%(PreprocessorDefinitions) + 4267;%(DisableSpecificWarnings) + + + Console + + diff --git a/src/ld65.vcxproj b/src/ld65.vcxproj index 9e4b08621..e2f06b198 100644 --- a/src/ld65.vcxproj +++ b/src/ld65.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {26C749A0-814C-47A2-9D36-AE92AE932FE4} @@ -21,15 +29,22 @@ true + + true + false + + false + + @@ -38,6 +53,19 @@ Console + ld65.map + true + + + + + _CONSOLE;_DEBUG;%(PreprocessorDefinitions) + 4244;4267;%(DisableSpecificWarnings) + + + Console + ld65.map + true @@ -48,6 +76,15 @@ Console + + + _CONSOLE;NDEBUG;%(PreprocessorDefinitions) + 4244;4267;%(DisableSpecificWarnings) + + + Console + + @@ -118,4 +155,4 @@ - + \ No newline at end of file diff --git a/src/ld65/main.c b/src/ld65/main.c index 70e9c84d1..5632f4961 100644 --- a/src/ld65/main.c +++ b/src/ld65/main.c @@ -189,7 +189,7 @@ static void LinkFile (const char* Name, FILETYPE Type) /* If we don't know the file type, determine it from the extension */ if (Type == FILETYPE_UNKNOWN) { - Type = GetFileType (Name); + Type = GetTypeOfFile (Name); } /* For known file types, search the file in the directory list */ diff --git a/src/od65.vcxproj b/src/od65.vcxproj index 1a1527067..409b5038e 100644 --- a/src/od65.vcxproj +++ b/src/od65.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {FF8576C2-1253-44FE-A51B-D9AE35F3CEAD} @@ -21,15 +29,22 @@ true + + true + false + + false + + @@ -40,6 +55,15 @@ Console + + + _CONSOLE;_DEBUG;%(PreprocessorDefinitions) + 4244;4267;%(DisableSpecificWarnings) + + + Console + + _CONSOLE;NDEBUG;%(PreprocessorDefinitions) @@ -48,6 +72,15 @@ Console + + + _CONSOLE;NDEBUG;%(PreprocessorDefinitions) + 4244;4267;%(DisableSpecificWarnings) + + + Console + + diff --git a/src/sim65.vcxproj b/src/sim65.vcxproj index 97fc3855a..7bc489398 100644 --- a/src/sim65.vcxproj +++ b/src/sim65.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {002A366E-2863-46A8-BDDE-DDF534AAEC73} @@ -21,15 +29,22 @@ true + + true + false + + false + + @@ -40,6 +55,15 @@ Console + + + _CONSOLE;_DEBUG;%(PreprocessorDefinitions) + 4267;%(DisableSpecificWarnings) + + + Console + + _CONSOLE;NDEBUG;%(PreprocessorDefinitions) @@ -48,6 +72,15 @@ Console + + + _CONSOLE;NDEBUG;%(PreprocessorDefinitions) + 4267;%(DisableSpecificWarnings) + + + Console + + diff --git a/src/sp65.vcxproj b/src/sp65.vcxproj index a9f0919a3..21816ee2b 100644 --- a/src/sp65.vcxproj +++ b/src/sp65.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {4388D1AF-C7EA-4AD4-8E80-CA1FB7BF76BF} @@ -21,15 +29,22 @@ true + + true + false + + false + + @@ -40,6 +55,15 @@ Console + + + _CONSOLE;_DEBUG;%(PreprocessorDefinitions) + 4244;4267;%(DisableSpecificWarnings) + + + Console + + _CONSOLE;NDEBUG;%(PreprocessorDefinitions) @@ -48,6 +72,15 @@ Console + + + _CONSOLE;NDEBUG;%(PreprocessorDefinitions) + 4244;4267;%(DisableSpecificWarnings) + + + Console + + @@ -99,4 +132,4 @@ - + \ No newline at end of file