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

[Glide64] Clean up glitch so it compiles with the files removed

This commit is contained in:
zilmar 2015-10-09 10:40:46 +11:00
parent 08f155a2b3
commit 2ff97a3367
4 changed files with 33 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -49,3 +49,4 @@ Thumbs.db
/Plugin64/RSP/RSP_d 1.7.dll /Plugin64/RSP/RSP_d 1.7.dll
/Source/3rd Party/wx/lib/vc_lib/mswu/wx/msw/rcdefs.h /Source/3rd Party/wx/lib/vc_lib/mswu/wx/msw/rcdefs.h
/Source/3rd Party/wx/lib/vc_lib/mswud/wx/msw/rcdefs.h /Source/3rd Party/wx/lib/vc_lib/mswud/wx/msw/rcdefs.h
/Save

2
Source/Glide64/Glide64.vcproj
View File

@ -37,7 +37,7 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="&quot;$(Root)Source/3rd Party/wx/include&quot;;&quot;$(Root)Source/3rd Party/wx/include/msvc&quot;;inc" AdditionalIncludeDirectories="&quot;$(Root)Source/3rd Party/wx/include&quot;;&quot;$(Root)Source/3rd Party/wx/include/msvc&quot;;&quot;$(Root)Source/Glitch64/inc&quot;;inc"
PreprocessorDefinitions="__MSC__;RDP_LOGGING;RDP_ERROR_LOG;" PreprocessorDefinitions="__MSC__;RDP_LOGGING;RDP_ERROR_LOG;"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
/> />

2
Source/Glitch64/Glitch64.vcproj
View File

@ -37,7 +37,7 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="inc" AdditionalIncludeDirectories="&quot;$(Root)Source/3rd Party/sdl/include&quot;;inc"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
/> />
<Tool <Tool

33
Source/Glitch64/main.h
View File

@ -44,9 +44,36 @@ extern int buffer_cleared; // mark that the buffer has been cleared, used to che
#ifdef _WIN32 #ifdef _WIN32
#include <windows.h> #include <windows.h>
extern "C" { extern "C" {
#include "gl.h" #include <SDL_opengl.h>
#include "glext.h" extern PFNGLACTIVETEXTUREARBPROC glActiveTextureARB;
#include "wglext.h" extern PFNGLATTACHOBJECTARBPROC glAttachObjectARB;
extern PFNGLBINDFRAMEBUFFEREXTPROC glBindFramebufferEXT;
extern PFNGLBINDRENDERBUFFEREXTPROC glBindRenderbufferEXT;
extern PFNGLBLENDFUNCSEPARATEEXTPROC glBlendFuncSeparateEXT;
extern PFNGLCHECKFRAMEBUFFERSTATUSEXTPROC glCheckFramebufferStatusEXT;
extern PFNGLCOMPILESHADERARBPROC glCompileShaderARB;
extern PFNGLCREATEPROGRAMOBJECTARBPROC glCreateProgramObjectARB;
extern PFNGLCREATESHADEROBJECTARBPROC glCreateShaderObjectARB;
extern PFNGLDELETERENDERBUFFERSEXTPROC glDeleteRenderbuffersEXT;
extern PFNGLDELETEFRAMEBUFFERSEXTPROC glDeleteFramebuffersEXT;
extern PFNGLFOGCOORDFEXTPROC glFogCoordfEXT;
extern PFNGLFRAMEBUFFERRENDERBUFFEREXTPROC glFramebufferRenderbufferEXT;
extern PFNGLFRAMEBUFFERTEXTURE2DEXTPROC glFramebufferTexture2DEXT;
extern PFNGLGENFRAMEBUFFERSEXTPROC glGenFramebuffersEXT;
extern PFNGLGENRENDERBUFFERSEXTPROC glGenRenderbuffersEXT;
extern PFNGLGETINFOLOGARBPROC glGetInfoLogARB;
extern PFNGLGETOBJECTPARAMETERIVARBPROC glGetObjectParameterivARB;
extern PFNGLGETUNIFORMLOCATIONARBPROC glGetUniformLocationARB;
extern PFNGLLINKPROGRAMARBPROC glLinkProgramARB;
extern PFNGLMULTITEXCOORD2FARBPROC glMultiTexCoord2fARB;
extern PFNGLRENDERBUFFERSTORAGEEXTPROC glRenderbufferStorageEXT;
extern PFNGLSECONDARYCOLOR3FPROC glSecondaryColor3f;
extern PFNGLSHADERSOURCEARBPROC glShaderSourceARB;
extern PFNGLUNIFORM1FARBPROC glUniform1fARB;
extern PFNGLUNIFORM1IARBPROC glUniform1iARB;
extern PFNGLUNIFORM4FARBPROC glUniform4fARB;
extern PFNGLUSEPROGRAMOBJECTARBPROC glUseProgramObjectARB;
typedef const char * (WINAPI * PFNWGLGETEXTENSIONSSTRINGARBPROC) (HDC hdc);
} }
#else #else
#include <stdio.h> #include <stdio.h>