]>
Commit | Line | Data |
---|---|---|
6b8b449a | 1 | diff -aurN audacity-src-1.2.0-pre2.orig/configure.in audacity-src-1.2.0-pre2/configure.in |
2 | --- audacity-src-1.2.0-pre2.orig/configure.in 2003-09-29 08:51:27.000000000 +0200 | |
3 | +++ audacity-src-1.2.0-pre2/configure.in 2003-10-16 20:27:11.645349856 +0200 | |
4 | @@ -88,9 +88,7 @@ | |
2fc00596 JB |
5 | dnl Required sublibraries |
6 | dnl | |
7 | ||
8 | -BUILDLIBS="$BUILDLIBS expat/expat.a" | |
9 | -EXTRAOBJS="$EXTRAOBJS ../lib-src/expat/expat.a" | |
10 | -CXXFLAGS="$CXXFLAGS -I../lib-src/expat" | |
11 | +LIBS="$LIBS -lexpat" | |
12 | ||
13 | dnl TODO enable/disable allegro | |
14 | BUILDLIBS="$BUILDLIBS allegro/allegro.a" | |
6b8b449a | 15 | @@ -656,7 +654,7 @@ |
16 | esac | |
2fc00596 | 17 | |
2fc00596 | 18 | AC_CONFIG_FILES([Makefile src/Makefile lib-src/Makefile \ |
6b8b449a | 19 | - lib-src/allegro/Makefile lib-src/expat/Makefile \ |
20 | + lib-src/allegro/Makefile \ | |
21 | lib-src/libnyquist/Makefile \ | |
22 | locale/Makefile tests/Makefile]) | |
23 | ||
24 | diff -aurN audacity-src-1.2.0-pre2.orig/src/commands/CommandManager.h audacity-src-1.2.0-pre2/src/commands/CommandManager.h | |
25 | --- audacity-src-1.2.0-pre2.orig/src/commands/CommandManager.h 2003-09-29 08:51:27.000000000 +0200 | |
26 | +++ audacity-src-1.2.0-pre2/src/commands/CommandManager.h 2003-10-16 20:27:11.650349096 +0200 | |
27 | @@ -43,6 +43,7 @@ | |
28 | #include <wx/hashmap.h> | |
29 | ||
30 | #include "../xml/XMLTagHandler.h" | |
31 | +#include <expat.h> | |
32 | ||
33 | class CommandFunctor | |
34 | { | |
35 | diff -aurN audacity-src-1.2.0-pre2.orig/src/xml/XMLFileReader.h audacity-src-1.2.0-pre2/src/xml/XMLFileReader.h | |
36 | --- audacity-src-1.2.0-pre2.orig/src/xml/XMLFileReader.h 2003-09-29 08:51:27.000000000 +0200 | |
37 | +++ audacity-src-1.2.0-pre2/src/xml/XMLFileReader.h 2003-10-16 20:27:52.144193096 +0200 | |
38 | @@ -8,7 +8,8 @@ | |
2fc00596 | 39 | |
6b8b449a | 40 | **********************************************************************/ |
2fc00596 JB |
41 | |
42 | -#include "xmlparse/xmlparse.h" | |
6b8b449a | 43 | +/*#include "xmlparse/xmlparse.h"*/ |
2fc00596 JB |
44 | +#include <expat.h> |
45 | ||
6b8b449a | 46 | #include "XMLTagHandler.h" |
47 |