From a28a24ef834c1a9427a65008f19fcb558413f1e2 Mon Sep 17 00:00:00 2001 From: Bryan Walsh Date: Mon, 9 Apr 2018 19:37:26 -0400 Subject: [PATCH 1/2] install additional headers needed to compile against libprojectm --- Makefile.am | 3 +++ src/libprojectM/Makefile.am | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 062bb3ca18..87a8741ae8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -17,6 +17,9 @@ pm_font__DATA = fonts/Vera.ttf fonts/VeraMono.ttf pm_shaders__DATA = src/libprojectM/Renderer/blur.cg \ src/libprojectM/Renderer/projectM.cg +# system headers/libraries/data to install +include_HEADERS = config.h + # find and install all preset files install-data-local: test -z $(pkgdatadir) || $(MKDIR_P) $(pm_presets_dir) diff --git a/src/libprojectM/Makefile.am b/src/libprojectM/Makefile.am index 03ac1e53f6..73d8353f61 100644 --- a/src/libprojectM/Makefile.am +++ b/src/libprojectM/Makefile.am @@ -12,7 +12,7 @@ AM_CPPFLAGS = \ $(FTGL_CFLAGS) $(CG_CFLAGS) # system headers/libraries/data to install -include_HEADERS = projectM.hpp +include_HEADERS = projectM.hpp Common.hpp dlldefs.h event.h fatal.h PCM.hpp lib_LTLIBRARIES = libprojectM.la # public, possibly-shared library # link flags From 0cf9fb0c9312d14176dfe6e53c5b780d83d5544f Mon Sep 17 00:00:00 2001 From: Bryan Walsh Date: Tue, 10 Apr 2018 18:54:12 -0400 Subject: [PATCH 2/2] do not install config.h. Remove config.h from Common.hpp --- Makefile.am | 3 --- src/libprojectM/Common.hpp | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index 87a8741ae8..062bb3ca18 100644 --- a/Makefile.am +++ b/Makefile.am @@ -17,9 +17,6 @@ pm_font__DATA = fonts/Vera.ttf fonts/VeraMono.ttf pm_shaders__DATA = src/libprojectM/Renderer/blur.cg \ src/libprojectM/Renderer/projectM.cg -# system headers/libraries/data to install -include_HEADERS = config.h - # find and install all preset files install-data-local: test -z $(pkgdatadir) || $(MKDIR_P) $(pm_presets_dir) diff --git a/src/libprojectM/Common.hpp b/src/libprojectM/Common.hpp index 368d03fad7..cd2ee04317 100755 --- a/src/libprojectM/Common.hpp +++ b/src/libprojectM/Common.hpp @@ -30,7 +30,7 @@ #include #include #include -#include "config.h" + #ifdef _MSC_sVER #define strcasecmp(s, t) _strcmpi(s, t) #endif