mirror of
https://github.com/eclipse/upm.git
synced 2025-07-02 01:41:12 +03:00
gfx: renamed GFX headers to avoid overlap on install
Signed-off-by: Mihai Tudor Panu <mihai.tudor.panu@intel.com>
This commit is contained in:
@ -1,5 +1,5 @@
|
||||
set (libname "ili9341")
|
||||
set (libdescription "libupm ILI9341 SPI LCD")
|
||||
set (module_src gfx.cxx ili9341.cxx)
|
||||
set (module_h gfx.h ili9341.h)
|
||||
set (module_src ili9341_gfx.cxx ili9341.cxx)
|
||||
set (module_h ili9341_gfx.h ili9341.h)
|
||||
upm_module_init()
|
||||
|
@ -32,7 +32,7 @@
|
||||
#include <mraa/common.hpp>
|
||||
#include <mraa/gpio.hpp>
|
||||
#include <mraa/spi.hpp>
|
||||
#include "gfx.h"
|
||||
#include "ili9341_gfx.h"
|
||||
|
||||
// Defines
|
||||
#define ILI9341_TFTWIDTH 240
|
||||
|
@ -24,7 +24,7 @@
|
||||
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
|
||||
#include "gfx.h"
|
||||
#include "ili9341_gfx.h"
|
||||
|
||||
using namespace upm;
|
||||
|
@ -5,9 +5,9 @@
|
||||
|
||||
%apply uint8_t *INPUT { uint8_t *addr }
|
||||
|
||||
%include "gfx.h"
|
||||
%include "ili9341_gfx.h"
|
||||
%{
|
||||
#include "gfx.h"
|
||||
#include "ili9341_gfx.h"
|
||||
%}
|
||||
|
||||
%{
|
||||
|
@ -1,9 +1,9 @@
|
||||
%module jsupm_ili9341
|
||||
%include "../upm.i"
|
||||
|
||||
%include "gfx.h"
|
||||
%include "ili9341_gfx.h"
|
||||
%{
|
||||
#include "gfx.h"
|
||||
#include "ili9341_gfx.h"
|
||||
%}
|
||||
|
||||
%include "ili9341.h"
|
||||
|
@ -6,9 +6,9 @@
|
||||
%feature("autodoc", "3");
|
||||
%rename("printString") print(std::string msg);
|
||||
|
||||
%include "gfx.h"
|
||||
%include "ili9341_gfx.h"
|
||||
%{
|
||||
#include "gfx.h"
|
||||
#include "ili9341_gfx.h"
|
||||
%}
|
||||
|
||||
%include "ili9341.h"
|
||||
|
Reference in New Issue
Block a user