From daf9f65b9fb9822bc3bc80d63b66a612e085802a Mon Sep 17 00:00:00 2001 From: inmarket Date: Sun, 28 Sep 2014 01:42:30 +1000 Subject: New makefile structure. Also OSX board defintion --- drivers/gaudio/Win32/driver.mk | 2 +- drivers/multiple/Win32/driver.mk | 5 +++-- drivers/multiple/X/driver.mk | 1 + drivers/multiple/uGFXnet/driver.mk | 4 ++++ 4 files changed, 9 insertions(+), 3 deletions(-) (limited to 'drivers') diff --git a/drivers/gaudio/Win32/driver.mk b/drivers/gaudio/Win32/driver.mk index 1ea338d5..f959279f 100644 --- a/drivers/gaudio/Win32/driver.mk +++ b/drivers/gaudio/Win32/driver.mk @@ -2,5 +2,5 @@ GFXSRC += $(GFXLIB)/drivers/gaudio/Win32/gaudio_record_lld.c \ $(GFXLIB)/drivers/gaudio/Win32/gaudio_play_lld.c -# Required include directories GFXINC += $(GFXLIB)/drivers/gaudio/Win32 +GFXLIBS += winmm diff --git a/drivers/multiple/Win32/driver.mk b/drivers/multiple/Win32/driver.mk index d9654dfe..cde5d93f 100644 --- a/drivers/multiple/Win32/driver.mk +++ b/drivers/multiple/Win32/driver.mk @@ -1,2 +1,3 @@ -GFXINC += $(GFXLIB)/drivers/multiple/Win32 -GFXSRC += $(GFXLIB)/drivers/multiple/Win32/gdisp_lld_Win32.c +GFXINC += $(GFXLIB)/drivers/multiple/Win32 +GFXSRC += $(GFXLIB)/drivers/multiple/Win32/gdisp_lld_Win32.c +GFXLIBS += gdi32 diff --git a/drivers/multiple/X/driver.mk b/drivers/multiple/X/driver.mk index 572a5b7d..e7255307 100644 --- a/drivers/multiple/X/driver.mk +++ b/drivers/multiple/X/driver.mk @@ -1,2 +1,3 @@ GFXINC += $(GFXLIB)/drivers/multiple/X GFXSRC += $(GFXLIB)/drivers/multiple/X/gdisp_lld_X.c +GFXLIBS += X11 diff --git a/drivers/multiple/uGFXnet/driver.mk b/drivers/multiple/uGFXnet/driver.mk index 89bd7cf2..c9d2749c 100644 --- a/drivers/multiple/uGFXnet/driver.mk +++ b/drivers/multiple/uGFXnet/driver.mk @@ -1,2 +1,6 @@ GFXINC += $(GFXLIB)/drivers/multiple/uGFXnet GFXSRC += $(GFXLIB)/drivers/multiple/uGFXnet/gdisp_lld_uGFXnet.c + +ifeq($(OPT_NATIVEOS),win32) + GFXLIBS += ws2_32 +endif -- cgit v1.2.3