Skip to content

install additional headers needed to compile against libprojectm #53

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 11, 2018
Merged

install additional headers needed to compile against libprojectm #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a28a24e
install additional headers needed to compile against libprojectm
walshbp Apr 9, 2018
0cf9fb0
do not install config.h. Remove config.h from Common.hpp
Apr 10, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/libprojectM/Common.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
#include <typeinfo>
#include <cstdarg>
#include <cassert>
#include "config.h"

#ifdef _MSC_sVER
#define strcasecmp(s, t) _strcmpi(s, t)
#endif
Expand Down
2 changes: 1 addition & 1 deletion src/libprojectM/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Member

@revmischa revmischa Apr 10, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

Copy link
Contributor Author

@walshbp walshbp Apr 10, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So Common.hpp includes config.h as of 4/5. Commit log says "Add FTGL configure flag". I can remove config.h from Common.hpp but I would break whatever was being tried with the FTGL configure flag. For places that need this flag, could we include config.h at the lower level files?

Copy link
Member

@revmischa revmischa Apr 10, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think that sounds like a fine idea, yes 👍

Copy link
Member

@revmischa revmischa Apr 10, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://github.com/projectM-visualizer/projectm/pull/48/files#r180543415

lib_LTLIBRARIES = libprojectM.la # public, possibly-shared library

# link flags
Expand Down