Merge pull request #4 from radarsat1/master

Fix several potential compilation issues on various platforms, fix ElectricGuitar script, fix version number, add McGill logo.

Makefile.in

@@ -2,29 +2,40 @@
 
 RM = /bin/rm
 
+REALTIME = @realtime@
+
 all :
 	cd src && $(MAKE)
 	cd projects/demo && $(MAKE) libdemo
+ifeq ($(REALTIME),yes)
 	cd projects/effects && $(MAKE) libeffects
 	cd projects/ragamatic && $(MAKE) libragamat
 	cd projects/eguitar && $(MAKE) libeguitar
+endif
 	cd projects/examples && $(MAKE) -f libMakefile
 
 clean : 
 	$(RM) -f *~
 	cd src && $(MAKE) clean
 	cd projects/demo && $(MAKE) clean
+ifeq ($(REALTIME),yes)
 	cd projects/effects && $(MAKE) clean
 	cd projects/ragamatic && $(MAKE) clean
 	cd projects/eguitar && $(MAKE) clean
+endif
 	cd projects/examples && $(MAKE) clean
 
 distclean: clean
 	$(RM) -rf config.log config.status autom4te.cache Makefile
 	cd src && $(MAKE) distclean
 	cd projects/demo && $(MAKE) distclean
+ifeq ($(REALTIME),yes)
 	cd projects/effects && $(MAKE) distclean
 	cd projects/ragamatic && $(MAKE) distclean
 	cd projects/eguitar && $(MAKE) distclean
+endif
 	cd projects/examples && $(MAKE) distclean
 
+install:
+	$(MAKE) -C src install
+

configure.ac

@@ -1,5 +1,5 @@
 # Process this file with autoconf to produce a configure script.
-AC_INIT(STK, 4.4, gary@music.mcgill.ca, stk)
+AC_INIT(STK, 4.4.4, gary@music.mcgill.ca, stk)
 AC_CONFIG_AUX_DIR(config)
 AC_CONFIG_SRCDIR(src/Stk.cpp)
 AC_CONFIG_FILES(Makefile src/Makefile projects/demo/Makefile projects/effects/Makefile projects/ragamatic/Makefile projects/examples/Makefile projects/examples/libMakefile projects/eguitar/Makefile)
@@ -80,7 +80,6 @@ fi
 CPPFLAGS="$CPPFLAGS $cppflag"
 
 # For debugging and optimization ... overwrite default because it has both -g and -O2
-echo "$CXXFLAGS"
 CXXFLAGS="$cxxflag"
 
 # Check compiler and use -Wall if gnu.
@@ -181,7 +180,7 @@ if test $realtime = yes; then
     fi
 
     api="$api -D__WINDOWS_MM__"
-    LIBS="-lole32 -lwinmm -lWsock32 $LIBS"
+    LIBS="-lole32 -lwinmm -lwsock32 $LIBS"
     ;;
 
     *)

include/Stk.h

@@ -236,7 +236,7 @@ protected:
   void removeSampleRateAlert( Stk *ptr );
 
   //! Internal function for error reporting that assumes message in \c oStream_ variable.
-  void handleError( StkError::Type type );
+  void handleError( StkError::Type type ) const;
 };
 
 

include/TapDelay.h

@@ -115,7 +115,7 @@ class TapDelay : public Filter
 inline StkFloat TapDelay :: lastOut( unsigned int tap ) const
 {
 #if defined(_STK_DEBUG_)
-  if ( tap >= lastFrame_.size() ) ) {
+  if ( tap >= lastFrame_.size() ) {
     oStream_ << "TapDelay::lastOut(): tap argument and number of taps are incompatible!";
     handleError( StkError::FUNCTION_ARGUMENT );
   }

projects/demo/Md2Skini.cpp

@@ -14,6 +14,7 @@
 #include "SKINI.msg"
 #include <iostream>
 #include <stdlib.h>
+#include <stdio.h>
 
 void usage(void) {
   std::cout << "\nuseage: Md2Skini <flag(s)>\n\n";

src/Makefile.in

@@ -10,6 +10,9 @@ AR = ar -rsc
 RM = /bin/rm
 LN = /bin/ln
 OBJECT_PATH = @object_path@
+LIBDIR = @libdir@
+PREFIX = @prefix@
+INCLUDEDIR = @includedir@
 vpath %.o $(OBJECT_PATH)
 
 OBJECTS	=	Stk.o Generator.o Noise.o Blit.o BlitSaw.o BlitSquare.o Granulate.o \
@@ -80,6 +83,17 @@ $(SHAREDLIB) : $(OBJECTS)
 	$(LN) -s @sharedname@ $(SHAREDLIB)
 #	$(LN) -s @sharedname@ $(SHAREDLIB).$(MAJOR)
 
+install-headers:
+	install -d $(DESTDIR)$(PREFIX)$(INCLUDEDIR)/stk
+	cp -r ../include/*.h $(DESTDIR)$(PREFIX)$(INCLUDEDIR)/stk
+
+install: $(SHAREDLIB) install-headers
+	install -d $(DESTDIR)$(PREFIX)$(LIBDIR)
+	install -m 644 $(SHAREDLIB).$(RELEASE) $(DESTDIR)$(PREFIX)$(LIBDIR)
+	ln -sf $(SHAREDLIB).$(RELEASE) $(DESTDIR)$(PREFIX)$(LIBDIR)/$(SHAREDLIB)
+	ln -sf $(SHAREDLIB).$(RELEASE) $(DESTDIR)$(PREFIX)$(LIBDIR)/$(SHAREDLIB).$(MAJOR)
+
+
 $(OBJECTS) : Stk.h
 
 clean : 

src/Stk.cpp

@@ -192,7 +192,7 @@ void Stk :: sleep(unsigned long milliseconds)
 #endif
 }
 
-void Stk :: handleError( StkError::Type type )
+void Stk :: handleError( StkError::Type type ) const
 {
   handleError( oStream_.str(), type );
   oStream_.str( std::string() ); // reset the ostringstream buffer