Merge pull request #75 from luigino/minor

revmischa · web-flow · commit 02ad1f7ba732 · 2018-06-22T11:58:47.000-07:00
Minor fixes
diff --git a/configure.ac b/configure.ac
@@ -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
diff --git a/src/libprojectM/Makefile.am b/src/libprojectM/Makefile.am
@@ -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 = \
diff --git a/src/projectM-qt/nullable.hpp b/src/projectM-qt/nullable.hpp
@@ -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() {

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,8 @@ class Nullable {`
`31`	`31`	`Nullable & operator=(const Value & value) {`
`32`	`32`	`m_value = value;`
`33`	`33`	`m_hasValue = true;`
	`34`	`+ static Nullable tmp = 0;`
	`35`	`+ return tmp;`
`34`	`36`	`}`
`35`	`37`
`36`	`38`	`void nullify() {`