mirror of
https://github.com/simh/simh.git
synced 2026-01-25 19:56:25 +00:00
Merge branch 'DMC11' into SerialMux
Conflicts: scp.c sim_ether.c sim_ether.h sim_tmxr.c
This commit is contained in:
@@ -21,7 +21,7 @@ For Example, the directory structure should look like:
|
||||
|
||||
The contents of the windows-build directory can be downloaded from:
|
||||
|
||||
https://github.com/downloads/markpizz/simh/windows-build.zip
|
||||
https://github.com/downloads/simh/simh/windows-build.zip
|
||||
|
||||
|
||||
Network devices are capable of using pthreads to enhance their performance.
|
||||
|
||||
@@ -400,10 +400,6 @@
|
||||
Name="Header Files"
|
||||
Filter="h;hpp;hxx;hm;inl;inc"
|
||||
>
|
||||
<File
|
||||
RelativePath="..\dec_dz.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\PDP11\pdp11_cpumod.h"
|
||||
>
|
||||
|
||||
@@ -365,10 +365,6 @@
|
||||
Name="Header Files"
|
||||
Filter="h;hpp;hxx;hm;inl;inc"
|
||||
>
|
||||
<File
|
||||
RelativePath="..\PDP11\dec_dz.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\PDP11\pdp11_io_lib.h"
|
||||
>
|
||||
|
||||
@@ -205,6 +205,10 @@
|
||||
RelativePath="..\PDP11\pdp11_cr.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\PDP11\pdp11_dmc.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\PDP11\pdp11_dz.c"
|
||||
>
|
||||
@@ -392,7 +396,7 @@
|
||||
Filter="h;hpp;hxx;hm;inl;inc"
|
||||
>
|
||||
<File
|
||||
RelativePath="..\dec_dz.h"
|
||||
RelativePath="..\PDP11\pdp11_dmc.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
|
||||
@@ -64,10 +64,10 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="wsock32.lib winmm.lib"
|
||||
OutputFile="$(OutDir)\swtp6800.exe"
|
||||
OutputFile="$(OutDir)\swtp6800mp-a.exe"
|
||||
LinkIncremental="2"
|
||||
GenerateDebugInformation="true"
|
||||
ProgramDatabaseFile="$(OutDir)\swtp68000.pdb"
|
||||
ProgramDatabaseFile="$(OutDir)\swtp6800mp-a.pdb"
|
||||
SubSystem="1"
|
||||
RandomizedBaseAddress="1"
|
||||
DataExecutionPrevention="0"
|
||||
@@ -145,7 +145,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="wsock32.lib winmm.lib"
|
||||
OutputFile="$(OutDir)\swtp68000.exe"
|
||||
OutputFile="$(OutDir)\swtp6800mp-a.exe"
|
||||
LinkIncremental="1"
|
||||
GenerateDebugInformation="true"
|
||||
SubSystem="1"
|
||||
|
||||
@@ -64,10 +64,10 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="wsock32.lib winmm.lib"
|
||||
OutputFile="$(OutDir)\swtp6800.exe"
|
||||
OutputFile="$(OutDir)\swtp6800mp-a2.exe"
|
||||
LinkIncremental="2"
|
||||
GenerateDebugInformation="true"
|
||||
ProgramDatabaseFile="$(OutDir)\swtp68000.pdb"
|
||||
ProgramDatabaseFile="$(OutDir)\swtp6800mp-a2.pdb"
|
||||
SubSystem="1"
|
||||
RandomizedBaseAddress="1"
|
||||
DataExecutionPrevention="0"
|
||||
@@ -145,7 +145,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="wsock32.lib winmm.lib"
|
||||
OutputFile="$(OutDir)\swtp68000.exe"
|
||||
OutputFile="$(OutDir)\swtp6800mp-a2.exe"
|
||||
LinkIncremental="1"
|
||||
GenerateDebugInformation="true"
|
||||
SubSystem="1"
|
||||
|
||||
Reference in New Issue
Block a user