mirror of
				https://projects.vdr-developer.org/git/vdr-plugin-skindesigner.git
				synced 2023-10-19 15:58:31 +00:00 
			
		
		
		
	fixed some possible compiling errors
This commit is contained in:
		
							
								
								
									
										1
									
								
								Makefile
									
									
									
									
									
								
							
							
						
						
									
										1
									
								
								Makefile
									
									
									
									
									
								
							@@ -46,6 +46,7 @@ SOFILE = libvdr-$(PLUGIN).so
 | 
				
			|||||||
DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"' $(CONFIG)
 | 
					DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"' $(CONFIG)
 | 
				
			||||||
DEFINES += $(shell xml2-config --cflags)
 | 
					DEFINES += $(shell xml2-config --cflags)
 | 
				
			||||||
DEFINES += -DSCRIPTFOLDER='"$(SKINDESIGNER_SCRIPTDIR)"'
 | 
					DEFINES += -DSCRIPTFOLDER='"$(SKINDESIGNER_SCRIPTDIR)"'
 | 
				
			||||||
 | 
					DEFINES += -D__STL_CONFIG_H
 | 
				
			||||||
 | 
					
 | 
				
			||||||
INCLUDES += $(shell pkg-config --cflags freetype2 fontconfig)
 | 
					INCLUDES += $(shell pkg-config --cflags freetype2 fontconfig)
 | 
				
			||||||
INCLUDES += $(shell pkg-config --cflags librsvg-2.0 cairo-png) -ljpeg
 | 
					INCLUDES += $(shell pkg-config --cflags librsvg-2.0 cairo-png) -ljpeg
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,4 +1,3 @@
 | 
				
			|||||||
#define __STL_CONFIG_H
 | 
					 | 
				
			||||||
#include "attribute.h"
 | 
					#include "attribute.h"
 | 
				
			||||||
#include "../config.h"
 | 
					#include "../config.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,4 +1,3 @@
 | 
				
			|||||||
#define __STL_CONFIG_H
 | 
					 | 
				
			||||||
#include "viewelementsdisplaymenu.h"
 | 
					#include "viewelementsdisplaymenu.h"
 | 
				
			||||||
#include "../config.h"
 | 
					#include "../config.h"
 | 
				
			||||||
#include <vdr/videodir.h>
 | 
					#include <vdr/videodir.h>
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,4 +1,3 @@
 | 
				
			|||||||
#define __STL_CONFIG_H
 | 
					 | 
				
			||||||
#include "displayreplay.h"
 | 
					#include "displayreplay.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
cSDDisplayReplay::cSDDisplayReplay(cViewReplay *replayView, bool ModeOnly) {
 | 
					cSDDisplayReplay::cSDDisplayReplay(cViewReplay *replayView, bool ModeOnly) {
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -3,7 +3,7 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
#include <string>
 | 
					#include <string>
 | 
				
			||||||
#include <map>
 | 
					#include <map>
 | 
				
			||||||
#include "libskindesignerapi/skindesignerapi.h"
 | 
					#include "../libskindesignerapi/skindesignerapi.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
using namespace std;
 | 
					using namespace std;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -68,4 +68,4 @@ public:
 | 
				
			|||||||
    skindesignerapi::cTokenContainer *GetTokenContainerTab(int plugId, int viewId);
 | 
					    skindesignerapi::cTokenContainer *GetTokenContainerTab(int plugId, int viewId);
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#endif //__PLUGINMANAGER_H
 | 
					#endif //__PLUGINMANAGER_H
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -161,7 +161,7 @@ class cServiceHandler
 | 
				
			|||||||
struct Epgsearch_services_v1_0
 | 
					struct Epgsearch_services_v1_0
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
// in/out
 | 
					// in/out
 | 
				
			||||||
      std::auto_ptr<cServiceHandler> handler;
 | 
					      std::unique_ptr<cServiceHandler> handler;
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user