aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/multiple
diff options
context:
space:
mode:
authorinmarket <andrewh@inmarket.com.au>2014-09-28 01:42:30 +1000
committerinmarket <andrewh@inmarket.com.au>2014-09-28 01:42:30 +1000
commitdaf9f65b9fb9822bc3bc80d63b66a612e085802a (patch)
tree554493727b03b8dc0277a9f7d5b53e339188a1fd /drivers/multiple
parent2776d00e82b85365efa38d0067b658fd2818ca41 (diff)
downloaduGFX-daf9f65b9fb9822bc3bc80d63b66a612e085802a.tar.gz
uGFX-daf9f65b9fb9822bc3bc80d63b66a612e085802a.tar.bz2
uGFX-daf9f65b9fb9822bc3bc80d63b66a612e085802a.zip
New makefile structure. Also OSX board defintion
Diffstat (limited to 'drivers/multiple')
-rw-r--r--drivers/multiple/Win32/driver.mk5
-rw-r--r--drivers/multiple/X/driver.mk1
-rw-r--r--drivers/multiple/uGFXnet/driver.mk4
3 files changed, 8 insertions, 2 deletions
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