From 8dd5cc93d5e0c82f141a9e46e69645f8477b986e Mon Sep 17 00:00:00 2001 From: Joel Bodenmann Date: Mon, 15 Aug 2016 14:05:56 +0200 Subject: Cleaning up new SDL driver support --- boards/base/Linux-Framebuffer/example/readme.txt | 5 --- boards/base/Linux-SDL/board.mk | 7 ++++ boards/base/Linux-SDL/example/Makefile | 48 ++++++++++++++++++++++++ boards/base/Linux-SDL/readme.txt | 20 ++++++++++ boards/base/Linux-X/board.mk | 6 +++ boards/base/Linux-X/example/Makefile | 48 ++++++++++++++++++++++++ boards/base/Linux-X/readme.txt | 18 +++++++++ boards/base/Linux/board.mk | 7 ---- boards/base/Linux/example/Makefile | 48 ------------------------ boards/base/Linux/example/readme.txt | 5 --- boards/base/Linux/readme.txt | 7 ---- 11 files changed, 147 insertions(+), 72 deletions(-) delete mode 100644 boards/base/Linux-Framebuffer/example/readme.txt create mode 100644 boards/base/Linux-SDL/board.mk create mode 100644 boards/base/Linux-SDL/example/Makefile create mode 100644 boards/base/Linux-SDL/readme.txt create mode 100644 boards/base/Linux-X/board.mk create mode 100644 boards/base/Linux-X/example/Makefile create mode 100644 boards/base/Linux-X/readme.txt delete mode 100644 boards/base/Linux/board.mk delete mode 100644 boards/base/Linux/example/Makefile delete mode 100644 boards/base/Linux/example/readme.txt delete mode 100644 boards/base/Linux/readme.txt (limited to 'boards') diff --git a/boards/base/Linux-Framebuffer/example/readme.txt b/boards/base/Linux-Framebuffer/example/readme.txt deleted file mode 100644 index aff58bb1..00000000 --- a/boards/base/Linux-Framebuffer/example/readme.txt +++ /dev/null @@ -1,5 +0,0 @@ -Copy these files into your own project directory and alter them to suite. - -Notes: - -1/ Look at the MYFILES definition and the MYCSRC definition. diff --git a/boards/base/Linux-SDL/board.mk b/boards/base/Linux-SDL/board.mk new file mode 100644 index 00000000..591d09d0 --- /dev/null +++ b/boards/base/Linux-SDL/board.mk @@ -0,0 +1,7 @@ +GFXINC += $(GFXLIB)/boards/base/Linux +GFXSRC += +GFXDEFS += -DGFX_USE_OS_LINUX=TRUE +GFXLIBS += rt + +include $(GFXLIB)/drivers/multiple/SDL/driver.mk + diff --git a/boards/base/Linux-SDL/example/Makefile b/boards/base/Linux-SDL/example/Makefile new file mode 100644 index 00000000..8b85cb12 --- /dev/null +++ b/boards/base/Linux-SDL/example/Makefile @@ -0,0 +1,48 @@ +# Possible Targets: all clean Debug cleanDebug Release cleanRelease + +############################################################################################## +# Settings +# + +# General settings + # See $(GFXLIB)/tools/gmake_scripts/readme.txt for the list of variables + OPT_OS = linux + OPT_LINK_OPTIMIZE = yes + # Change this next setting (or add the explicit compiler flags) if you are not compiling for x86 linux + OPT_CPU = x86 + +# uGFX settings + # See $(GFXLIB)/tools/gmake_scripts/library_ugfx.mk for the list of variables + GFXLIB = ../uGFX + GFXBOARD = Linux-SDL + GFXDEMO = modules/gdisp/basics + +# Linux settings + # See $(GFXLIB)/tools/gmake_scripts/os_linux.mk for the list of variables + +############################################################################################## +# Set these for your project +# + +ARCH = +SRCFLAGS = -ggdb -O0 +CFLAGS = `sdl2-config --libs --cflags` +CXXFLAGS = +ASFLAGS = +LDFLAGS = + +SRC = +OBJS = +DEFS = +LIBS = +INCPATH = +LIBPATH = + +############################################################################################## +# These should be at the end +# + +include $(GFXLIB)/tools/gmake_scripts/library_ugfx.mk +include $(GFXLIB)/tools/gmake_scripts/os_$(OPT_OS).mk +include $(GFXLIB)/tools/gmake_scripts/compiler_gcc.mk +# *** EOF *** diff --git a/boards/base/Linux-SDL/readme.txt b/boards/base/Linux-SDL/readme.txt new file mode 100644 index 00000000..38cafc07 --- /dev/null +++ b/boards/base/Linux-SDL/readme.txt @@ -0,0 +1,20 @@ +This directory contains the interface for Linux using SDL. + +On this board uGFX currently supports: + - GDISP via the SDL driver + - GINPUT-touch via the SDL driver + - GINPUT-keyboard via the SDL driver + + +The folowing packages are required to run uGFX using this driver on +a 64-bit Linux system using SDL: + + gcc-multilib + + build-essential + + libsdl2-dev:i386 + + +The following should be added to the CFLAGS of the target makefile: + CFLAGS = `sdl2-config --libs --cflags` + + +There is an example Makefile and project in the examples directory. diff --git a/boards/base/Linux-X/board.mk b/boards/base/Linux-X/board.mk new file mode 100644 index 00000000..beb156b8 --- /dev/null +++ b/boards/base/Linux-X/board.mk @@ -0,0 +1,6 @@ +GFXINC += $(GFXLIB)/boards/base/Linux +GFXSRC += +GFXDEFS += -DGFX_USE_OS_LINUX=TRUE +GFXLIBS += rt + +include $(GFXLIB)/drivers/multiple/X/driver.mk diff --git a/boards/base/Linux-X/example/Makefile b/boards/base/Linux-X/example/Makefile new file mode 100644 index 00000000..3c550579 --- /dev/null +++ b/boards/base/Linux-X/example/Makefile @@ -0,0 +1,48 @@ +# Possible Targets: all clean Debug cleanDebug Release cleanRelease + +############################################################################################## +# Settings +# + +# General settings + # See $(GFXLIB)/tools/gmake_scripts/readme.txt for the list of variables + OPT_OS = linux + OPT_LINK_OPTIMIZE = yes + # Change this next setting (or add the explicit compiler flags) if you are not compiling for x86 linux + OPT_CPU = x86 + +# uGFX settings + # See $(GFXLIB)/tools/gmake_scripts/library_ugfx.mk for the list of variables + GFXLIB = ../uGFX + GFXBOARD = Linux-X + GFXDEMO = modules/gdisp/basics + +# Linux settings + # See $(GFXLIB)/tools/gmake_scripts/os_linux.mk for the list of variables + +############################################################################################## +# Set these for your project +# + +ARCH = +SRCFLAGS = -ggdb -O0 +CFLAGS = +CXXFLAGS = +ASFLAGS = +LDFLAGS = + +SRC = +OBJS = +DEFS = +LIBS = +INCPATH = +LIBPATH = + +############################################################################################## +# These should be at the end +# + +include $(GFXLIB)/tools/gmake_scripts/library_ugfx.mk +include $(GFXLIB)/tools/gmake_scripts/os_$(OPT_OS).mk +include $(GFXLIB)/tools/gmake_scripts/compiler_gcc.mk +# *** EOF *** diff --git a/boards/base/Linux-X/readme.txt b/boards/base/Linux-X/readme.txt new file mode 100644 index 00000000..098d0b50 --- /dev/null +++ b/boards/base/Linux-X/readme.txt @@ -0,0 +1,18 @@ +This directory contains the interface for Linux using X. + + +On this board uGFX currently supports: + - GDISP via the X driver + - GINPUT-touch via the X driver + + +The folowing packages are required to run uGFX using this driver on +a 64-bit Linux system running X: + + gcc-multilib + + build-essential + + xorg-dev + + libx11-dev + + libx11-dev:i386 + + +There is an example Makefile and project in the examples directory. diff --git a/boards/base/Linux/board.mk b/boards/base/Linux/board.mk deleted file mode 100644 index 591d09d0..00000000 --- a/boards/base/Linux/board.mk +++ /dev/null @@ -1,7 +0,0 @@ -GFXINC += $(GFXLIB)/boards/base/Linux -GFXSRC += -GFXDEFS += -DGFX_USE_OS_LINUX=TRUE -GFXLIBS += rt - -include $(GFXLIB)/drivers/multiple/SDL/driver.mk - diff --git a/boards/base/Linux/example/Makefile b/boards/base/Linux/example/Makefile deleted file mode 100644 index d75c1dd2..00000000 --- a/boards/base/Linux/example/Makefile +++ /dev/null @@ -1,48 +0,0 @@ -# Possible Targets: all clean Debug cleanDebug Release cleanRelease - -############################################################################################## -# Settings -# - -# General settings - # See $(GFXLIB)/tools/gmake_scripts/readme.txt for the list of variables - OPT_OS = linux - OPT_LINK_OPTIMIZE = yes - # Change this next setting (or add the explicit compiler flags) if you are not compiling for x86 linux - OPT_CPU = x86 - -# uGFX settings - # See $(GFXLIB)/tools/gmake_scripts/library_ugfx.mk for the list of variables - GFXLIB = ../uGFX - GFXBOARD = Linux - GFXDEMO = modules/gdisp/basics - -# Linux settings - # See $(GFXLIB)/tools/gmake_scripts/os_linux.mk for the list of variables - -############################################################################################## -# Set these for your project -# - -ARCH = -SRCFLAGS = -ggdb -O0 -CFLAGS = -CXXFLAGS = -ASFLAGS = -LDFLAGS = - -SRC = -OBJS = -DEFS = -LIBS = -INCPATH = -LIBPATH = - -############################################################################################## -# These should be at the end -# - -include $(GFXLIB)/tools/gmake_scripts/library_ugfx.mk -include $(GFXLIB)/tools/gmake_scripts/os_$(OPT_OS).mk -include $(GFXLIB)/tools/gmake_scripts/compiler_gcc.mk -# *** EOF *** diff --git a/boards/base/Linux/example/readme.txt b/boards/base/Linux/example/readme.txt deleted file mode 100644 index aff58bb1..00000000 --- a/boards/base/Linux/example/readme.txt +++ /dev/null @@ -1,5 +0,0 @@ -Copy these files into your own project directory and alter them to suite. - -Notes: - -1/ Look at the MYFILES definition and the MYCSRC definition. diff --git a/boards/base/Linux/readme.txt b/boards/base/Linux/readme.txt deleted file mode 100644 index b0d1dc1d..00000000 --- a/boards/base/Linux/readme.txt +++ /dev/null @@ -1,7 +0,0 @@ -This directory contains the interface for Linux using X. - -On this board uGFX currently supports: - - GDISP via the X driver - - GINPUT-touch via the X driver - -There is an example Makefile and project in the examples directory. -- cgit v1.2.3