diff --git a/Makefile.in b/Makefile.in index 2a2380e..f4f04ec 100644 --- a/Makefile.in +++ b/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 + diff --git a/configure.ac b/configure.ac index ebc433e..98d88e3 100644 --- a/configure.ac +++ b/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" ;; *) diff --git a/doc/doxygen/images/mcgill.gif b/doc/doxygen/images/mcgill.gif new file mode 100644 index 0000000..5fe2a4b Binary files /dev/null and b/doc/doxygen/images/mcgill.gif differ diff --git a/include/Stk.h b/include/Stk.h index 8e3f709..5c9c37b 100644 --- a/include/Stk.h +++ b/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; }; diff --git a/include/TapDelay.h b/include/TapDelay.h index 4aabb0b..1ce6010 100644 --- a/include/TapDelay.h +++ b/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 ); } diff --git a/projects/demo/Md2Skini.cpp b/projects/demo/Md2Skini.cpp index 5062685..d860f76 100644 --- a/projects/demo/Md2Skini.cpp +++ b/projects/demo/Md2Skini.cpp @@ -14,6 +14,7 @@ #include "SKINI.msg" #include #include +#include void usage(void) { std::cout << "\nuseage: Md2Skini \n\n"; diff --git a/projects/eguitar/tcl/Eguitar.tcl b/projects/eguitar/tcl/EGuitar.tcl similarity index 100% rename from projects/eguitar/tcl/Eguitar.tcl rename to projects/eguitar/tcl/EGuitar.tcl diff --git a/src/Makefile.in b/src/Makefile.in index 526ab26..e5641ad 100644 --- a/src/Makefile.in +++ b/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 : diff --git a/src/Stk.cpp b/src/Stk.cpp index cb608a8..8f8e106 100644 --- a/src/Stk.cpp +++ b/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