提交: f39ef07c90081bd82af6c48cbcfbd5c1805b5876 - glow (git)

Cross-Platform OpenGL Windowing Library

Commit MetaInfo

• 修订版: f39ef07c90081bd82af6c48cbcfbd5c1805b5876 (tree)
• 时间: 2022-02-17 16:37:00
• 作者: AlaskanEmily <emily@alas...>
• Commiter: AlaskanEmily

Log Message

Fix MinGW64 build

更改概述

• modified: GNUmakefile
• modified: glow_win32.c

差异

--- a/GNUmakefile
+++ b/GNUmakefile
@@ -1,14 +1,14 @@
 # Any copyright is dedicated to the Public Domain.
 # http://creativecommons.org/publicdomain/zero/1.0/
 
-UNAME=$(shell uname)
-HAIKU=Haiku
+UNAME := $(shell uname)
+HAIKU := Haiku
 
 ifeq "$(UNAME)" "Haiku"
 
 all: libglow.so libglow.a
 
-CXXFLAGS=-fno-rtti -fno-exceptions -g -std=c++98 -Wall
+CXXFLAGS := -fno-rtti -fno-exceptions -g -std=c++98 -Wall
 
 glow_haiku.os: glow_haiku.cpp glow.h
 	g++ $(CXXFLAGS) -fPIC -c glow_haiku.cpp -o glow_haiku.os
@@ -25,8 +25,17 @@ libglow.so: glow_haiku.os
 
 else
 
+ifneq (,$(findstring CYGWIN,$(UNAME)))
+
+GLOWTARGET :=  win32
+all: libglow.a
+
+else
+
 all: libglow.so libglow.a
 
+endif
+
 include gcc.mk
 
 endif

--- a/glow_win32.c
+++ b/glow_win32.c
@@ -37,11 +37,6 @@ struct Glow_Window {
 /******************************************************************************/
 
 #ifdef __GNUC__
-HINSTANCE __mingw_winmain_hInstance;
-LPWSTR __mingw_winmain_lpCmdLine;
-DWORD __mingw_winmain_nShowCmd;
-extern char **__argv;
-extern int __argc;
 
 #ifdef WinMain
 #undef WinMain
@@ -195,7 +190,7 @@ static LRESULT WINAPI glow_window_proc(HWND wnd,
                 
                 /* This will get set to -1 if adaptive vsync works. */
                 int interval = 1;
-                const char *const ext = glGetString(GL_EXTENSIONS);
+                const char *const ext = (void*)glGetString(GL_EXTENSIONS);
                 
                 SetPixelFormat(window->dc, pix_format, &glow_pixel_format);
                 window->ctx.ctx = wglCreateContext(window->dc);