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 "ssd1351")
set (libdescription "libupm SSD1351 SPI LCD")
set (module_src gfx.cxx ssd1351.cxx)
set (module_h gfx.h ssd1351.h)
set (module_src ssd1351_gfx.cxx ssd1351.cxx)
set (module_h ssd1351_gfx.h ssd1351.h)
upm_module_init()

View File

@ -6,9 +6,9 @@
%ignore m_map;
%ignore font;
%include "gfx.h"
%include "ssd1351_gfx.h"
%{
#include "gfx.h"
#include "ssd1351_gfx.h"
%}
%include "ssd1351.h"

View File

@ -1,9 +1,9 @@
%module jsupm_ssd1351
%include "../upm.i"
%include "gfx.h"
%include "ssd1351_gfx.h"
%{
#include "gfx.h"
#include "ssd1351_gfx.h"
%}
%include "ssd1351.h"

View File

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

View File

@ -30,7 +30,7 @@
#include <mraa/common.hpp>
#include <mraa/gpio.hpp>
#include <mraa/spi.hpp>
#include "gfx.h"
#include "ssd1351_gfx.h"
// Display Size
#define SSD1351WIDTH 128

View File

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