Fix up MSVC specific compile problems

git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@82 a31d4220-a93d-0410-bf67-fe4944624d44

VBA.vcproj

@@ -50,6 +50,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				AdditionalOptions="/MP"
 				Optimization="0"
 				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\dependencies\zlib&quot;;&quot;$(SolutionDir)..\dependencies\libpng&quot;;&quot;$(SolutionDir)..\dependencies\cximage&quot;;$(SolutionDir)..\dependencies\File_Extractor-0.4.2\fex"
 				PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;DEV_VERSION;BKPT_SUPPORT;MMX;_CRT_SECURE_NO_WARNINGS;HAS_FILE_EXTRACTOR"
@@ -158,7 +159,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D_ST_MODEL&#x0D;&#x0A;/D_SECURE_SCL=0&#x0D;&#x0A;/Zc:forScope-"
+				AdditionalOptions="/D_ST_MODEL&#x0D;&#x0A;/D_SECURE_SCL=0&#x0D;&#x0A;/Zc:forScope-&#x0D;&#x0A;/MP"
 				Optimization="2"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="1"
@@ -493,7 +494,7 @@
 							<Tool
 								Name="VCCustomBuildTool"
 								Description="Assembling $(InputFileName)..."
-								CommandLine="nasmw.exe -D__DJGPP__ -O1 -f win32 -o &quot;$(ProjectDir)$(IntDir)\$(InputName).obj&quot; &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+								CommandLine="nasmw.exe -D__DJGPP__ -Isrc/ -O1 -f win32 -o &quot;$(ProjectDir)$(IntDir)\$(InputName).obj&quot; &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 								Outputs="&quot;$(ProjectDir)$(IntDir)\$(InputName).obj&quot;"
 							/>
 						</FileConfiguration>
@@ -527,7 +528,7 @@
 							<Tool
 								Name="VCCustomBuildTool"
 								Description="Assembling $(InputFileName)..."
-								CommandLine="nasmw.exe -D__DJGPP__ -O1 -f win32 -o &quot;$(ProjectDir)$(IntDir)\$(InputName).obj&quot; &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+								CommandLine="nasmw.exe -D__DJGPP__ -O1 -Isrc/ -f win32 -o &quot;$(ProjectDir)$(IntDir)\$(InputName).obj&quot; &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 								Outputs="&quot;$(ProjectDir)$(IntDir)\$(InputName).obj&quot;"
 							/>
 						</FileConfiguration>
@@ -561,7 +562,7 @@
 							<Tool
 								Name="VCCustomBuildTool"
 								Description="Assembling $(InputFileName)..."
-								CommandLine="nasmw.exe -D__DJGPP__ -O1 -f win32 -o &quot;$(ProjectDir)$(IntDir)\$(InputName).obj&quot; &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+								CommandLine="nasmw.exe -D__DJGPP__ -O1 -Isrc/ -f win32 -o &quot;$(ProjectDir)$(IntDir)\$(InputName).obj&quot; &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 								Outputs="&quot;$(ProjectDir)$(IntDir)\$(InputName).obj&quot;"
 							/>
 						</FileConfiguration>
@@ -595,7 +596,7 @@
 							<Tool
 								Name="VCCustomBuildTool"
 								Description="Assembling $(InputFileName)..."
-								CommandLine="nasmw.exe -D__DJGPP__ -O1 -f win32 -o &quot;$(ProjectDir)$(IntDir)\$(InputName).obj&quot; &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+								CommandLine="nasmw.exe -D__DJGPP__ -O1 -Isrc/ -f win32 -o &quot;$(ProjectDir)$(IntDir)\$(InputName).obj&quot; &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 								Outputs="&quot;$(ProjectDir)$(IntDir)\$(InputName).obj&quot;"
 							/>
 						</FileConfiguration>

src/System.h

@@ -20,7 +20,9 @@
 #ifndef VBA_SYSTEM_H
 #define VBA_SYSTEM_H
 
+#ifndef _MSC_VER
 #include <stdint.h>
+#endif 
 
 #include "unzip.h"
 
@@ -28,6 +30,7 @@
 #define NULL 0
 #endif
 
+#ifndef _MSC_VER
 typedef uint8_t u8;
 typedef uint16_t u16;
 typedef uint32_t u32;
@@ -38,6 +41,14 @@ typedef int16_t s16;
 typedef int32_t s32;
 typedef int64_t s64;
 
+#else
+typedef unsigned __int64 u64;
+typedef signed char s8;
+typedef signed short s16;
+typedef signed int s32;
+typedef signed __int64 s64;
+#endif
+
 typedef unsigned char u8;
 typedef unsigned short u16;
 typedef unsigned int u32;

src/hq3x32.cpp

@@ -17,7 +17,13 @@
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #include "Util.h"
 #define __STDC_CONSTANT_MACROS
+
+#ifndef _MSC_VER
 #include <stdint.h>
+#else
+typedef unsigned int uint32_t;
+#endif
+
 
 extern "C"
 {

src/hq_shared32.cpp

@@ -3,7 +3,7 @@
 // Copyright (C) 2005 Forgotten and the VBA development team
 
 // This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
+// it under the terms of the GNU General Public License as published by	
 // the Free Software Foundation; either version 2, or(at your option)
 // any later version.
 //
@@ -18,7 +18,13 @@
 
 #include "hq_shared32.h"
 #define __STDC_CONSTANT_MACROS
+
+#ifndef _MSC_VER
 #include <stdint.h>
+#else
+typedef unsigned __int64 uint64_t;
+#define UINT64_C(x) x;
+#endif 
 
 const uint64_t reg_blank = UINT64_C(0x0000000000000000);
 const uint64_t const7    = UINT64_C(0x0000000700070007);

src/interp.h

@@ -32,7 +32,13 @@
 #define __INTERP_H
 
 #define __STDC_CONSTANT_MACROS
+
+#ifndef _MSC_VER
 #include <stdint.h>
+#else
+typedef unsigned short uint16_t;
+typedef unsigned int uint32_t;
+#endif
 
 typedef uint16_t interp_uint16;
 typedef uint32_t interp_uint32;