diff options
| author | inmarket <andrewh@inmarket.com.au> | 2014-09-28 01:42:30 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2014-09-28 01:42:30 +1000 |
| commit | daf9f65b9fb9822bc3bc80d63b66a612e085802a (patch) | |
| tree | 554493727b03b8dc0277a9f7d5b53e339188a1fd /drivers | |
| parent | 2776d00e82b85365efa38d0067b658fd2818ca41 (diff) | |
| download | uGFX-daf9f65b9fb9822bc3bc80d63b66a612e085802a.tar.gz uGFX-daf9f65b9fb9822bc3bc80d63b66a612e085802a.tar.bz2 uGFX-daf9f65b9fb9822bc3bc80d63b66a612e085802a.zip | |
New makefile structure. Also OSX board defintion
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gaudio/Win32/driver.mk | 2 | ||||
| -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 |
4 files changed, 9 insertions, 3 deletions
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 |