mirror of
https://github.com/ClassiCube/ClassiCube.git
synced 2025-09-19 12:35:52 -04:00
Fix latest build being broken due to me forgetting to declare storage for Window_Handle
This commit is contained in:
parent
677f30b7cf
commit
3a7891fc87
@ -43,9 +43,6 @@
|
|||||||
<Filter Include="Header Files\Graphics">
|
<Filter Include="Header Files\Graphics">
|
||||||
<UniqueIdentifier>{f54c6d3f-3a01-4c8d-8211-7a3ef5837674}</UniqueIdentifier>
|
<UniqueIdentifier>{f54c6d3f-3a01-4c8d-8211-7a3ef5837674}</UniqueIdentifier>
|
||||||
</Filter>
|
</Filter>
|
||||||
<Filter Include="Source Files\Graphics">
|
|
||||||
<UniqueIdentifier>{258fb897-a2f4-437c-9108-d0a5fd0cb8b9}</UniqueIdentifier>
|
|
||||||
</Filter>
|
|
||||||
<Filter Include="Header Files\Map">
|
<Filter Include="Header Files\Map">
|
||||||
<UniqueIdentifier>{0ff1e440-e67d-4e09-913d-56417fbfe6b1}</UniqueIdentifier>
|
<UniqueIdentifier>{0ff1e440-e67d-4e09-913d-56417fbfe6b1}</UniqueIdentifier>
|
||||||
</Filter>
|
</Filter>
|
||||||
@ -124,6 +121,9 @@
|
|||||||
<Filter Include="Source Files\Launcher">
|
<Filter Include="Source Files\Launcher">
|
||||||
<UniqueIdentifier>{a46e060c-8a75-436f-ac18-f35d184735af}</UniqueIdentifier>
|
<UniqueIdentifier>{a46e060c-8a75-436f-ac18-f35d184735af}</UniqueIdentifier>
|
||||||
</Filter>
|
</Filter>
|
||||||
|
<Filter Include="Source Files\Graphics">
|
||||||
|
<UniqueIdentifier>{e417a755-7f7f-4932-99d1-a1e9a1066e0a}</UniqueIdentifier>
|
||||||
|
</Filter>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClInclude Include="Platform.h">
|
<ClInclude Include="Platform.h">
|
||||||
@ -282,9 +282,6 @@
|
|||||||
<ClInclude Include="BlockPhysics.h">
|
<ClInclude Include="BlockPhysics.h">
|
||||||
<Filter>Header Files\Blocks</Filter>
|
<Filter>Header Files\Blocks</Filter>
|
||||||
</ClInclude>
|
</ClInclude>
|
||||||
<ClInclude Include="Graphics.h">
|
|
||||||
<Filter>Header Files\Graphics</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="Launcher.h">
|
<ClInclude Include="Launcher.h">
|
||||||
<Filter>Header Files\Launcher</Filter>
|
<Filter>Header Files\Launcher</Filter>
|
||||||
</ClInclude>
|
</ClInclude>
|
||||||
@ -318,6 +315,9 @@
|
|||||||
<ClInclude Include="Protocol.h">
|
<ClInclude Include="Protocol.h">
|
||||||
<Filter>Header Files\Network</Filter>
|
<Filter>Header Files\Network</Filter>
|
||||||
</ClInclude>
|
</ClInclude>
|
||||||
|
<ClInclude Include="Graphics.h">
|
||||||
|
<Filter>Header Files\Graphics</Filter>
|
||||||
|
</ClInclude>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClCompile Include="String.c">
|
<ClCompile Include="String.c">
|
||||||
@ -506,9 +506,6 @@
|
|||||||
<ClCompile Include="_truetype.c">
|
<ClCompile Include="_truetype.c">
|
||||||
<Filter>Source Files\Freetype</Filter>
|
<Filter>Source Files\Freetype</Filter>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<ClCompile Include="Graphics.c">
|
|
||||||
<Filter>Source Files\Graphics</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="Window.c">
|
<ClCompile Include="Window.c">
|
||||||
<Filter>Source Files\Platform</Filter>
|
<Filter>Source Files\Platform</Filter>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
@ -548,5 +545,8 @@
|
|||||||
<ClCompile Include="Input.c">
|
<ClCompile Include="Input.c">
|
||||||
<Filter>Source Files\Game</Filter>
|
<Filter>Source Files\Game</Filter>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
|
<ClCompile Include="Graphics.c">
|
||||||
|
<Filter>Source Files\Graphics</Filter>
|
||||||
|
</ClCompile>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
</Project>
|
</Project>
|
@ -106,6 +106,14 @@ typedef struct TextureRec_ { float U1, V1, U2, V2; } TextureRec;
|
|||||||
#define CC_BUILD_WGL
|
#define CC_BUILD_WGL
|
||||||
#define CC_BUILD_WININET
|
#define CC_BUILD_WININET
|
||||||
#define CC_BUILD_WINMM
|
#define CC_BUILD_WINMM
|
||||||
|
#elif defined __ANDROID__
|
||||||
|
#define CC_BUILD_ANDROID
|
||||||
|
#define CC_BUILD_LINUX
|
||||||
|
#define CC_BUILD_POSIX
|
||||||
|
#define CC_BUILD_GL
|
||||||
|
#define CC_BUILD_GLMODERN
|
||||||
|
#define CC_BUILD_GLES
|
||||||
|
#define CC_BUILD_EGL
|
||||||
#elif defined __linux__
|
#elif defined __linux__
|
||||||
#define CC_BUILD_LINUX
|
#define CC_BUILD_LINUX
|
||||||
#define CC_BUILD_POSIX
|
#define CC_BUILD_POSIX
|
||||||
|
@ -10,6 +10,7 @@ int Display_BitsPerPixel;
|
|||||||
Rect2D Display_Bounds;
|
Rect2D Display_Bounds;
|
||||||
int Window_X, Window_Y, Window_Width, Window_Height;
|
int Window_X, Window_Y, Window_Width, Window_Height;
|
||||||
bool Window_Exists, Window_Focused;
|
bool Window_Exists, Window_Focused;
|
||||||
|
const void* Window_Handle;
|
||||||
|
|
||||||
void Window_CreateSimple(int width, int height) {
|
void Window_CreateSimple(int width, int height) {
|
||||||
struct GraphicsMode mode;
|
struct GraphicsMode mode;
|
||||||
@ -3198,15 +3199,16 @@ static EGLSurface ctx_surface;
|
|||||||
static EGLConfig ctx_config;
|
static EGLConfig ctx_config;
|
||||||
static EGLint ctx_numConfig;
|
static EGLint ctx_numConfig;
|
||||||
|
|
||||||
static XVisualInfo GLContext_SelectVisual(struct GraphicsMode* mode) {
|
/*static XVisualInfo GLContext_SelectVisual(struct GraphicsMode* mode) {
|
||||||
XVisualInfo info = { 0 };
|
XVisualInfo info = { 0 };
|
||||||
info.depth = 24;
|
info.depth = 24;
|
||||||
info.visual = CopyFromParent;
|
info.visual = CopyFromParent;
|
||||||
info.visualid = CopyFromParent;
|
info.visualid = CopyFromParent;
|
||||||
return info;
|
return info;
|
||||||
}
|
}*/
|
||||||
|
|
||||||
void GLContext_Init(struct GraphicsMode* mode) {
|
void GLContext_Init(struct GraphicsMode* mode) {
|
||||||
|
static EGLint contextAttribs[3] = { EGL_CONTEXT_CLIENT_VERSION, 2, EGL_NONE };
|
||||||
static EGLint attribs[19] = {
|
static EGLint attribs[19] = {
|
||||||
EGL_RED_SIZE, 0, EGL_GREEN_SIZE, 0,
|
EGL_RED_SIZE, 0, EGL_GREEN_SIZE, 0,
|
||||||
EGL_BLUE_SIZE, 0, EGL_ALPHA_SIZE, 0,
|
EGL_BLUE_SIZE, 0, EGL_ALPHA_SIZE, 0,
|
||||||
@ -3226,7 +3228,6 @@ void GLContext_Init(struct GraphicsMode* mode) {
|
|||||||
eglBindAPI(EGL_OPENGL_ES_API);
|
eglBindAPI(EGL_OPENGL_ES_API);
|
||||||
eglChooseConfig(ctx_display, attribs, &ctx_config, 1, &ctx_numConfig);
|
eglChooseConfig(ctx_display, attribs, &ctx_config, 1, &ctx_numConfig);
|
||||||
|
|
||||||
static EGLint contextAttribs[] = { EGL_CONTEXT_CLIENT_VERSION, 2, EGL_NONE };
|
|
||||||
ctx_context = eglCreateContext(ctx_display, ctx_config, EGL_NO_CONTEXT, contextAttribs);
|
ctx_context = eglCreateContext(ctx_display, ctx_config, EGL_NO_CONTEXT, contextAttribs);
|
||||||
ctx_surface = eglCreateWindowSurface(ctx_display, ctx_config, win_handle, NULL);
|
ctx_surface = eglCreateWindowSurface(ctx_display, ctx_config, win_handle, NULL);
|
||||||
eglMakeCurrent(ctx_display, ctx_surface, ctx_surface, ctx_context);\
|
eglMakeCurrent(ctx_display, ctx_surface, ctx_surface, ctx_context);\
|
||||||
|
Loading…
x
Reference in New Issue
Block a user