github.com/open-simh.simh
1
0
Fork 0
mirror of https://github.com/open-simh/simh.git synced 2026-04-27 12:39:13 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'DMC11' into SerialMux

Browse Source 
Conflicts:
	scp.c
	sim_ether.c
	sim_ether.h
	sim_tmxr.c
This commit is contained in:
Mark Pizzolato
2012-10-16 15:50:38 -07:00
parent da820d73ac 35b8a40559
commit 24696892fd
158 changed files with 4488 additions and 1193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Visual Studio Projects/swtp6800mp-a2.vcproj
View File

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