diff options
| author | inmarket <andrewh@inmarket.com.au> | 2014-09-28 01:42:56 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2014-09-28 01:42:56 +1000 |
| commit | bbdc236967ecff9095e04f3a47dd0c358b691640 (patch) | |
| tree | da4fcd7b989c0a6d27db6b7221c6f9da6414a8ac /drivers/multiple | |
| parent | aa858131c0c0f2eef4ced7987f0becbe27d378e0 (diff) | |
| parent | daf9f65b9fb9822bc3bc80d63b66a612e085802a (diff) | |
| download | uGFX-bbdc236967ecff9095e04f3a47dd0c358b691640.tar.gz uGFX-bbdc236967ecff9095e04f3a47dd0c358b691640.tar.bz2 uGFX-bbdc236967ecff9095e04f3a47dd0c358b691640.zip | |
Merge branch 'master' into newmouse
Diffstat (limited to 'drivers/multiple')
| -rw-r--r-- | drivers/multiple/Win32/driver.mk | 5 | ||||
| -rw-r--r-- | drivers/multiple/X/driver.mk | 1 | ||||
| -rw-r--r-- | drivers/multiple/uGFXnet/driver.mk | 4 |
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 |