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:
Mihai Tudor Panu
2016-03-31 16:30:54 -07:00
parent cf2b8c9a6e
commit a88ec4237d
21 changed files with 30 additions and 30 deletions

View File

@ -1,5 +1,5 @@
set (libname "st7735")
set (libdescription "libupm SPI LCD")
set (module_src gfx.cxx st7735.cxx)
set (module_h gfx.h st7735.h)
set (module_src st7735_gfx.cxx st7735.cxx)
set (module_h st7735_gfx.h st7735.h)
upm_module_init()

View File

@ -35,9 +35,9 @@
$1 = (unsigned char *)JCALL2(GetByteArrayElements, jenv, $input, NULL);
}
%include "gfx.h"
%include "st7735_gfx.h"
%{
#include "gfx.h"
#include "st7735_gfx.h"
%}
%include "st7735.h"

View File

@ -1,9 +1,9 @@
%module jsupm_st7735
%include "../upm.i"
%include "gfx.h"
%include "st7735_gfx.h"
%{
#include "gfx.h"
#include "st7735_gfx.h"
%}
%include "st7735.h"

View File

@ -6,9 +6,9 @@
%feature("autodoc", "3");
%rename("printString") print(std::string msg);
%include "gfx.h"
%include "st7735_gfx.h"
%{
#include "gfx.h"
#include "st7735_gfx.h"
%}
%include "st7735.h"

View File

@ -33,7 +33,7 @@
#include <mraa/gpio.hpp>
#include <mraa/spi.hpp>
#include "gfx.h"
#include "st7735_gfx.h"
#define INITR_GREENTAB 0x0
#define INITR_REDTAB 0x1

View File

@ -26,7 +26,7 @@
#include <unistd.h>
#include <stdlib.h>
#include "gfx.h"
#include "st7735_gfx.h"
using namespace upm;