Updated VS2015 project files, it should now build out of the box on VS2015 and later

This commit is contained in:
ggn 2020-01-03 08:09:01 +02:00 committed by Shamus Hammons
parent 4205233c83
commit 114298f750
6 changed files with 103 additions and 32 deletions

View File

@ -75,11 +75,11 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
<OutDir>$(SolutionDir)\..</OutDir>
<OutDir>$(SolutionDir)\..\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
<OutDir>$(SolutionDir)\..</OutDir>
<OutDir>$(SolutionDir)..\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
@ -95,11 +95,12 @@
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalOptions>notelemetry.obj %(AdditionalOptions)</AdditionalOptions>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@ -108,7 +109,7 @@
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
@ -123,7 +124,7 @@
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
@ -140,7 +141,7 @@
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>

View File

@ -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

View File

@ -74,11 +74,11 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
<OutDir>$(SolutionDir)\..</OutDir>
<OutDir>$(SolutionDir)\..\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
<OutDir>$(SolutionDir)\..</OutDir>
<OutDir>$(SolutionDir)..\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
@ -94,11 +94,12 @@
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalOptions>notelemetry.obj %(AdditionalOptions)</AdditionalOptions>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@ -107,7 +108,7 @@
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
@ -122,7 +123,7 @@
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
@ -139,7 +140,7 @@
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>

View File

@ -23,6 +23,9 @@
<ClCompile Include="..\..\amode.c" />
<ClCompile Include="..\..\debug.c" />
<ClCompile Include="..\..\direct.c" />
<ClCompile Include="..\..\dsp56k.c" />
<ClCompile Include="..\..\dsp56k_amode.c" />
<ClCompile Include="..\..\dsp56k_mach.c" />
<ClCompile Include="..\..\eagen.c" />
<ClCompile Include="..\..\error.c" />
<ClCompile Include="..\..\expr.c" />
@ -42,16 +45,22 @@
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\6502.h" />
<ClInclude Include="..\..\68ktab.h" />
<ClInclude Include="..\..\amode.h" />
<ClInclude Include="..\..\debug.h" />
<ClInclude Include="..\..\direct.h" />
<ClInclude Include="..\..\dsp56k.h" />
<ClInclude Include="..\..\dsp56k_amode.h" />
<ClInclude Include="..\..\dsp56k_mach.h" />
<ClInclude Include="..\..\error.h" />
<ClInclude Include="..\..\expr.h" />
<ClInclude Include="..\..\fltpoint.h" />
<ClInclude Include="..\..\kwtab.h" />
<ClInclude Include="..\..\listing.h" />
<ClInclude Include="..\..\mach.h" />
<ClInclude Include="..\..\macro.h" />
<ClInclude Include="..\..\mark.h" />
<ClInclude Include="..\..\mntab.h" />
<ClInclude Include="..\..\object.h" />
<ClInclude Include="..\..\op.h" />
<ClInclude Include="..\..\parmode.h" />
@ -63,6 +72,9 @@
<ClInclude Include="..\..\token.h" />
<ClInclude Include="..\..\version.h" />
</ItemGroup>
<PropertyGroup>
<DisableFastUpToDateCheck>true</DisableFastUpToDateCheck>
</PropertyGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{D8A382B9-8BD4-4953-B780-95010C41AFC8}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
@ -116,11 +128,15 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
<OutDir>$(SolutionDir)\..</OutDir>
<OutDir>$(SolutionDir)..\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
<OutDir>$(SolutionDir)..\</OutDir>
<CustomBuildBeforeTargets />
<CustomBuildAfterTargets />
<PreBuildEventUseInBuild>
</PreBuildEventUseInBuild>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
@ -136,12 +152,23 @@
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>
<WholeProgramOptimization>false</WholeProgramOptimization>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalOptions>notelemetry.obj %(AdditionalOptions)</AdditionalOptions>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
</Link>
<PreBuildEvent>
<Command>cd $(SolutionDir)..\
call maketabs.bat</Command>
</PreBuildEvent>
<PreBuildEvent>
<Message>Rebuilds the table files (note, 68kgen, dsp56kgen and kwgen must be built beforehand!)</Message>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
@ -149,15 +176,20 @@
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
<CustomBuildStep>
<Command>
</Command>
</CustomBuildStep>
<PreBuildEvent>
<Command>cd $(SolutionDir)..\
call maketabs.bat</Command>
maketabs.bat</Command>
<Message>Rebuilds the table files (note, 68kgen, dsp56kgen and kwgen must be built beforehand!)</Message>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@ -168,7 +200,9 @@ call maketabs.bat</Command>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<OmitFramePointers>true</OmitFramePointers>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
@ -176,6 +210,11 @@ call maketabs.bat</Command>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
</Link>
<PreBuildEvent>
<Command>cd $(SolutionDir)..\
maketabs.bat</Command>
<Message>Rebuilds the table files (note, 68kgen, dsp56kgen and kwgen must be built beforehand!)</Message>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
@ -185,7 +224,7 @@ call maketabs.bat</Command>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
@ -193,6 +232,11 @@ call maketabs.bat</Command>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
</Link>
<PreBuildEvent>
<Command>cd $(SolutionDir)..\
maketabs.bat</Command>
<Message>Rebuilds the table files (note, 68kgen, dsp56kgen and kwgen must be built beforehand!)</Message>
</PreBuildEvent>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">

View File

@ -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 >kwtab.h
kwgen mr <risctab >risckw.h
kwgen mp <6502.tbl >6502kw.h
68kgen 68k.tab <68k.mch >68ktab.h
dsp56kgen dsp56k.tab <dsp56k.mch >dsp56ktab.h
type direct.tab 68k.tab | kwgen mn >mntab.h
kwgen kw <kw.tab >kwtab.h
kwgen mr <risc.tab >risckw.h
kwgen dsp <dsp56k.tab >dsp56kkw.h
kwgen mp <6502.tab >6502kw.h
kwgen mp <6502.tab >6502kw.h
kwgen mo <op.tab >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

View File

@ -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;