Glow
Fork

Commit

Add Cygwin and Msys2 support

--- a/gcc.mk

+++ b/gcc.mk

		@@ -16,6 +16,9 @@ X11INCLUDE=-I/usr/X11R6/include
16	16	glow_x11.o: glow_x11.c glow.h
17	17	$(CC) $(CFLAGS) $(X11INCLUDE) -c glow_x11.c -o glow_x11.o
18	18
	19	+glow_win32.o: glow_win32.c glow.h
	20	+ $(CC) $(CFLAGS) -DGLOW_DLL -D_WIN32 -DGLOW_EXPORTS -c glow_win32.c -o glow_win32.o
	21	+
19	22	glow_x11.os: glow_x11.c glow.h
20	23	$(CC) $(CFLAGS) $(FPICFLAGS) $(X11INCLUDE) -c glow_x11.c -o glow_x11.os
21	24

--- a/glow_win32.c

+++ b/glow_win32.c

		@@ -58,6 +58,16 @@ static HINSTANCE glow_app = NULL;
58	58
59	59	/******************************************************************************/
60	60
	61	+#ifdef __CYGWIN__
	62	+
	63	+#ifndef SM_CXPADDEDBORDER
	64	+#define SM_CXPADDEDBORDER 92
	65	+#endif
	66	+
	67	+#endif
	68	+
	69	+/******************************************************************************/
	70	+
61	71	static void glow_translate_local_mouse_pos(const POINT *in_pnt,
62	72	struct Glow_Window *w, glow_pixel_coords_t out_pos){
63	73	RECT rect;

		@@ -220,6 +230,8 @@ BOOL WINAPI DllMain(HINSTANCE app, DWORD reason, LPVOID reserved){
220	230	wc.hInstance = glow_app = app;
221	231
222	232	RegisterClass(&wc);
	233	+
	234	+ return TRUE;
223	235	}
224	236
225	237	/******************************************************************************/

		@@ -248,8 +260,6 @@ void Glow_ViewportSize(unsigned w, unsigned h,
248	260	{
249	261	const DWORD w_thickness = (size.right - w), h_thickness = (size.bottom - h);
250	262
251		- printf("w_thickness = %i, h_thickness = %i\n", w_thickness, h_thickness);
252		-
253	263	out_w[0] = w + w_thickness;
254	264	out_h[0] = h + h_thickness;
255	265	}

--- a/makefile

+++ b/makefile

		@@ -11,10 +11,20 @@ glow_win32.obj: glow_win32.c glow.h
11	11	glow.dll glow.lib:
12	12	link /nologo /dll /out:glow.dll /implib:glow.lib OpenGL32.lib gdi32.lib user32.lib glow_win32.obj
13	13
14		-.else
	14	+.elif defined(OS) && (${OS} == "CYGWIN")
15	15
16		-all: libglow.so libglow.a
	16	+all: libglow.dll
17	17
18	18	.include "gcc.mk"
19	19
	20	+libglow.dll: glow_win32.o
	21	+ $(CC) -shared -o libglow.dll glow_win32.o -lOpenGL32 -lGDI32
	22	+
	23	+.else
	24	+
	25	+all:
	26	+ echo ${OS}
	27	+
	28	+# .include "gcc.mk"
	29	+
20	30	.endif