Merge pull request #28 from darkstar/msvc

MSVC fixes

src/sound/snd_dbopl.cpp

@@ -201,10 +201,10 @@ void opl2_update(int nr, int16_t *buffer, int samples)
             pclog("opl2_update: possible stack overflow detected. sample count was %d", samples);
             return;
         }
-	if (sizeof(Bit32s) * samples) > buffer_sz) {
+	if ((sizeof(Bit32s) * samples) > buffer_sz) {
 		if (buffer_32 != NULL)
 			free(buffer_32);
-		buffer_sz = sizeof(Bit32s) * samples);
+		buffer_sz = sizeof(Bit32s) * samples;
 		buffer_32 = (Bit32s *)malloc(buffer_sz);
 	}
 #else
@@ -231,10 +231,10 @@ void opl3_update(int nr, int16_t *buffer, int samples)
             pclog("opl2_update: possible stack overflow detected. sample count was %d", samples);
             return;
         }
-	if (sizeof(Bit32s) * samples * 2) > buffer_sz) {
+	if ((sizeof(Bit32s) * samples * 2) > buffer_sz) {
 		if (buffer_32 != NULL)
 			free(buffer_32);
-		buffer_sz = sizeof(Bit32s) * samples * 2);
+		buffer_sz = sizeof(Bit32s) * samples * 2;
 		buffer_32 = (Bit32s *)malloc(buffer_sz);
 	}
 #else

src/win/msvc/vc15/VARCem.vcxproj

@@ -48,9 +48,10 @@
     <ClCompile Include="..\..\..\disk\hdc.c" />
     <ClCompile Include="..\..\..\disk\hdc_esdi_at.c" />
     <ClCompile Include="..\..\..\disk\hdc_esdi_mca.c" />
-    <ClCompile Include="..\..\..\disk\hdc_ide.c" />
+    <ClCompile Include="..\..\..\disk\hdc_ide_ata.c" />
-    <ClCompile Include="..\..\..\disk\hdc_mfm_at.c" />
+    <ClCompile Include="..\..\..\disk\hdc_ide_xta.c" />
-    <ClCompile Include="..\..\..\disk\hdc_mfm_xt.c" />
+    <ClCompile Include="..\..\..\disk\hdc_st506_at.c" />
+    <ClCompile Include="..\..\..\disk\hdc_st506_xt.c" />
     <ClCompile Include="..\..\..\disk\hdc_xtide.c" />
     <ClCompile Include="..\..\..\disk\hdd.c" />
     <ClCompile Include="..\..\..\disk\hdd_image.c" />
@@ -84,6 +85,7 @@
     <ClCompile Include="..\..\..\keyboard.c" />
     <ClCompile Include="..\..\..\keyboard_at.c" />
     <ClCompile Include="..\..\..\keyboard_xt.c" />
+    <ClCompile Include="..\..\..\machine\m_ps1_hdc.c" />
     <ClCompile Include="..\..\..\parallel.c" />
     <ClCompile Include="..\..\..\parallel_dev.c" />
     <ClCompile Include="..\..\..\machine\machine.c" />
@@ -110,7 +112,6 @@
     <ClCompile Include="..\..\..\machine\m_at_t3100e_vid.c" />
     <ClCompile Include="..\..\..\machine\m_at_wd76c10.c" />
     <ClCompile Include="..\..\..\machine\m_europc.c" />
-    <ClCompile Include="..\..\..\machine\m_europc_hdc.c" />
     <ClCompile Include="..\..\..\machine\m_olivetti_m24.c" />
     <ClCompile Include="..\..\..\machine\m_pcjr.c" />
     <ClCompile Include="..\..\..\machine\m_ps1.c" />
@@ -730,4 +731,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

src/win/msvc/vc15/VARCem.vcxproj.filters

@@ -116,15 +116,6 @@
     <ClCompile Include="..\..\..\disk\hdc_esdi_mca.c">
       <Filter>disk</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\disk\hdc_ide.c">
-      <Filter>disk</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\disk\hdc_mfm_at.c">
-      <Filter>disk</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\disk\hdc_mfm_xt.c">
-      <Filter>disk</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\disk\hdc_xtide.c">
       <Filter>disk</Filter>
     </ClCompile>
@@ -248,9 +239,6 @@
     <ClCompile Include="..\..\..\machine\m_europc.c">
       <Filter>machine</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\machine\m_europc_hdc.c">
-      <Filter>machine</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\machine\m_olivetti_m24.c">
       <Filter>machine</Filter>
     </ClCompile>
@@ -665,9 +653,6 @@
     <ClCompile Include="..\..\..\video\vid_svga_render.c">
       <Filter>video</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\video\vid_table.c">
-      <Filter>video</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\video\vid_tgui9440.c">
       <Filter>video</Filter>
     </ClCompile>
@@ -804,6 +789,22 @@
     <ClCompile Include="..\..\..\floppy\lzf\lzf_d.c">
       <Filter>floppy\lzf</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\video\video_dev.c" />
+    <ClCompile Include="..\..\..\disk\hdc_ide_ata.c">
+      <Filter>disk</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\disk\hdc_ide_xta.c">
+      <Filter>disk</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\disk\hdc_st506_at.c">
+      <Filter>disk</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\disk\hdc_st506_xt.c">
+      <Filter>disk</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\machine\m_ps1_hdc.c">
+      <Filter>machine</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\bugger.h" />
@@ -1415,9 +1416,6 @@
     <ClInclude Include="..\..\..\video\vid_ati_eeprom.h">
       <Filter>video</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\video\vid_ati_mach64.h">
-      <Filter>video</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\video\vid_ati68860_ramdac.h">
       <Filter>video</Filter>
     </ClInclude>
@@ -1574,4 +1572,4 @@
       <Filter>win</Filter>
     </ResourceCompile>
   </ItemGroup>
-</Project>
+</Project>