Merge pull request #4690 from lrusak/projectm

Thanks :)
This commit is contained in:
Christian Hewitt 2016-02-08 01:33:34 +04:00
commit 06cfc8728b
2 changed files with 7 additions and 7 deletions

View File

@ -24,7 +24,7 @@ index 0000000..18791c4
+externalproject_add(ftgl
+ SOURCE_DIR ${CMAKE_SOURCE_DIR}
+ UPDATE_COMMAND cd unix && autoreconf -vif
+ CONFIGURE_COMMAND cd unix && CXXFLAGS=-fpermissive ./configure --prefix=${OUTPUT_DIR} --with-pic
+ CONFIGURE_COMMAND cd unix && CXXFLAGS=-fpermissive ./configure --prefix=${OUTPUT_DIR} --with-freetype-prefix=${OUTPUT_DIR} --with-pic
+ BUILD_COMMAND cd unix && make
+ INSTALL_COMMAND ""
+ BUILD_IN_SOURCE 1)

View File

@ -26,14 +26,14 @@ diff --git a/src/Main.cpp b/src/Main.cpp
index 449cb85..81205dc 100644
--- a/src/Main.cpp
+++ b/src/Main.cpp
@@ -55,7 +55,6 @@ d4rk@xbmc.org
@@ -55,7 +55,6 @@
#include <kodi/xbmc_vis_dll.h>
#include <kodi/xbmc_addon_cpp_dll.h>
-#include <kodi/libXBMC_addon.h>
#include <xbmc_vis_dll.h>
#include <xbmc_addon_cpp_dll.h>
-#include <libXBMC_addon.h>
#if !defined(__APPLE__)
#include <GL/glew.h>
#include "libprojectM/projectM.hpp"
#include <string>
@@ -79,8 +78,6 @@ bool lastLockStatus;
int lastPresetIdx;
unsigned int lastLoggedPresetIdx;