Merge pull request #63 from darkstar/msvc

MSVC updates
This commit is contained in:
Fred N. van Kempen
2018-11-28 15:18:58 -05:00
committed by GitHub
3 changed files with 25 additions and 176 deletions

View File

@@ -189,7 +189,7 @@ ICON_FLOPPY_D ICON "icons/floppy_disabled.ico"
ICON_CDROM_D ICON "icons/cdrom_disabled.ico"
ICON_ZIP_D ICON "icons/zip_disabled.ico"
1 RT_MANIFEST "../VARCem.manifest"
1 RT_MANIFEST "VARCem.manifest"
VS_VERSION_INFO VERSIONINFO

View File

@@ -24,7 +24,6 @@
<ClCompile Include="..\..\..\devices\cdrom\cdrom.c" />
<ClCompile Include="..\..\..\devices\cdrom\cdrom_dosbox.cpp" />
<ClCompile Include="..\..\..\devices\cdrom\cdrom_image.cpp" />
<ClCompile Include="..\..\..\devices\cdrom\cdrom_null.c" />
<ClCompile Include="..\..\..\config.c" />
<ClCompile Include="..\..\..\cpu\386.c" />
<ClCompile Include="..\..\..\cpu\386_dynarec.c" />
@@ -58,33 +57,17 @@
<ClCompile Include="..\..\..\devices\disk\zip.c" />
<ClCompile Include="..\..\..\devices\misc\isamem.c" />
<ClCompile Include="..\..\..\devices\misc\isartc.c" />
<ClCompile Include="..\..\..\devices\network\network_dev.c" />
<ClCompile Include="..\..\..\devices\network\net_3c503.c" />
<ClCompile Include="..\..\..\devices\network\net_dp8390.c" />
<ClCompile Include="..\..\..\devices\network\net_wd80x3.c" />
<ClCompile Include="..\..\..\devices\network\slirp\bootp.c" />
<ClCompile Include="..\..\..\devices\network\slirp\cksum.c" />
<ClCompile Include="..\..\..\devices\network\slirp\debug.c" />
<ClCompile Include="..\..\..\devices\network\slirp\if.c" />
<ClCompile Include="..\..\..\devices\network\slirp\ip_icmp.c" />
<ClCompile Include="..\..\..\devices\network\slirp\ip_input.c" />
<ClCompile Include="..\..\..\devices\network\slirp\ip_output.c" />
<ClCompile Include="..\..\..\devices\network\slirp\mbuf.c" />
<ClCompile Include="..\..\..\devices\network\slirp\slirp_misc.c" />
<ClCompile Include="..\..\..\devices\network\slirp\queue.c" />
<ClCompile Include="..\..\..\devices\network\slirp\sbuf.c" />
<ClCompile Include="..\..\..\devices\network\slirp\slirp.c" />
<ClCompile Include="..\..\..\devices\network\slirp\socket.c" />
<ClCompile Include="..\..\..\devices\network\slirp\tcp_input.c" />
<ClCompile Include="..\..\..\devices\network\slirp\tcp_output.c" />
<ClCompile Include="..\..\..\devices\network\slirp\tcp_subr.c" />
<ClCompile Include="..\..\..\devices\network\slirp\tcp_timer.c" />
<ClCompile Include="..\..\..\devices\network\slirp\udp.c" />
<ClCompile Include="..\..\..\devices\printer\prt_cpmap.c" />
<ClCompile Include="..\..\..\devices\printer\prt_escp.c" />
<ClCompile Include="..\..\..\devices\printer\prt_text.c" />
<ClCompile Include="..\..\..\devices\scsi\scsi.c" />
<ClCompile Include="..\..\..\devices\scsi\scsi_aha154x.c" />
<ClCompile Include="..\..\..\devices\scsi\scsi_buslogic.c" />
<ClCompile Include="..\..\..\devices\scsi\scsi_cdrom.c" />
<ClCompile Include="..\..\..\devices\scsi\scsi_device.c" />
<ClCompile Include="..\..\..\devices\scsi\scsi_disk.c" />
<ClCompile Include="..\..\..\devices\scsi\scsi_ncr5380.c" />
@@ -206,6 +189,7 @@
<ClCompile Include="..\..\..\devices\video\video_dev.c" />
<ClCompile Include="..\..\..\devices\video\vid_bt48x_ramdac.c" />
<ClCompile Include="..\..\..\devices\video\vid_cga_compaq.c" />
<ClCompile Include="..\..\..\devices\video\vid_sigma.c" />
<ClCompile Include="..\..\..\io.c" />
<ClCompile Include="..\..\..\machines\machine.c" />
<ClCompile Include="..\..\..\machines\machine_table.c" />
@@ -219,8 +203,8 @@
<ClCompile Include="..\..\..\machines\m_at_neat.c" />
<ClCompile Include="..\..\..\machines\m_at_opti495.c" />
<ClCompile Include="..\..\..\machines\m_at_scat.c" />
<ClCompile Include="..\..\..\machines\m_at_sis_85c471.c" />
<ClCompile Include="..\..\..\machines\m_at_sis_85c496.c" />
<ClCompile Include="..\..\..\machines\m_at_sis471.c" />
<ClCompile Include="..\..\..\machines\m_at_sis496.c" />
<ClCompile Include="..\..\..\machines\m_at_t3100e.c" />
<ClCompile Include="..\..\..\machines\m_at_t3100e_vid.c" />
<ClCompile Include="..\..\..\machines\m_at_wd76c10.c" />
@@ -329,7 +313,6 @@
<ClInclude Include="..\..\..\devices\cdrom\cdrom.h" />
<ClInclude Include="..\..\..\devices\cdrom\cdrom_dosbox.h" />
<ClInclude Include="..\..\..\devices\cdrom\cdrom_image.h" />
<ClInclude Include="..\..\..\devices\cdrom\cdrom_null.h" />
<ClInclude Include="..\..\..\config.h" />
<ClInclude Include="..\..\..\cpu\386.h" />
<ClInclude Include="..\..\..\cpu\386_common.h" />
@@ -408,32 +391,12 @@
<ClInclude Include="..\..\..\devices\network\net_3com.h" />
<ClInclude Include="..\..\..\devices\network\net_dp8390.h" />
<ClInclude Include="..\..\..\devices\network\net_wd80x3.h" />
<ClInclude Include="..\..\..\devices\network\slirp\bootp.h" />
<ClInclude Include="..\..\..\devices\network\slirp\ctl.h" />
<ClInclude Include="..\..\..\devices\network\slirp\debug.h" />
<ClInclude Include="..\..\..\devices\network\slirp\icmp_var.h" />
<ClInclude Include="..\..\..\devices\network\slirp\if.h" />
<ClInclude Include="..\..\..\devices\network\slirp\ip.h" />
<ClInclude Include="..\..\..\devices\network\slirp\ip_icmp.h" />
<ClInclude Include="..\..\..\devices\network\slirp\libslirp.h" />
<ClInclude Include="..\..\..\devices\network\slirp\main.h" />
<ClInclude Include="..\..\..\devices\network\slirp\mbuf.h" />
<ClInclude Include="..\..\..\devices\network\slirp\misc.h" />
<ClInclude Include="..\..\..\devices\network\slirp\queue.h" />
<ClInclude Include="..\..\..\devices\network\slirp\sbuf.h" />
<ClInclude Include="..\..\..\devices\network\slirp\slirp.h" />
<ClInclude Include="..\..\..\devices\network\slirp\slirp_config.h" />
<ClInclude Include="..\..\..\devices\network\slirp\socket.h" />
<ClInclude Include="..\..\..\devices\network\slirp\tcp.h" />
<ClInclude Include="..\..\..\devices\network\slirp\tcpip.h" />
<ClInclude Include="..\..\..\devices\network\slirp\tcp_timer.h" />
<ClInclude Include="..\..\..\devices\network\slirp\tcp_var.h" />
<ClInclude Include="..\..\..\devices\network\slirp\udp.h" />
<ClInclude Include="..\..\..\devices\printer\printer.h" />
<ClInclude Include="..\..\..\devices\scsi\queue.h" />
<ClInclude Include="..\..\..\devices\scsi\scsi.h" />
<ClInclude Include="..\..\..\devices\scsi\scsi_aha154x.h" />
<ClInclude Include="..\..\..\devices\scsi\scsi_buslogic.h" />
<ClInclude Include="..\..\..\devices\scsi\scsi_cdrom.h" />
<ClInclude Include="..\..\..\devices\scsi\scsi_device.h" />
<ClInclude Include="..\..\..\devices\scsi\scsi_disk.h" />
<ClInclude Include="..\..\..\devices\scsi\scsi_ncr5380.h" />

View File

@@ -131,9 +131,6 @@
<ClCompile Include="..\..\..\devices\cdrom\cdrom_image.cpp">
<Filter>devices\cdrom</Filter>
</ClCompile>
<ClCompile Include="..\..\..\devices\cdrom\cdrom_null.c">
<Filter>devices\cdrom</Filter>
</ClCompile>
<ClCompile Include="..\..\..\devices\disk\hdc.c">
<Filter>devices\disk</Filter>
</ClCompile>
@@ -242,57 +239,6 @@
<ClCompile Include="..\..\..\devices\input\mouse_serial.c">
<Filter>devices\input</Filter>
</ClCompile>
<ClCompile Include="..\..\..\devices\network\slirp\bootp.c">
<Filter>devices\network\slirp</Filter>
</ClCompile>
<ClCompile Include="..\..\..\devices\network\slirp\cksum.c">
<Filter>devices\network\slirp</Filter>
</ClCompile>
<ClCompile Include="..\..\..\devices\network\slirp\debug.c">
<Filter>devices\network\slirp</Filter>
</ClCompile>
<ClCompile Include="..\..\..\devices\network\slirp\if.c">
<Filter>devices\network\slirp</Filter>
</ClCompile>
<ClCompile Include="..\..\..\devices\network\slirp\ip_icmp.c">
<Filter>devices\network\slirp</Filter>
</ClCompile>
<ClCompile Include="..\..\..\devices\network\slirp\ip_input.c">
<Filter>devices\network\slirp</Filter>
</ClCompile>
<ClCompile Include="..\..\..\devices\network\slirp\ip_output.c">
<Filter>devices\network\slirp</Filter>
</ClCompile>
<ClCompile Include="..\..\..\devices\network\slirp\mbuf.c">
<Filter>devices\network\slirp</Filter>
</ClCompile>
<ClCompile Include="..\..\..\devices\network\slirp\queue.c">
<Filter>devices\network\slirp</Filter>
</ClCompile>
<ClCompile Include="..\..\..\devices\network\slirp\sbuf.c">
<Filter>devices\network\slirp</Filter>
</ClCompile>
<ClCompile Include="..\..\..\devices\network\slirp\slirp.c">
<Filter>devices\network\slirp</Filter>
</ClCompile>
<ClCompile Include="..\..\..\devices\network\slirp\socket.c">
<Filter>devices\network\slirp</Filter>
</ClCompile>
<ClCompile Include="..\..\..\devices\network\slirp\tcp_input.c">
<Filter>devices\network\slirp</Filter>
</ClCompile>
<ClCompile Include="..\..\..\devices\network\slirp\tcp_output.c">
<Filter>devices\network\slirp</Filter>
</ClCompile>
<ClCompile Include="..\..\..\devices\network\slirp\tcp_subr.c">
<Filter>devices\network\slirp</Filter>
</ClCompile>
<ClCompile Include="..\..\..\devices\network\slirp\tcp_timer.c">
<Filter>devices\network\slirp</Filter>
</ClCompile>
<ClCompile Include="..\..\..\devices\network\slirp\udp.c">
<Filter>devices\network\slirp</Filter>
</ClCompile>
<ClCompile Include="..\..\..\devices\network\net_ne2000.c">
<Filter>devices\network</Filter>
</ClCompile>
@@ -755,12 +701,6 @@
<ClCompile Include="..\..\..\machines\m_at_scat.c">
<Filter>machines</Filter>
</ClCompile>
<ClCompile Include="..\..\..\machines\m_at_sis_85c471.c">
<Filter>machines</Filter>
</ClCompile>
<ClCompile Include="..\..\..\machines\m_at_sis_85c496.c">
<Filter>machines</Filter>
</ClCompile>
<ClCompile Include="..\..\..\machines\m_at_t3100e.c">
<Filter>machines</Filter>
</ClCompile>
@@ -828,9 +768,6 @@
<Filter>ui</Filter>
</ClCompile>
<ClCompile Include="..\..\..\misc.c" />
<ClCompile Include="..\..\..\devices\network\slirp\slirp_misc.c">
<Filter>devices\network\slirp</Filter>
</ClCompile>
<ClCompile Include="..\..\win_new_image.c">
<Filter>win</Filter>
</ClCompile>
@@ -889,6 +826,21 @@
<ClCompile Include="..\..\..\ui\ui_misc.c">
<Filter>ui</Filter>
</ClCompile>
<ClCompile Include="..\..\..\devices\network\network_dev.c">
<Filter>devices\network</Filter>
</ClCompile>
<ClCompile Include="..\..\..\devices\video\vid_sigma.c">
<Filter>devices\video</Filter>
</ClCompile>
<ClCompile Include="..\..\..\devices\scsi\scsi_cdrom.c">
<Filter>devices\scsi</Filter>
</ClCompile>
<ClCompile Include="..\..\..\machines\m_at_sis471.c">
<Filter>machines</Filter>
</ClCompile>
<ClCompile Include="..\..\..\machines\m_at_sis496.c">
<Filter>machines</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\config.h" />
@@ -1124,9 +1076,6 @@
<ClInclude Include="..\..\..\devices\cdrom\cdrom_image.h">
<Filter>devices\cdrom</Filter>
</ClInclude>
<ClInclude Include="..\..\..\devices\cdrom\cdrom_null.h">
<Filter>devices\cdrom</Filter>
</ClInclude>
<ClInclude Include="..\..\..\devices\disk\hdc.h">
<Filter>devices\disk</Filter>
</ClInclude>
@@ -1190,69 +1139,6 @@
<ClInclude Include="..\..\..\devices\input\mouse.h">
<Filter>devices\input</Filter>
</ClInclude>
<ClInclude Include="..\..\..\devices\network\slirp\bootp.h">
<Filter>devices\network\slirp</Filter>
</ClInclude>
<ClInclude Include="..\..\..\devices\network\slirp\ctl.h">
<Filter>devices\network\slirp</Filter>
</ClInclude>
<ClInclude Include="..\..\..\devices\network\slirp\debug.h">
<Filter>devices\network\slirp</Filter>
</ClInclude>
<ClInclude Include="..\..\..\devices\network\slirp\icmp_var.h">
<Filter>devices\network\slirp</Filter>
</ClInclude>
<ClInclude Include="..\..\..\devices\network\slirp\if.h">
<Filter>devices\network\slirp</Filter>
</ClInclude>
<ClInclude Include="..\..\..\devices\network\slirp\ip.h">
<Filter>devices\network\slirp</Filter>
</ClInclude>
<ClInclude Include="..\..\..\devices\network\slirp\ip_icmp.h">
<Filter>devices\network\slirp</Filter>
</ClInclude>
<ClInclude Include="..\..\..\devices\network\slirp\libslirp.h">
<Filter>devices\network\slirp</Filter>
</ClInclude>
<ClInclude Include="..\..\..\devices\network\slirp\main.h">
<Filter>devices\network\slirp</Filter>
</ClInclude>
<ClInclude Include="..\..\..\devices\network\slirp\mbuf.h">
<Filter>devices\network\slirp</Filter>
</ClInclude>
<ClInclude Include="..\..\..\devices\network\slirp\misc.h">
<Filter>devices\network\slirp</Filter>
</ClInclude>
<ClInclude Include="..\..\..\devices\network\slirp\queue.h">
<Filter>devices\network\slirp</Filter>
</ClInclude>
<ClInclude Include="..\..\..\devices\network\slirp\sbuf.h">
<Filter>devices\network\slirp</Filter>
</ClInclude>
<ClInclude Include="..\..\..\devices\network\slirp\slirp.h">
<Filter>devices\network\slirp</Filter>
</ClInclude>
<ClInclude Include="..\..\..\devices\network\slirp\slirp_config.h">
<Filter>devices\network\slirp</Filter>
</ClInclude>
<ClInclude Include="..\..\..\devices\network\slirp\socket.h">
<Filter>devices\network\slirp</Filter>
</ClInclude>
<ClInclude Include="..\..\..\devices\network\slirp\tcp.h">
<Filter>devices\network\slirp</Filter>
</ClInclude>
<ClInclude Include="..\..\..\devices\network\slirp\tcp_timer.h">
<Filter>devices\network\slirp</Filter>
</ClInclude>
<ClInclude Include="..\..\..\devices\network\slirp\tcp_var.h">
<Filter>devices\network\slirp</Filter>
</ClInclude>
<ClInclude Include="..\..\..\devices\network\slirp\tcpip.h">
<Filter>devices\network\slirp</Filter>
</ClInclude>
<ClInclude Include="..\..\..\devices\network\slirp\udp.h">
<Filter>devices\network\slirp</Filter>
</ClInclude>
<ClInclude Include="..\..\..\devices\network\bswap.h">
<Filter>devices\network</Filter>
</ClInclude>
@@ -1659,6 +1545,9 @@
<Filter>devices\video</Filter>
</ClInclude>
<ClInclude Include="..\..\..\png.h" />
<ClInclude Include="..\..\..\devices\scsi\scsi_cdrom.h">
<Filter>devices\scsi</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Filter Include="cpu">
@@ -1694,9 +1583,6 @@
<Filter Include="devices\network">
<UniqueIdentifier>{7cae45b9-af45-4f82-9c53-a4e3094ddee4}</UniqueIdentifier>
</Filter>
<Filter Include="devices\network\slirp">
<UniqueIdentifier>{c0afa9df-08d3-40a6-a4d4-88fb97816009}</UniqueIdentifier>
</Filter>
<Filter Include="devices\ports">
<UniqueIdentifier>{b9d0388f-b14d-4448-85fe-7179fff3f77f}</UniqueIdentifier>
</Filter>