From 114298f750ded052c36763d7b224312fbb71eb25 Mon Sep 17 00:00:00 2001 From: ggn Date: Fri, 3 Jan 2020 08:09:01 +0200 Subject: [PATCH 1/1] Updated VS2015 project files, it should now build out of the box on VS2015 and later --- Vs2015/68ktab/68ktab.vcxproj | 13 +++++---- Vs2015/VS2015.sln | 19 ++++++++++-- Vs2015/kwgen/kwgen.vcxproj | 13 +++++---- Vs2015/rmac/rmac.vcxproj | 56 ++++++++++++++++++++++++++++++++---- maketabs.bat | 33 ++++++++++++++------- token.c | 1 - 6 files changed, 103 insertions(+), 32 deletions(-) diff --git a/Vs2015/68ktab/68ktab.vcxproj b/Vs2015/68ktab/68ktab.vcxproj index 9c25e05..1679ae0 100644 --- a/Vs2015/68ktab/68ktab.vcxproj +++ b/Vs2015/68ktab/68ktab.vcxproj @@ -75,11 +75,11 @@ true - $(SolutionDir)\.. + $(SolutionDir)\..\ true - $(SolutionDir)\.. + $(SolutionDir)..\ false @@ -95,11 +95,12 @@ Level3 Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) Console true + notelemetry.obj %(AdditionalOptions) @@ -108,7 +109,7 @@ Level3 Disabled - _DEBUG;_CONSOLE;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) Console @@ -123,7 +124,7 @@ MaxSpeed true true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) Console @@ -140,7 +141,7 @@ MaxSpeed true true - NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) Console diff --git a/Vs2015/VS2015.sln b/Vs2015/VS2015.sln index e2625f5..12d943e 100644 --- a/Vs2015/VS2015.sln +++ b/Vs2015/VS2015.sln @@ -1,13 +1,20 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 -VisualStudioVersion = 14.0.23107.0 +VisualStudioVersion = 14.0.25420.1 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rmac", "rmac\rmac.vcxproj", "{D8A382B9-8BD4-4953-B780-95010C41AFC8}" + ProjectSection(ProjectDependencies) = postProject + {0D200546-CF83-49B6-9893-42DD6AEC94F0} = {0D200546-CF83-49B6-9893-42DD6AEC94F0} + {57AE775A-AA54-4764-AC86-6C85CE9B5AA7} = {57AE775A-AA54-4764-AC86-6C85CE9B5AA7} + {AAEB066A-F264-4AEC-A606-EDE5DE47FDDF} = {AAEB066A-F264-4AEC-A606-EDE5DE47FDDF} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "kwgen", "kwgen\kwgen.vcxproj", "{AAEB066A-F264-4AEC-A606-EDE5DE47FDDF}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "68ktab", "68ktab\68ktab.vcxproj", "{0D200546-CF83-49B6-9893-42DD6AEC94F0}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "68kgen", "68ktab\68ktab.vcxproj", "{0D200546-CF83-49B6-9893-42DD6AEC94F0}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsp56kgen", "dsp56kgen\dsp56kgen.vcxproj", "{57AE775A-AA54-4764-AC86-6C85CE9B5AA7}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -41,6 +48,14 @@ Global {0D200546-CF83-49B6-9893-42DD6AEC94F0}.Release|x64.Build.0 = Release|x64 {0D200546-CF83-49B6-9893-42DD6AEC94F0}.Release|x86.ActiveCfg = Release|Win32 {0D200546-CF83-49B6-9893-42DD6AEC94F0}.Release|x86.Build.0 = Release|Win32 + {57AE775A-AA54-4764-AC86-6C85CE9B5AA7}.Debug|x64.ActiveCfg = Debug|x64 + {57AE775A-AA54-4764-AC86-6C85CE9B5AA7}.Debug|x64.Build.0 = Debug|x64 + {57AE775A-AA54-4764-AC86-6C85CE9B5AA7}.Debug|x86.ActiveCfg = Debug|Win32 + {57AE775A-AA54-4764-AC86-6C85CE9B5AA7}.Debug|x86.Build.0 = Debug|Win32 + {57AE775A-AA54-4764-AC86-6C85CE9B5AA7}.Release|x64.ActiveCfg = Release|x64 + {57AE775A-AA54-4764-AC86-6C85CE9B5AA7}.Release|x64.Build.0 = Release|x64 + {57AE775A-AA54-4764-AC86-6C85CE9B5AA7}.Release|x86.ActiveCfg = Release|Win32 + {57AE775A-AA54-4764-AC86-6C85CE9B5AA7}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Vs2015/kwgen/kwgen.vcxproj b/Vs2015/kwgen/kwgen.vcxproj index 7c07b0f..7cf3c44 100644 --- a/Vs2015/kwgen/kwgen.vcxproj +++ b/Vs2015/kwgen/kwgen.vcxproj @@ -74,11 +74,11 @@ true - $(SolutionDir)\.. + $(SolutionDir)\..\ true - $(SolutionDir)\.. + $(SolutionDir)..\ false @@ -94,11 +94,12 @@ Level3 Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) Console true + notelemetry.obj %(AdditionalOptions) @@ -107,7 +108,7 @@ Level3 Disabled - _DEBUG;_CONSOLE;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) Console @@ -122,7 +123,7 @@ MaxSpeed true true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) Console @@ -139,7 +140,7 @@ MaxSpeed true true - NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) Console diff --git a/Vs2015/rmac/rmac.vcxproj b/Vs2015/rmac/rmac.vcxproj index f2212a7..8e0b0ff 100644 --- a/Vs2015/rmac/rmac.vcxproj +++ b/Vs2015/rmac/rmac.vcxproj @@ -23,6 +23,9 @@ + + + @@ -42,16 +45,22 @@ + + + + + + @@ -63,6 +72,9 @@ + + true + {D8A382B9-8BD4-4953-B780-95010C41AFC8} Win32Proj @@ -116,11 +128,15 @@ true - $(SolutionDir)\.. + $(SolutionDir)..\ true $(SolutionDir)..\ + + + + false @@ -136,12 +152,23 @@ Level3 Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + Neither + false Console true + notelemetry.obj %(AdditionalOptions) + false + + cd $(SolutionDir)..\ +call maketabs.bat + + + Rebuilds the table files (note, 68kgen, dsp56kgen and kwgen must be built beforehand!) + @@ -149,15 +176,20 @@ Level3 Disabled - WIN64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) Console true + + + + cd $(SolutionDir)..\ -call maketabs.bat +maketabs.bat + Rebuilds the table files (note, 68kgen, dsp56kgen and kwgen must be built beforehand!) @@ -168,7 +200,9 @@ call maketabs.bat MaxSpeed true true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + Speed + true Console @@ -176,6 +210,11 @@ call maketabs.bat true true + + cd $(SolutionDir)..\ +maketabs.bat + Rebuilds the table files (note, 68kgen, dsp56kgen and kwgen must be built beforehand!) + @@ -185,7 +224,7 @@ call maketabs.bat MaxSpeed true true - WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) Console @@ -193,6 +232,11 @@ call maketabs.bat true true + + cd $(SolutionDir)..\ +maketabs.bat + Rebuilds the table files (note, 68kgen, dsp56kgen and kwgen must be built beforehand!) + diff --git a/maketabs.bat b/maketabs.bat index 4247de5..0d993c0 100644 --- a/maketabs.bat +++ b/maketabs.bat @@ -1,31 +1,37 @@ -rem @echo off +@echo off REM Check for file dates and build .h files if needed -SET FILE1=68ktab +SET FILE1=68k.mch SET FILE2=68ktab.h if not exist %FILE2% GOTO BUILD for /F %%i IN ('dir /b /OD %FILE1% %FILE2% ^| more +1') DO SET NEWEST=%%i if %NEWEST%==%FILE1% GOTO BUILD -SET FILE1=mntab +SET FILE1=direct.tab SET FILE2=mntab.h if not exist %FILE2% GOTO BUILD for /F %%i IN ('dir /b /OD %FILE1% %FILE2% ^| more +1') DO SET NEWEST=%%i if %NEWEST%==%FILE1% GOTO BUILD -SET FILE1=kwtab +SET FILE1=kw.tab SET FILE2=kwtab.h if not exist %FILE2% GOTO BUILD for /F %%i IN ('dir /b /OD %FILE1% %FILE2% ^| more +1') DO SET NEWEST=%%i if %NEWEST%==%FILE1% GOTO BUILD -SET FILE1=risctab +SET FILE1=risc.tab SET FILE2=risckw.h if not exist %FILE2% GOTO BUILD for /F %%i IN ('dir /b /OD %FILE1% %FILE2% ^| more +1') DO SET NEWEST=%%i if %NEWEST%==%FILE1% GOTO BUILD -SET FILE1=6502.tbl +SET FILE1=dsp56k.tab +SET FILE2=dsp56ktab.h +if not exist %FILE2% GOTO BUILD +for /F %%i IN ('dir /b /OD %FILE1% %FILE2% ^| more +1') DO SET NEWEST=%%i +if %NEWEST%==%FILE1% GOTO BUILD + +SET FILE1=6502.tab SET FILE2=6502kw.h if not exist %FILE2% GOTO BUILD for /F %%i IN ('dir /b /OD %FILE1% %FILE2% ^| more +1') DO SET NEWEST=%%i @@ -43,13 +49,17 @@ GOTO END echo Generating files... -68kgen 68kmn <68ktab >68ktab.h -type mntab 68kmn | kwgen mn >mntab.h -kwgen kw kwtab.h -kwgen mr risckw.h -kwgen mp <6502.tbl >6502kw.h +68kgen 68k.tab <68k.mch >68ktab.h +dsp56kgen dsp56k.tab dsp56ktab.h +type direct.tab 68k.tab | kwgen mn >mntab.h +kwgen kw kwtab.h +kwgen mr risckw.h +kwgen dsp dsp56kkw.h +kwgen mp <6502.tab >6502kw.h +kwgen mp <6502.tab >6502kw.h kwgen mo opkw.h + rem touch files that include these header files so they'll recompile echo Generating tables... copy /b amode.c +,, >NUL @@ -59,6 +69,7 @@ copy /b mach.c +,, >NUL copy /b procln.c +,, >NUL copy /b riscasm.c +,, >NUL copy /b token.c +,, >NUL +copy /b dsp56k_mach.c +,, >NUL :END diff --git a/token.c b/token.c index 6a47bdb..c867853 100644 --- a/token.c +++ b/token.c @@ -950,7 +950,6 @@ int TokenizeLine(void) uint8_t c; // Random char uint64_t v; // Random value uint32_t cursize = 0; // Current line's size (.b, .w, .l, .s, .q, .d) - double f; // Random float uint8_t * nullspot = NULL; // Spot to clobber for SYMBOL termination int stuffnull; // 1:terminate SYMBOL '\0' at *nullspot uint8_t c1; -- 2.37.2