Visual Studio 2015 project files. A few warnings about unused variables fixed.
authorggn <ggn.dbug@gmail.com>
Sun, 30 Aug 2015 18:12:34 +0000 (21:12 +0300)
committerShamus Hammons <jlhamm@acm.org>
Wed, 7 Oct 2015 02:10:42 +0000 (21:10 -0500)
Signed-off-by: Shamus Hammons <jlhamm@acm.org>
13 files changed:
Vs2015/68ktab/68ktab.vcxproj [new file with mode: 0644]
Vs2015/68ktab/68ktab.vcxproj.user [new file with mode: 0644]
Vs2015/VS2015.sln [new file with mode: 0644]
Vs2015/kwgen/kwgen.vcxproj [new file with mode: 0644]
Vs2015/kwgen/kwgen.vcxproj.user [new file with mode: 0644]
Vs2015/rmac/rmac.vcxproj [new file with mode: 0644]
Vs2015/rmac/rmac.vcxproj.user [new file with mode: 0644]
macro.c
object.c
rmac.h
sect.c
symbol.h
token.c

diff --git a/Vs2015/68ktab/68ktab.vcxproj b/Vs2015/68ktab/68ktab.vcxproj
new file mode 100644 (file)
index 0000000..9c25e05
--- /dev/null
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\68kgen.c" />
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{0D200546-CF83-49B6-9893-42DD6AEC94F0}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>My68ktab</RootNamespace>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <ProjectName>68kgen</ProjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+    <OutDir>$(SolutionDir)\..</OutDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>true</LinkIncremental>
+    <OutDir>$(SolutionDir)\..</OutDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(SolutionDir)\..</OutDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(SolutionDir)\..</OutDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/Vs2015/68ktab/68ktab.vcxproj.user b/Vs2015/68ktab/68ktab.vcxproj.user
new file mode 100644 (file)
index 0000000..abe8dd8
--- /dev/null
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup />
+</Project>
\ No newline at end of file
diff --git a/Vs2015/VS2015.sln b/Vs2015/VS2015.sln
new file mode 100644 (file)
index 0000000..e2625f5
--- /dev/null
@@ -0,0 +1,48 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
+VisualStudioVersion = 14.0.23107.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rmac", "rmac\rmac.vcxproj", "{D8A382B9-8BD4-4953-B780-95010C41AFC8}"
+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}"
+EndProject
+Global
+       GlobalSection(SolutionConfigurationPlatforms) = preSolution
+               Debug|x64 = Debug|x64
+               Debug|x86 = Debug|x86
+               Release|x64 = Release|x64
+               Release|x86 = Release|x86
+       EndGlobalSection
+       GlobalSection(ProjectConfigurationPlatforms) = postSolution
+               {D8A382B9-8BD4-4953-B780-95010C41AFC8}.Debug|x64.ActiveCfg = Debug|x64
+               {D8A382B9-8BD4-4953-B780-95010C41AFC8}.Debug|x64.Build.0 = Debug|x64
+               {D8A382B9-8BD4-4953-B780-95010C41AFC8}.Debug|x86.ActiveCfg = Debug|Win32
+               {D8A382B9-8BD4-4953-B780-95010C41AFC8}.Debug|x86.Build.0 = Debug|Win32
+               {D8A382B9-8BD4-4953-B780-95010C41AFC8}.Release|x64.ActiveCfg = Release|x64
+               {D8A382B9-8BD4-4953-B780-95010C41AFC8}.Release|x64.Build.0 = Release|x64
+               {D8A382B9-8BD4-4953-B780-95010C41AFC8}.Release|x86.ActiveCfg = Release|Win32
+               {D8A382B9-8BD4-4953-B780-95010C41AFC8}.Release|x86.Build.0 = Release|Win32
+               {AAEB066A-F264-4AEC-A606-EDE5DE47FDDF}.Debug|x64.ActiveCfg = Debug|x64
+               {AAEB066A-F264-4AEC-A606-EDE5DE47FDDF}.Debug|x64.Build.0 = Debug|x64
+               {AAEB066A-F264-4AEC-A606-EDE5DE47FDDF}.Debug|x86.ActiveCfg = Debug|Win32
+               {AAEB066A-F264-4AEC-A606-EDE5DE47FDDF}.Debug|x86.Build.0 = Debug|Win32
+               {AAEB066A-F264-4AEC-A606-EDE5DE47FDDF}.Release|x64.ActiveCfg = Release|x64
+               {AAEB066A-F264-4AEC-A606-EDE5DE47FDDF}.Release|x64.Build.0 = Release|x64
+               {AAEB066A-F264-4AEC-A606-EDE5DE47FDDF}.Release|x86.ActiveCfg = Release|Win32
+               {AAEB066A-F264-4AEC-A606-EDE5DE47FDDF}.Release|x86.Build.0 = Release|Win32
+               {0D200546-CF83-49B6-9893-42DD6AEC94F0}.Debug|x64.ActiveCfg = Debug|x64
+               {0D200546-CF83-49B6-9893-42DD6AEC94F0}.Debug|x64.Build.0 = Debug|x64
+               {0D200546-CF83-49B6-9893-42DD6AEC94F0}.Debug|x86.ActiveCfg = Debug|Win32
+               {0D200546-CF83-49B6-9893-42DD6AEC94F0}.Debug|x86.Build.0 = Debug|Win32
+               {0D200546-CF83-49B6-9893-42DD6AEC94F0}.Release|x64.ActiveCfg = Release|x64
+               {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
+       EndGlobalSection
+       GlobalSection(SolutionProperties) = preSolution
+               HideSolutionNode = FALSE
+       EndGlobalSection
+EndGlobal
diff --git a/Vs2015/kwgen/kwgen.vcxproj b/Vs2015/kwgen/kwgen.vcxproj
new file mode 100644 (file)
index 0000000..7c07b0f
--- /dev/null
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\kwgen.c" />
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{AAEB066A-F264-4AEC-A606-EDE5DE47FDDF}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>kwgen</RootNamespace>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+    <OutDir>$(SolutionDir)\..</OutDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>true</LinkIncremental>
+    <OutDir>$(SolutionDir)\..</OutDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(SolutionDir)\..</OutDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(SolutionDir)\..</OutDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/Vs2015/kwgen/kwgen.vcxproj.user b/Vs2015/kwgen/kwgen.vcxproj.user
new file mode 100644 (file)
index 0000000..46c3ca8
--- /dev/null
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LocalDebuggerCommandArguments>"kw &lt;kwtab &gt;kwtab.h"</LocalDebuggerCommandArguments>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/Vs2015/rmac/rmac.vcxproj b/Vs2015/rmac/rmac.vcxproj
new file mode 100644 (file)
index 0000000..a127bd8
--- /dev/null
@@ -0,0 +1,190 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\amode.c" />
+    <ClCompile Include="..\..\debug.c" />
+    <ClCompile Include="..\..\direct.c" />
+    <ClCompile Include="..\..\eagen.c" />
+    <ClCompile Include="..\..\error.c" />
+    <ClCompile Include="..\..\expr.c" />
+    <ClCompile Include="..\..\listing.c" />
+    <ClCompile Include="..\..\mach.c" />
+    <ClCompile Include="..\..\macro.c" />
+    <ClCompile Include="..\..\mark.c" />
+    <ClCompile Include="..\..\object.c" />
+    <ClCompile Include="..\..\procln.c" />
+    <ClCompile Include="..\..\riscasm.c" />
+    <ClCompile Include="..\..\rmac.c" />
+    <ClCompile Include="..\..\sect.c" />
+    <ClCompile Include="..\..\symbol.c" />
+    <ClCompile Include="..\..\token.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\amode.h" />
+    <ClInclude Include="..\..\debug.h" />
+    <ClInclude Include="..\..\direct.h" />
+    <ClInclude Include="..\..\error.h" />
+    <ClInclude Include="..\..\expr.h" />
+    <ClInclude Include="..\..\listing.h" />
+    <ClInclude Include="..\..\mach.h" />
+    <ClInclude Include="..\..\macro.h" />
+    <ClInclude Include="..\..\mark.h" />
+    <ClInclude Include="..\..\object.h" />
+    <ClInclude Include="..\..\parmode.h" />
+    <ClInclude Include="..\..\procln.h" />
+    <ClInclude Include="..\..\riscasm.h" />
+    <ClInclude Include="..\..\rmac.h" />
+    <ClInclude Include="..\..\sect.h" />
+    <ClInclude Include="..\..\symbol.h" />
+    <ClInclude Include="..\..\token.h" />
+    <ClInclude Include="..\..\version.h" />
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{D8A382B9-8BD4-4953-B780-95010C41AFC8}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>rmac</RootNamespace>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+    <OutDir>$(SolutionDir)\..</OutDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>true</LinkIncremental>
+    <OutDir>$(SolutionDir)\..</OutDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(SolutionDir)\..</OutDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(SolutionDir)\..</OutDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/Vs2015/rmac/rmac.vcxproj.user b/Vs2015/rmac/rmac.vcxproj.user
new file mode 100644 (file)
index 0000000..abe8dd8
--- /dev/null
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup />
+</Project>
\ No newline at end of file
diff --git a/macro.c b/macro.c
index 5aaa842a52d78d75c4808d676b384a54d5e1d914..4232f1af60e53d323e20ebb242e0c23c02529f59 100644 (file)
--- a/macro.c
+++ b/macro.c
@@ -53,7 +53,12 @@ void InitMacro(void)
 //
 int ExitMacro(void)
 {
-#warning !!! Bad macro exiting !!!
+#ifndef _MSC_VER
+#pragma message !!! Bad macro exiting !!!
+#else
+#pragma WARNING(!!! Bad macro exiting !!!)
+#endif
+
 /*
 This is a problem. Currently, the argument logic just keeps the current
 arguments and doesn't save anything if a new macro is called in the middle
@@ -110,8 +115,8 @@ int defmac2(char * argname)
 //
 int defmac1(char * ln, int notEndFlag)
 {
-       PTR p;
-       LONG len;
+//     PTR p;
+//     LONG len;
 
        if (list_flag)
        {
@@ -248,7 +253,11 @@ int defr1(char * ln, int kwno)
                rptlevel++;
        default:
 //MORE stupidity here...
-#warning "!!! Casting (char *) as LONG !!!"
+#ifndef _MSC_VER
+#pragma warning "!!! Casting (char *) as LONG !!!"
+#else
+#pragma WARNING(!!! Casting (char *) as LONG !!!)
+#endif
        addln:
                // Allocate length of line + 1('\0') + LONG
                len = strlen(ln) + 1 + sizeof(LONG);
@@ -448,7 +457,7 @@ int InvokeMacro(SYM * mac, WORD siz)
        TOKEN * dest;
        int stringNum = 0;
        int argumentNum = 0;
-       int i;
+//     int i;
 
        for(dry_run=1; ; dry_run--)
        {
index 2702c54ad4dd4cdf586f63351d5fc6bb7d60474b..3412740f7654dba19769c76731fbe49ab4ac4b35 100644 (file)
--- a/object.c
+++ b/object.c
@@ -187,7 +187,7 @@ char * constr_symtab(register char * buf, SYM * sym, int globflag)
 //
 int WriteObject(int fd)
 {
-       LONG t;                                 // Scratch long
+//     LONG t;                                 // Scratch long
        LONG tds;                               // TEXT & DATA segment size
        int i;                                  // Temporary int
        CHUNK * cp;                             // Chunk (for gather)
diff --git a/rmac.h b/rmac.h
index faa176ca8a69dfa967d856f1c5f17422d4211f4a..5ef9953c1559fe83ce93f14bc0f7cb0bfad39f90 100644 (file)
--- a/rmac.h
+++ b/rmac.h
@@ -12,7 +12,7 @@
 //
 // TARGET SPECIFIC BUILD SETTINGS
 //
-#ifdef WIN32
+#if defined(WIN32) || defined (WIN64)
        // Release platform - windows
        #define PLATFORM        "Win32"
        #define _OPEN_FLAGS     _O_TRUNC|_O_CREAT|_O_BINARY|_O_RDWR
                #if _MSC_VER > 1000
                        #pragma warning(disable:4996)
                #endif
+
+       //Makes warnings double clickable on visual studio
+       #define STRINGIZE_HELPER(x) #x
+       #define STRINGIZE(x) STRINGIZE_HELPER(x)
+       #define WARNING(desc) message(__FILE__ "(" STRINGIZE(__LINE__) ") : Warning: " #desc)
+
+       // usage:
+       //#pragma WARNING(FIXME: Code removed because...)
+
        #endif
        #include <io.h>
        #include <fcntl.h>
@@ -31,6 +40,7 @@
        #include <ctype.h>
        #include <sys/types.h>
        #include <sys/stat.h>
+
 #else 
        #ifdef __GCCUNIX__
        // Release platform - mac OS-X or linux
diff --git a/sect.c b/sect.c
index 7331cb3d765c4e867ce727cb39bce3b9e0c711d1..64ccb441b759cb6f212fc96faf5210bbc4ee045e 100644 (file)
--- a/sect.c
+++ b/sect.c
@@ -274,7 +274,11 @@ int AddFixup(WORD attr, LONG loc, TOKEN * fexpr)
        SECT * p;
        // Shamus: Expression lengths are voodoo ATM (variable "i"). Need to fix
        //         this.
-#warning "!!! AddFixup() is filled with VOODOO !!!"
+#ifndef _MSC_VER
+#pragma warning "!!! AddFixup() is filled with VOODOO !!!"
+#else
+#pragma WARNING(!!! AddFixup() is filled with VOODOO !!!)
+#endif
        DEBUG printf("FIXUP@$%X: $%X\n", loc, attr);
 
        // Compute length of expression (could be faster); determine if it's the
@@ -380,27 +384,6 @@ int AddFixup(WORD attr, LONG loc, TOKEN * fexpr)
 }
 
 
-//
-// Resolve all fixups
-//
-int ResolveAllFixups(void)
-{
-       unsigned i;
-       char buf[EBUFSIZ];
-
-       // Make undefined symbols GLOBL
-       if (glob_flag)
-               ForceUndefinedSymbolsGlobal();
-
-       DEBUG printf("Resolving TEXT sections...\n");
-       ResolveFixups(TEXT);
-       DEBUG printf("Resolving DATA sections...\n");
-       ResolveFixups(DATA);
-
-       return 0;
-}
-
-
 //
 // Resolve fixups in a section
 //
@@ -422,8 +405,8 @@ int ResolveFixups(int sno)
        WORD flags;
        unsigned page_jump = 0;
        unsigned address = 0;
-       unsigned j;
-       char buf[EBUFSIZ];
+       //unsigned j;
+       //char buf[EBUFSIZ];
        
        SECT * sc = &sect[sno];
        CHUNK * ch = sc->sffix;
@@ -915,3 +898,24 @@ range:
        return 0;
 }
 
+//
+// Resolve all fixups
+//
+int ResolveAllFixups(void)
+{
+       //unsigned i;
+       //char buf[EBUFSIZ];
+
+       // Make undefined symbols GLOBL
+       if (glob_flag)
+               ForceUndefinedSymbolsGlobal();
+
+       DEBUG printf("Resolving TEXT sections...\n");
+       ResolveFixups(TEXT);
+       DEBUG printf("Resolving DATA sections...\n");
+       ResolveFixups(DATA);
+
+       return 0;
+}
+
+
index 485ed8864bc9f7e97b7079f5e99c643b1552a0c6..bd32a5efc114fc8efd2dfa6f2dfea290831f4411 100644 (file)
--- a/symbol.h
+++ b/symbol.h
@@ -39,6 +39,7 @@ SYM
 // Globals, externals, etc.
 extern int curenv;
 extern char subttl[];
+extern int eject(void);
 
 // Exported functions
 SYM * lookup(char *, int, int);
diff --git a/token.c b/token.c
index ca38406e5707dd07c44abed620dad9b5f5bcdeb9..1cd9ebadc5df82706d94a683cdc5e02570fc5d24 100644 (file)
--- a/token.c
+++ b/token.c
@@ -617,7 +617,7 @@ overflow:
 //
 char * GetNextMacroLine(void)
 {
-       unsigned source_addr;
+//     unsigned source_addr;
 
        IMACRO * imacro = cur_inobj->inobj.imacro;
 //     LONG * strp = imacro->im_nextln;
@@ -1547,7 +1547,11 @@ int d_goto(WORD unused)
                        // Compare names (sleazo string compare)
                        // This string compare is not right. Doesn't check for lengths.
                        // (actually it does, but in a crappy, unclear way.)
-#warning "!!! Bad string comparison !!!"
+#ifndef _MSC_VER
+                       #warning "!!! Bad string comparison !!!"
+#else
+                       #pragma WARNING(!!!! Bad string comparison !!!)
+#endif
                        s1 = sym;
 //                     s2 = (char *)(defln + 1) + 1;
                        s2 = defln->line;