I've succesfully compiled, linked, and started lyx_qt4.exe.

I've used the gnuwin32 package without renaming, but I have
to fix the unistd.h including. (#if 1 -> #if 0), but this
could also be fix by adding somewhere a dummy unistd.h.

Here is a diff against head:

Index: development/scons/SConstruct
===================================================================
--- development/scons/SConstruct        (Revision 13964)
+++ development/scons/SConstruct        (Arbeitskopie)
@@ -551,10 +551,20 @@
   env['HAS_PKG_CONFIG'] = env_cache['HAS_PKG_CONFIG']

 # zlib? This is required. (fast_start assumes the existance of zlib)
-if not fast_start and not conf.CheckLibWithHeader('z', 'zlib.h', 'C'):
-    print 'Did not find libz or zlib.h, exiting!'
+#if not fast_start and not conf.CheckLibWithHeader('z', 'zlib.h', 'C'):
+if not fast_start:
+  if not use_vc and not conf.CheckLibWithHeader('z', 'zlib.h', 'C'):
+    print 'Did not find libz.lib or zlib.h, exiting!'
     Exit(1)
-
+  if use_vc:
+    if not conf.CheckHeader('zlib.h'):
+      print 'Did not find zlib.h, exiting!'
+      Exit(1)
+    if not conf.CheckLib('zlib'):
+      print 'Did not find zlib.lib, exiting!'
+      Exit(1)
+
+
 # qt libraries?
 if not fast_start:
   #

   env_functions = [
     ('asprintf', 'HAVE_ASPRINTF'),
     ('wprintf', 'HAVE_WPRINTF'),
@@ -1124,11 +1137,10 @@
 if platform_name in ['win32', 'cygwin']:
   # the final link step needs stdc++ to succeed under mingw
   # FIXME: shouldn't g++ automatically link to stdc++?
-  env['SYSTEM_LIBS'] = ['shlwapi', 'z']
   if use_vc:
-    env['SYSTEM_LIBS'].extend(['gdi32', 'shell32', 'advapi32'])
+     env['SYSTEM_LIBS'] = ['shlwapi', 'gdi32', 'shell32', 'advapi32', 'zlib']
   else:
-    env['SYSTEM_LIBS'].append('stdc++')
+     env['SYSTEM_LIBS'] = ['shlwapi', 'stdc++', 'z']
 else:
   env['SYSTEM_LIBS'] = ['z']


So you do not have any of Abdel's manifest problem, just by using
patched mingw zlib?

Bo

Reply via email to