Skip to content

Add FTGL configure flag #48

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 5, 2018
Merged

Add FTGL configure flag #48

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
c4c172a
Add FTGL configure flag
deltaoscarmike Apr 5, 2018
22d63c5
Fix OSX build
deltaoscarmike Apr 5, 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
6 changes: 3 additions & 3 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ before_install:

# TODO: test different combinations of flags, --enable-sdl, --enable-qt, etc
script:
- ./configure --enable-sdl --prefix=$PWD/local && make -j8 && make install # build from checkout
- make dist && tar -zxf projectM-*.tar.gz && cd projectM-* && ./configure --enable-sdl --prefix=$PWD/dist_install && make -j8 && make install # build from dist
- ./configure --enable-sdl --enable-ftgl --prefix=$PWD/local && make -j8 && make install # build from checkout
- make dist && tar -zxf projectM-*.tar.gz && cd projectM-* && ./configure --enable-sdl --enable-ftgl --prefix=$PWD/dist_install && make -j8 && make install # build from dist
- echo "PWD $PWD"
- ls .
- test -e src/projectM-sdl/projectMSDL
Expand Down Expand Up @@ -56,7 +56,7 @@ matrix:
- os: osx
osx_image: xcode8
env:
- MATRIX_EVAL="brew update && brew install sdl2"
- MATRIX_EVAL="brew update && brew install sdl2 && brew install ftgl"

notifications:
email:
Expand Down
10 changes: 10 additions & 0 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,15 @@ AS_IF([test "x$enable_sdl" = "xyes"], [
AM_PATH_SDL2($SDL_VERSION, :, AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!]))
])

dnl FTGL
AC_ARG_ENABLE([ftgl],
AS_HELP_STRING([--enable-ftgl], [FTGL support to display text such as preset title, stats, fps, ...]),
[], [enable_ftgl=no])
AS_IF([test "x$enable_ftgl" = "xyes"], [
PKG_CHECK_MODULES(FTGL, [ftgl], [], [AC_MSG_ERROR([libftgl is required.])])
AC_DEFINE([USE_FTGL], [1], [Define USE_FTGL])
])

dnl from https://stackoverflow.com/questions/30897170/ac-subst-does-not-expand-variable answer: https://stackoverflow.com/a/30960268
dnl ptomato https://stackoverflow.com/users/172999/ptomato
AC_SUBST([PACKAGE])
Expand Down Expand Up @@ -118,4 +127,5 @@ Applications:
libprojectM: yes
SDL: ${enable_sdl}
Qt & Pulseaudio: ${enable_qt}
FTGL: ${enable_ftgl}
])
1 change: 1 addition & 0 deletions src/libprojectM/Common.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
#include <typeinfo>
#include <cstdarg>
#include <cassert>
#include "config.h"
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.

in re #53 (comment) -
is this necessary in Common.hpp? this header is (probably) needed to be "public" and shouldn't include config.h which is "private" to the project

Copy link
Collaborator Author

@deltaoscarmike deltaoscarmike Apr 10, 2018

Choose a reason for hiding this comment

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

It could be deleted, I should have defined "USE_FTGL" with a cflag instead.

#ifdef _MSC_sVER
#define strcasecmp(s, t) _strcmpi(s, t)
#endif
Expand Down
9 changes: 5 additions & 4 deletions src/libprojectM/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@ CLEANFILES=
SUBDIRS=Renderer NativePresetFactory MilkdropPresetFactory

AM_CPPFLAGS = \
-include $(top_builddir)/config.h \
-DSYSCONFDIR=\""$(sysconfdir)"\" \
-I$(top_srcdir)/src/libprojectM \
-I$(top_srcdir)/src/libprojectM/Renderer
-include $(top_builddir)/config.h \
-DSYSCONFDIR=\""$(sysconfdir)"\" \
-I$(top_srcdir)/src/libprojectM \
-I$(top_srcdir)/src/libprojectM/Renderer \
${FTGL_CFLAGS}

# system headers/libraries/data to install
include_HEADERS = projectM.hpp
Expand Down
7 changes: 6 additions & 1 deletion src/libprojectM/Renderer/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,9 @@ libRenderer_la_SOURCES = \


libRenderer_la_CPPFLAGS = ${my_CFLAGS} \
-I$(top_srcdir)/src/libprojectM
-I$(top_srcdir)/src/libprojectM \
${FTGL_CFLAGS}


libRenderer_la_LDFLAGS = \
${FTGL_LIBS}