Use the patches for 2.0.0, not those for 0.1.7 (logged by bento).

This commit is contained in:
Trevor Johnson
2002-05-25 16:43:52 +00:00
parent 870588c1a4
commit 51e23d501f
4 changed files with 13 additions and 44 deletions

View File

@@ -1,18 +0,0 @@
--- Makefile.in.orig Mon Apr 30 03:30:32 2001
+++ Makefile.in Mon Apr 30 03:30:56 2001
@@ -7,12 +7,10 @@
####### Compiler, tools and options
-CC = gcc
-CXX = g++
-CFLAGS = -pipe -Wall -O3 -ffast-math -DNO_DEBUG -Wno-unused -g
-CXXFLAGS= -pipe -Wall -O3 -ffast-math -DNO_DEBUG -Wno-unused -g
+CFLAGS += -Wall -DNO_DEBUG -Wno-unused -g
+CXXFLAGS+= -Wall -DNO_DEBUG -Wno-unused -g
INCPATH = -I/usr/X11R6/include
-LINK = g++
+LINK = ${CXX}
LFLAGS =
LIBS = -L/usr/X11R6/lib -lfltk -lGL -lXext -lX11 -lm
MOC = moc

View File

@@ -0,0 +1,13 @@
$FreeBSD$
--- SpiralLoops.C.orig Thu Apr 19 13:48:11 2001
+++ SpiralLoops.C Thu May 23 02:16:36 2002
@@ -308,7 +308,7 @@
Run = (Sample *(*)()) dlsym(handle, "Run__Fv");
- if ((error = dlerror()) != NULL)
+ if ((error = (char *)dlerror()) != NULL)
{
cerr<<"Error linking to plugin:"<<endl;
fputs(error, stderr);

View File

@@ -1,13 +0,0 @@
SpiralLoops.C:196: assignment to `char *' from `const char *' discards qualifiers
--- SpiralLoops.h.orig Sun Nov 26 07:53:44 2000
+++ SpiralLoops.h Wed Dec 6 21:55:54 2000
@@ -85,7 +85,7 @@
short *(*Run)(void);
void (*Destroy)(void);
void *handle;
- char *error;
+ const char *error;
short *m_PluginBuffer;
bool m_PluginOpen;
bool m_PluginLinked;

View File

@@ -1,13 +0,0 @@
SpiralSound/Midi.C:54: `O_SYNC' undeclared (first use this function)
--- SpiralSound/Midi.C.orig Sun Nov 26 07:52:41 2000
+++ SpiralSound/Midi.C Wed Dec 6 14:22:58 2000
@@ -51,7 +51,7 @@
{
if (!SpiralInfo::WANTMIDI) return;
- m_MidiFd = open(SpiralInfo::MIDIFILE.c_str(),O_RDONLY|O_SYNC);
+ m_MidiFd = open(SpiralInfo::MIDIFILE.c_str(),O_RDONLY);
pipe(m_Pipefd);
fcntl(m_Pipefd[0],F_SETFL,O_NONBLOCK);