Cross compiling for Xming.exe since Mesa merge

[Colin Harrison]

Hi,

Since the mesa 6.3.1 merge I've had to do the following to crosscompile the
Xming.exe X server for Windows.

http://freedesktop.org/wiki/Xming

In xorg/xc
make World CROSSCOMPILEDIR=/usr/local/cross-tools/i386-mingw32msvc/bin
LOCAL_LDFLAGS=-mwindows

i.e. I'm compiling on linux using Mingw to produce Windows exe's


I have to revert part of extras/Mesa/include/GL/glxext.h with the following
from it's 1.3 version, to stop syntax errors:-

--- ./extras/Mesa/include/GL/save_glxext.h      2005-08-10
17:06:14.000000000 +0100
+++ ./extras/Mesa/include/GL/glxext.h   2005-08-10 17:14:35.000000000 +0100
@@ -615,6 +615,8 @@

 #ifndef GLX_OML_sync_control
 #define GLX_OML_sync_control 1
+/* Include ISO C99 integer types for OML_sync_control; need a better test
*/
+#include <inttypes.h>
 #ifdef GLX_GLXEXT_PROTOTYPES
 extern Bool glXGetSyncValuesOML (Display *, GLXDrawable, int64_t *, int64_t
*, int64_t *);
 extern Bool glXGetMscRateOML (Display *, GLXDrawable, int32_t *, int32_t
*);


Also the following patch is required if built using mesa (#define
GlxUseWindows NO in config/cf/host.def):-


--- ./programs/Xserver/GL/mesa/X/save_Imakefile 2005-08-10
19:13:33.000000000 +0100
+++ ./programs/Xserver/GL/mesa/X/Imakefile      2005-08-11
00:20:15.000000000 +0100
@@ -22,7 +22,7 @@
 #endif


-LinkSourceFile(compsize.c,$(LIBSRC)/GL/glx)
+LinkSourceFile(compsize.c,$(MESASRCDIR)/src/glx/x11)

   DRIVER_SRCS = $(XMESA_SRCS)
   DRIVER_OBJS = $(XMESA_OBJS)
@@ -37,8 +37,8 @@

 #endif

-     GLX_SRCS = xf86glx.c xf86glx_util.c compsize.c
-     GLX_OBJS = xf86glx.o xf86glx_util.o compsize.o
+     GLX_SRCS = xf86glx.c xf86glx_util.c compsize.c compsizeold.c
+     GLX_OBJS = xf86glx.o xf86glx_util.o compsize.o compsizeold.o

          SRCS = $(DRIVER_SRCS) $(GLX_SRCS) $(COMMON_SRCS)
          OBJS = $(DRIVER_OBJS) $(GLX_OBJS) $(COMMON_OBJS)


where compsizeold.c is the code dropped from the new version of compsize.c
(kludged back in for now) File attached.

When building normally (i.e. GlxUseWindows YES) patch:-

--- ./programs/Xserver/GL/windows/save_Imakefile        2005-08-10
17:02:35.000000000 +0100
+++ ./programs/Xserver/GL/windows/Imakefile     2005-08-10
14:32:35.000000000 +0100
@@ -1,9 +1,9 @@
 #include <Server.tmpl>

-LinkSourceFile(compsize.c,$(LIBSRC)/GL/glx)
+LinkSourceFile(compsize.c,$(MESASRCDIR)/src/glx/x11)

-         SRCS = compsize.c indirect.c glwrap.c
-         OBJS = compsize.o indirect.o glwrap.o
+         SRCS = compsize.c indirect.c glwrap.c compsizeold.c
+         OBJS = compsize.o indirect.o glwrap.o compsizeold.o

      INCLUDES = -I. \
                -I$(INCLUDESRC) \

This latter version doesn't use mesa and wraps GL instead (faster version)

This may be of help to anyone who uses Xming or Xwin.
Both servers lack a maintainer at the moment.
When I know more I'll supply a better solution.

Colin Harrison
-------------- next part --------------
A non-text attachment was scrubbed...
Name: compsizeold.c
Type: application/octet-stream
Size: 8958 bytes
Desc: not available
URL: <http://lists.x.org/archives/xorg/attachments/20050811/261ed217/attachment.obj>