To compile with this patch, use: tar -zxvf unix.tar.gz patch -Np0 < music.diff cd music/source make sudo make install diff -ur music/source/barcmprs.h music/s0/barcmprs.h --- music/source/barcmprs.h 2004-09-29 17:31:09.000000000 +0100 +++ music/s0/barcmprs.h 2011-03-31 21:25:14.753478774 +0100 @@ -16,7 +16,6 @@ // Implimented in BEZIER.CPP due to overlay manager class BarCompression; class BarCompressionContainer { -friend BarCompression; // For barCompressionConstant (saves memory) public: BarCompressionContainer(int constant); ~BarCompressionContainer(); @@ -34,7 +33,6 @@ static void lock() { isLocked=1; } // NOT ++ static void unlock() { isLocked=0; } // NOT -- static int getLockedStatus() { return(isLocked); } // For scaleDown -protected: void allocateArray(int newLen); BarCompression* *theArray; int theArrayLen; diff -ur music/source/beaming.cpp music/s0/beaming.cpp --- music/source/beaming.cpp 2004-09-29 17:31:08.000000000 +0100 +++ music/s0/beaming.cpp 2011-03-31 21:22:08.305478770 +0100 @@ -1,3 +1,4 @@ +using namespace std; // This file is part of the Manuscript Writer source code, // copyright (C) 1994-2004 Silas S. Brown @@ -16,6 +17,8 @@ #include "tempstor.h" #ifndef JUNE1999_STRIPDOWN_HACK #include +#else +#include #endif int scaleDown(int position,int uncompressedAdd,const char* theBarCmp); diff -ur music/source/bezier.cpp music/s0/bezier.cpp --- music/source/bezier.cpp 2004-09-29 17:31:08.000000000 +0100 +++ music/s0/bezier.cpp 2011-03-31 21:25:32.101478749 +0100 @@ -17,8 +17,8 @@ #include "warn.h" #include "score.h" // For getMaxHorizUnit() in justification #include -#include #ifndef JUNE1999_STRIPDOWN_HACK +#include #include #endif #include diff -ur music/source/braille.cpp music/s0/braille.cpp --- music/source/braille.cpp 2004-09-29 17:31:08.000000000 +0100 +++ music/s0/braille.cpp 2011-03-31 21:26:40.309478775 +0100 @@ -16,11 +16,11 @@ #include #include #include "tempstor.h" -#include #include #include "debug.h" //#include "speech.h" #ifndef JUNE1999_STRIPDOWN_HACK +#include #include #endif @@ -221,7 +221,6 @@ ~BrailleChord(); void addNote(int tone,int lineNo); static void reInitOctaves() { initialiseOctaves=1; } // For start of next part -protected: const int theTopDownStatus,theBeams,theOpenBeam,theCloseBeam; struct BrChordStruct { int tone,lineNo; char nextBrAccidental; diff -ur music/source/convert/multimid.cpp music/s0/convert/multimid.cpp --- music/source/convert/multimid.cpp 2004-09-29 17:31:11.000000000 +0100 +++ music/s0/convert/multimid.cpp 2011-03-31 21:30:23.249478763 +0100 @@ -20,7 +20,6 @@ #include "multimid.h" #include "debug.h" #include "tempstor.h" -#include #define HEADER_CHUNK 0x4D546864L /* "MThd" MSB-LSB */ #define TRACK_CHUNK 0x4D54726BL /* "MTrk" MSB-LSB */ diff -ur music/source/convert/sneakmod.cpp music/s0/convert/sneakmod.cpp --- music/source/convert/sneakmod.cpp 2004-09-29 17:31:11.000000000 +0100 +++ music/s0/convert/sneakmod.cpp 2011-03-31 21:30:54.329478808 +0100 @@ -14,6 +14,7 @@ #include "..\\version.h" #else #include "../version.h" +#include #endif #include #ifndef JUNE1999_STRIPDOWN_HACK diff -ur music/source/convert/varqmid.cpp music/s0/convert/varqmid.cpp --- music/source/convert/varqmid.cpp 2004-09-29 17:31:11.000000000 +0100 +++ music/s0/convert/varqmid.cpp 2011-03-31 21:31:24.873478759 +0100 @@ -18,7 +18,7 @@ #ifndef COMPILING_MWR_LITE // Put this in DEBUG.H or something -#include +#include #define debugVariable(p) (cout<<"Debugger: "<<__FILE__<<" "<< __LINE__<<": "<<#p<<"="< -#endif #include +#endif #include #include diff -ur music/source/convert/varqmid.h music/s0/convert/varqmid.h --- music/source/convert/varqmid.h 2004-09-29 17:31:11.000000000 +0100 +++ music/s0/convert/varqmid.h 2011-03-31 21:33:24.433478802 +0100 @@ -17,16 +17,15 @@ #include "tempstor.h" void vqm_evntRd(FILE* f); class VariableQuantiseMidi { +public: friend void vqm_evntRd(FILE* f,BYTE dat); class Part; class LegatoBuffer; friend class VariableQuantiseMidi::Part; friend class VariableQuantiseMidi::LegatoBuffer; -public: static VariableQuantiseMidi* createNewOrNull(FILE* fp,const char* keySignature); VariableQuantiseMidi(MultiTrackMidi* obj,int tonicSemitone); ~VariableQuantiseMidi(); void processEntireMidi(FILE* mwrOutputFile); -protected: struct Instrument { BYTE progNo; unsigned bankNo; @@ -77,7 +76,6 @@ void finishCurrentBar(); void flushLastChord(); Part* nextPart; - protected: void outputChord(const char* chord,long length,BYTE dontNeedFirstOctaveOnFirstNote); // chord is NULL for "r" (and no ties etc) void lockCloseTie(); void openTieIfClosed(); @@ -110,7 +108,6 @@ void transferNote(MidiNoteInProgress* note); // Will delete when finished void registerEvent(Instrument instrument,long clock,BYTE channel,VariableQuantiseMidi* parent); void flushAllEvents(long clock,VariableQuantiseMidi* parent); - protected: MidiNoteInProgress* theFirstNote; } legatoBuffer; Instrument instToSet[16]; diff -ur music/source/debug.h music/s0/debug.h --- music/source/debug.h 2004-09-29 17:31:09.000000000 +0100 +++ music/s0/debug.h 2011-03-31 21:22:55.913478302 +0100 @@ -1,3 +1,4 @@ +#include // This file is part of the Manuscript Writer source code, // copyright (C) 1994-2004 Silas S. Brown diff -ur music/source/doc.cpp music/s0/doc.cpp --- music/source/doc.cpp 2004-09-29 17:31:08.000000000 +0100 +++ music/s0/doc.cpp 2011-03-31 21:27:08.569479870 +0100 @@ -24,10 +24,10 @@ #include #endif #include -#include #include "stdgrap.h" #include "speech.h" #ifndef JUNE1999_STRIPDOWN_HACK +#include #include "graphics\\lowlevel.h" #else #include "graphics/lowlevel.h" diff -ur music/source/drawbar.cpp music/s0/drawbar.cpp --- music/source/drawbar.cpp 2004-09-29 17:31:08.000000000 +0100 +++ music/s0/drawbar.cpp 2011-03-31 21:27:48.649479075 +0100 @@ -10,7 +10,6 @@ // you want to send me a patch, that's fine). // ----------------------------------------------------------------------------- -#include #include "getstuff.h" #include "score.h" #include "play.h" @@ -22,6 +21,7 @@ #include #include #ifndef JUNE1999_STRIPDOWN_HACK +#include #include #endif #include "braille.h" @@ -346,7 +346,7 @@ Beaming theBeaming; int add,unCompressedHUnitOffset=0,compressedHUnitNo=horizUnitNo,restUnitOffset=0,rUnitOffset=0; char headerText=0; updateDebugLine(); - char* commaPos=strrchr(notes,','); // Last comma in the bar (NB X, $X and $I have char 255 as commas) + const char* commaPos=strrchr(notes,','); // Last comma in the bar (NB X, $X and $I have char 255 as commas) if (commaPos) { if (doComma) { // If not, there has already been a comma (they are trying to add a third or higher part) unCompressedHUnitOffset=horizUnitNo; // So can pass as a temporary diff -ur music/source/edit.cpp music/s0/edit.cpp --- music/source/edit.cpp 2004-09-29 17:31:08.000000000 +0100 +++ music/s0/edit.cpp 2011-03-31 21:28:09.385478749 +0100 @@ -36,10 +36,10 @@ #include #include #include "stdgrap.h" -#include #include "speech.h" #include "litstuff.h" #ifndef JUNE1999_STRIPDOWN_HACK +#include #include "graphics\\bgiout.h" #include "graphics\\lowlevel.h" #else diff -ur music/source/fastwork.h music/s0/fastwork.h --- music/source/fastwork.h 2004-09-29 17:31:09.000000000 +0100 +++ music/s0/fastwork.h 2011-03-31 21:28:26.009478870 +0100 @@ -15,7 +15,6 @@ // NOTE: This one implimented with ints (should really be a template), not bytes #define FASTWORK_H #include "tempstor.h" -#include class FastWorkspace { public: FastWorkspace(); diff -ur music/source/graphics/bitmap.cpp music/s0/graphics/bitmap.cpp --- music/source/graphics/bitmap.cpp 2004-09-29 17:31:11.000000000 +0100 +++ music/s0/graphics/bitmap.cpp 2011-03-31 21:33:38.529478889 +0100 @@ -23,11 +23,11 @@ #include #include "getstuff.h" #include "mouse.h" -#include #include "play.h" #include "mask.h" #include "tempstor.h" #ifndef JUNE1999_STRIPDOWN_HACK +#include #include "..\\debug.h" #else #include "../debug.h" diff -ur music/source/graphics/graphlib.cpp music/s0/graphics/graphlib.cpp --- music/source/graphics/graphlib.cpp 2004-09-29 17:31:11.000000000 +0100 +++ music/s0/graphics/graphlib.cpp 2011-03-31 21:33:48.741478684 +0100 @@ -24,9 +24,9 @@ #include "bitmap.h" #include #include -#include #include #ifndef JUNE1999_STRIPDOWN_HACK +#include #include "..\\tempstor.h" #include "..\\debug.h" #else diff -ur music/source/graphics/raster.cpp music/s0/graphics/raster.cpp --- music/source/graphics/raster.cpp 2004-09-29 17:31:11.000000000 +0100 +++ music/s0/graphics/raster.cpp 2011-03-31 21:33:59.485478493 +0100 @@ -22,8 +22,8 @@ #ifndef JUNE1999_STRIPDOWN_HACK #include #endif -#include #ifdef BORLAND_DOS +#include #include #endif #define min(a,b) (((a)<(b))?(a):(b)) diff -ur music/source/menu.cpp music/s0/menu.cpp --- music/source/menu.cpp 2004-09-29 17:31:08.000000000 +0100 +++ music/s0/menu.cpp 2011-03-31 21:28:38.793478161 +0100 @@ -13,8 +13,8 @@ #include "platform.h" #include #include -#include #ifdef BORLAND_DOS +#include #include #include #include diff -ur music/source/midi/cmfout.cpp music/s0/midi/cmfout.cpp --- music/source/midi/cmfout.cpp 2004-09-29 17:31:10.000000000 +0100 +++ music/s0/midi/cmfout.cpp 2011-03-31 21:29:40.957478765 +0100 @@ -11,10 +11,10 @@ // ----------------------------------------------------------------------------- #include -#include #include #include #ifndef JUNE1999_STRIPDOWN_HACK +#include #include #endif #include "play.h" diff -ur music/source/midi/setinst.cpp music/s0/midi/setinst.cpp --- music/source/midi/setinst.cpp 2004-09-29 17:31:10.000000000 +0100 +++ music/s0/midi/setinst.cpp 2011-03-31 21:29:59.821479126 +0100 @@ -12,8 +12,8 @@ // ----------------------------------------------------------------------------- #include #include -#include #ifndef JUNE1999_STRIPDOWN_HACK +#include #include #endif #include "tempstor.h" diff -ur music/source/midi/sound.c music/s0/midi/sound.c --- music/source/midi/sound.c 2004-09-29 17:31:10.000000000 +0100 +++ music/s0/midi/sound.c 2011-03-31 21:29:25.965479057 +0100 @@ -45,8 +45,8 @@ #include #include #endif -#include #ifndef JUNE1999_STRIPDOWN_HACK +#include #include #endif #include "mydef.h" diff -ur music/source/midi/wav.cpp music/s0/midi/wav.cpp --- music/source/midi/wav.cpp 2004-09-29 17:31:10.000000000 +0100 +++ music/s0/midi/wav.cpp 2011-03-31 21:30:09.497478503 +0100 @@ -36,7 +36,6 @@ #include "sbwav.h" #include "sound.h" #include "speech.h" -#include #define MAX_WAV_NOTES VOICE_ARRAY_SIZE FILE* openAFile(const char* filename,const char* type="r",const char* extention="",char* fullname=NULL); diff -ur music/source/platform.h music/s0/platform.h --- music/source/platform.h 2004-09-29 17:31:09.000000000 +0100 +++ music/s0/platform.h 2011-03-31 21:21:09.521478458 +0100 @@ -1,3 +1,4 @@ +using namespace std; // This file is part of the Manuscript Writer source code, // copyright (C) 1994-2004 Silas S. Brown diff -ur music/source/test.cpp music/s0/test.cpp --- music/source/test.cpp 2004-09-29 17:31:09.000000000 +0100 +++ music/s0/test.cpp 2011-03-31 21:29:02.725478707 +0100 @@ -63,13 +63,13 @@ #include "braille.h" #include "version.h" #include "warn.h" -#include #include "midiutil.h" #include "tempstor.h" #include "litstuff.h" #include "mod.h" int fast_kbhit(); void fast_kbflush(); #ifdef BORLAND_DOS +#include extern char canUseNetwork; #endif extern char carefulWithInterrupts,altParserEnabled,progressIndicatorRequired,singTheText,disablePitchBend; diff -ur music/source/warn.cpp music/s0/warn.cpp --- music/source/warn.cpp 2004-09-29 17:31:09.000000000 +0100 +++ music/s0/warn.cpp 2011-03-31 21:29:10.205478765 +0100 @@ -16,10 +16,10 @@ #include #ifdef BORLAND_DOS #include +#include #endif #include #include -#include #include "litstuff.h" #include "version.h" #include "debug.h" diff -ur music/source/Makefile music/s0/Makefile --- music/source/Makefile 2004-09-29 17:31:09.000000000 +0100 +++ music/s0/Makefile 2011-03-31 21:29:10.205478765 +0100 @@ -136,11 +136,11 @@ mwr.elc: mwr.el emacs -batch -f batch-byte-compile mwr.el 2> /dev/null || xemacs -batch -f batch-byte-compile mwr.el 2> /dev/null # ssssh don't scare them! -installemacs: mwr.elc mwr2.el +installemacs: mwr.elc mwr.el $(SHELL) -ec ' \ export R=`echo $(emacsFilename2) | $(fancySedScript)` ; \ mv mwr.elc $(emacsFilename2) ; \ - cat mwr2.el | sed -e "s/FILE/$$R/" > $(emacsFilename)' + cat mwr.el | sed -e "s/FILE/$$R/" > $(emacsFilename)' ###### INSTALL STUFF ########### @@ -148,7 +148,7 @@ installdocs: homepage/docfile.htm homepage/version.htm $(SHELL) -c 'if test -e $(docsDir); then rm -r $(docsDir); fi' - mkdir $(docsDir) + mkdir -p $(docsDir) cp homepage/docfile.htm $(docsDir)/mwr.htm cp homepage/version.htm $(docsDir)