Bo Peng wrote:
Can the following be applied (lyx1.4svn)?
Index: src/support/gzstream.h
===================================================================
--- src/support/gzstream.h (revision 14087)
+++ src/support/gzstream.h (working copy)
@@ -32,9 +32,7 @@
// standard C++ with new header file names and std:: namespace
#include <iostream>
#include <fstream>
-#ifdef HAVE_ZLIB_H
-# include <zlib.h>
-#endif
+#include <zlib.h>
// For LyX
#define GZSTREAM_NAMESPACE gz
zlib.h is always required so this test is meaningless.
BTW, with only a few changes (mostly qt3 => qt2 directory name
change), the current scons system can compile lyx1.4 smoothly. I can
1. do nothing for 1.4.x
2. put a separate development/scons system in 1.4.x branch
3. add changes to 1.5/scons so that scons can automatically detect
1.4/1.5 and compile appropriately. That is to say, people who want
scons for 1.4.x can copy development/scons from trunk and compile.
I prefer method 3, giving the fast evolving nature of the current
scons system. Any opinion?
My vote does not count much but 3 is a sensible thing to do. I am using
scons for lyx/qt3 right now and I can tell you that it compiles three
times as fast as autotools on windows.
One bug though: When I pass CCFLAGS="-O3 -w" to scons, I see that the
options is just appended to the default options (-O2 -Wall), ex:
g++ -o release\common\frontends\qt3\QCommandBuffer.o -c -O3 -w -Wall -O2
This happens also with frontend=qt4 but this is new.
Abdel.
