mirror/projectm
3
0
Fork 0
mirror of https://github.com/projectM-visualizer/projectm.git synced 2026-03-01 04:55:03 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #75 from luigino/minor

Browse Source 
Minor fixes
This commit is contained in:
Mischa Spiegelmock
2018-06-22 11:58:47 -07:00
committed by GitHub
parent 4f254fbdaf 2446808615
commit c8d064da3f
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -117,7 +117,7 @@ AS_IF([test "x$enable_qt" = "xyes"], [
AC_CHECK_PROGS(MOC, [moc-qt5 moc])
AC_CHECK_PROGS(UIC, [uic-qt5 uic])
AC_CHECK_PROGS(RCC, [rcc])
AC_CHECK_PROGS(RCC, [rcc-qt5 rcc])
if test -z "$MOC" || test -z "$UIC" || test -z "$RCC"; then
AC_MSG_ERROR([Qt utility programs moc, uic, and rcc are required.])
fi

2
src/libprojectM/Makefile.am
View File

@ -14,7 +14,7 @@ AM_CPPFLAGS = \
lib_LTLIBRARIES = libprojectM.la # public, possibly-shared library
# link flags
libprojectM_la_LDFLAGS = $(CG_LDFLAGS) -no-undefined -version-info 0:2:0
libprojectM_la_LDFLAGS = $(CG_LDFLAGS) -no-undefined -version-info 2:0:0
# link libRenderer, MilkdropPresetFactory, NativePresetFactory, and libprojectM sources
libprojectM_la_LIBADD = \

2
src/projectM-qt/nullable.hpp
View File

@ -31,6 +31,8 @@ class Nullable {
Nullable & operator=(const Value & value) {
m_value = value;
m_hasValue = true;
static Nullable tmp = 0;
return tmp;
}
void nullify() {