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

fixed some x64 compiler errors/warnings 

we still need a GLEW x64 lib

git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@219 a31d4220-a93d-0410-bf67-fe4944624d44
This commit is contained in:
spacy51 2007-12-23 13:19:52 +00:00
parent e6c96c5684
commit a52671188a
7 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
VBA.sln
View File

@ -61,10 +61,12 @@ Global
{DB5C12E9-BCD3-4517-8708-475C0D1D88CE}.Release|x64.Build.0 = Release|x64 {DB5C12E9-BCD3-4517-8708-475C0D1D88CE}.Release|x64.Build.0 = Release|x64
{7AEC599C-7C82-4F00-AA60-411E0A359CB0}.Debug|Win32.ActiveCfg = Debug|Win32 {7AEC599C-7C82-4F00-AA60-411E0A359CB0}.Debug|Win32.ActiveCfg = Debug|Win32
{7AEC599C-7C82-4F00-AA60-411E0A359CB0}.Debug|Win32.Build.0 = Debug|Win32 {7AEC599C-7C82-4F00-AA60-411E0A359CB0}.Debug|Win32.Build.0 = Debug|Win32
{7AEC599C-7C82-4F00-AA60-411E0A359CB0}.Debug|x64.ActiveCfg = Debug|Win32 {7AEC599C-7C82-4F00-AA60-411E0A359CB0}.Debug|x64.ActiveCfg = Debug|x64
{7AEC599C-7C82-4F00-AA60-411E0A359CB0}.Debug|x64.Build.0 = Debug|x64
{7AEC599C-7C82-4F00-AA60-411E0A359CB0}.Release|Win32.ActiveCfg = Release|Win32 {7AEC599C-7C82-4F00-AA60-411E0A359CB0}.Release|Win32.ActiveCfg = Release|Win32
{7AEC599C-7C82-4F00-AA60-411E0A359CB0}.Release|Win32.Build.0 = Release|Win32 {7AEC599C-7C82-4F00-AA60-411E0A359CB0}.Release|Win32.Build.0 = Release|Win32
{7AEC599C-7C82-4F00-AA60-411E0A359CB0}.Release|x64.ActiveCfg = Release|Win32 {7AEC599C-7C82-4F00-AA60-411E0A359CB0}.Release|x64.ActiveCfg = Release|x64
{7AEC599C-7C82-4F00-AA60-411E0A359CB0}.Release|x64.Build.0 = Release|x64
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE

4
VBA.vcproj
View File

@ -165,7 +165,7 @@
AdditionalOptions="/MP" AdditionalOptions="/MP"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="..\dependencies\zlib;..\dependencies\libpng;"..\dependencies\File_Extractor-0.4.2\fex";..\dependencies\cximage;..\dependencies\msvc" AdditionalIncludeDirectories="..\dependencies\zlib;..\dependencies\libpng;"..\dependencies\File_Extractor-0.4.2\fex";..\dependencies\cximage;..\dependencies\msvc"
PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;DEV_VERSION;BKPT_SUPPORT;CRT_SECURE_NO_WARNINGS;HAS_FILE_EXTRACTOR;C_CORE" PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;DEV_VERSION;BKPT_SUPPORT;_CRT_SECURE_NO_WARNINGS;HAS_FILE_EXTRACTOR;C_CORE"
StringPooling="false" StringPooling="false"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
@ -402,7 +402,7 @@
FavorSizeOrSpeed="1" FavorSizeOrSpeed="1"
WholeProgramOptimization="true" WholeProgramOptimization="true"
AdditionalIncludeDirectories="..\dependencies\zlib;..\dependencies\libpng;"..\dependencies\File_Extractor-0.4.2\fex";..\dependencies\cximage;..\dependencies\msvc" AdditionalIncludeDirectories="..\dependencies\zlib;..\dependencies\libpng;"..\dependencies\File_Extractor-0.4.2\fex";..\dependencies\cximage;..\dependencies\msvc"
PreprocessorDefinitions="WIN32;WINVER=0x0500;NDEBUG;_WINDOWS;OEMRESOURCE;MMX;ASM;FINAL_VERSION;BKPT_SUPPORT;_CRT_SECURE_NO_DEPRECATE;HAS_FILE_EXTRACTOR" PreprocessorDefinitions="WIN32;WINVER=0x0500;NDEBUG;_WINDOWS;OEMRESOURCE;C_CORE;FINAL_VERSION;BKPT_SUPPORT;_CRT_SECURE_NO_WARNINGS;HAS_FILE_EXTRACTOR"
RuntimeLibrary="0" RuntimeLibrary="0"
BufferSecurityCheck="false" BufferSecurityCheck="false"
EnableEnhancedInstructionSet="0" EnableEnhancedInstructionSet="0"

2
src/win32/Joypad.cpp
View File

@ -33,7 +33,7 @@ static char THIS_FILE[] = __FILE__;
BOOL bAppendMode; BOOL bAppendMode;
void AssignKey(KeyList &Key, int Out) void AssignKey(KeyList &Key, LONG_PTR Out)
{ {
if( !bAppendMode ) { if( !bAppendMode ) {
Key.RemoveAll(); Key.RemoveAll();

2
src/win32/Joypad.h
View File

@ -166,7 +166,7 @@ class MotionConfig : public CDialog
//}}AFX_MSG //}}AFX_MSG
DECLARE_MESSAGE_MAP() DECLARE_MESSAGE_MAP()
private: private:
UINT timerId; UINT_PTR timerId;
public: public:
afx_msg void OnBnClickedAppendmode(); afx_msg void OnBnClickedAppendmode();
}; };

6
src/win32/OpenGL.cpp
View File

@ -140,7 +140,7 @@ char *readShaderFile(char *FileName) {
FILE *fp; FILE *fp;
char *DATA = NULL; char *DATA = NULL;
int flength = 0; size_t flength = 0;
fp = fopen(FileName,"rt"); fp = fopen(FileName,"rt");
@ -413,7 +413,7 @@ void OpenGLDisplay::render()
} }
glFontBegin(&font); glFontBegin(&font);
glPushMatrix(); glPushMatrix();
float fontscale = (float)theApp.surfaceSizeX / 100.0; float fontscale = (float)theApp.surfaceSizeX / 100.0f;
glScalef(fontscale, fontscale, fontscale); glScalef(fontscale, fontscale, fontscale);
glColor4f(1.0f, 0.25f, 0.25f, 1.0f); glColor4f(1.0f, 0.25f, 0.25f, 1.0f);
glFontTextOut(buffer, (theApp.surfaceSizeX-(strlen(buffer)*11))/(fontscale*2), (theApp.surfaceSizeY-20)/fontscale, 0); glFontTextOut(buffer, (theApp.surfaceSizeX-(strlen(buffer)*11))/(fontscale*2), (theApp.surfaceSizeY-20)/fontscale, 0);
@ -427,7 +427,7 @@ void OpenGLDisplay::render()
glFontBegin(&font); glFontBegin(&font);
glPushMatrix(); glPushMatrix();
float fontscale = (float)theApp.surfaceSizeX / 100.0; float fontscale = (float)theApp.surfaceSizeX / 100.0f;
glScalef(fontscale, fontscale, fontscale); glScalef(fontscale, fontscale, fontscale);
glColor4f(1.0f, 0.25f, 0.25f, 1.0f); glColor4f(1.0f, 0.25f, 0.25f, 1.0f);
glFontTextOut((char *)((const char *)theApp.screenMessageBuffer), (theApp.surfaceSizeX-(theApp.screenMessageBuffer.GetLength()*11))/(fontscale*2), (theApp.surfaceSizeY-40)/fontscale, 0); glFontTextOut((char *)((const char *)theApp.screenMessageBuffer), (theApp.surfaceSizeX-(theApp.screenMessageBuffer.GetLength()*11))/(fontscale*2), (theApp.surfaceSizeY-40)/fontscale, 0);

4
src/win32/SelectPlugin.cpp
View File

@ -74,7 +74,7 @@ BOOL SelectPlugin::OnInitDialog()
m_comboPlugin.ResetContent(); m_comboPlugin.ResetContent();
int nPluginCnt = EnumPlugins(); size_t nPluginCnt = EnumPlugins();
if (nPluginCnt > 0) if (nPluginCnt > 0)
{ {
for (int i = 0; i < rpiPool.size(); i++) for (int i = 0; i < rpiPool.size(); i++)
@ -95,7 +95,7 @@ BOOL SelectPlugin::OnInitDialog()
// EXCEPTION: OCX Property Pages should return FALSE // EXCEPTION: OCX Property Pages should return FALSE
} }
int SelectPlugin::EnumPlugins() size_t SelectPlugin::EnumPlugins()
{ {
rpiPool.clear(); rpiPool.clear();

2
src/win32/SelectPlugin.h
View File

@ -20,7 +20,7 @@ class SelectPlugin : public CDialog
// Construction // Construction
public: public:
SelectPlugin(CWnd* pParent = NULL); // standard constructor SelectPlugin(CWnd* pParent = NULL); // standard constructor
int EnumPlugins(); size_t EnumPlugins();
bool GetPluginDesc(const char *sRpi, PluginDesc *pDesc); bool GetPluginDesc(const char *sRpi, PluginDesc *pDesc);
// Dialog Data // Dialog Data