e1lama/stk
1
0
Fork 0
mirror of https://github.com/thestk/stk synced 2026-04-22 23:44:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/thestk/stk

Browse Source
This commit is contained in:
Gary Scavone
2014-01-18 15:56:04 -05:00
parent 9e6a25d046 8912a5c0af
commit 1874c0efa9
9 changed files with 31 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Makefile.in
View File

@@ -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 :

2
src/Stk.cpp
View File

@@ -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