ShuriZma
/
visualboyadvance-m
mirror of https://github.com/visualboyadvance-m/visualboyadvance-m.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix up MSVC specific compile problems

This commit is contained in:
DJRobX 2007-11-15 08:57:30 +00:00
parent 552aadb95c
commit d8ae34632f
5 changed files with 36 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
VBA.vcproj
View File

@ -50,6 +50,7 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalOptions="/MP"
Optimization="0" 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" 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" PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;DEV_VERSION;BKPT_SUPPORT;MMX;_CRT_SECURE_NO_WARNINGS;HAS_FILE_EXTRACTOR"
@ -158,7 +159,7 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" 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" Optimization="2"
InlineFunctionExpansion="2" InlineFunctionExpansion="2"
FavorSizeOrSpeed="1" FavorSizeOrSpeed="1"
@ -493,7 +494,7 @@
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
Description="Assembling $(InputFileName)..." 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;" Outputs="&quot;$(ProjectDir)$(IntDir)\$(InputName).obj&quot;"
/> />
</FileConfiguration> </FileConfiguration>
@ -527,7 +528,7 @@
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
Description="Assembling $(InputFileName)..." 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;" Outputs="&quot;$(ProjectDir)$(IntDir)\$(InputName).obj&quot;"
/> />
</FileConfiguration> </FileConfiguration>
@ -561,7 +562,7 @@
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
Description="Assembling $(InputFileName)..." 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;" Outputs="&quot;$(ProjectDir)$(IntDir)\$(InputName).obj&quot;"
/> />
</FileConfiguration> </FileConfiguration>
@ -595,7 +596,7 @@
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
Description="Assembling $(InputFileName)..." 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;" Outputs="&quot;$(ProjectDir)$(IntDir)\$(InputName).obj&quot;"
/> />
</FileConfiguration> </FileConfiguration>

11
src/System.h
View File

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

6
src/hq3x32.cpp
View File

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

6
src/hq_shared32.cpp
View File

@ -18,7 +18,13 @@
#include "hq_shared32.h" #include "hq_shared32.h"
#define __STDC_CONSTANT_MACROS #define __STDC_CONSTANT_MACROS
#ifndef _MSC_VER
#include <stdint.h> #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 reg_blank = UINT64_C(0x0000000000000000);
const uint64_t const7 = UINT64_C(0x0000000700070007); const uint64_t const7 = UINT64_C(0x0000000700070007);

6
src/interp.h
View File

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