From 3458e8f13f8389a146c5b54b145dfb586af98dce Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Tue, 26 Jun 2012 10:55:45 +0200
Subject: libxcb is now a dll

---
 libxcb/src/libxcb.def            | 58 ++++++++++++++++++++++++++++++++++++++++
 libxcb/src/makefile              | 16 +++++++++--
 xorg-server/installer/vcxsrv.nsi | 38 ++++++++++++++------------
 3 files changed, 93 insertions(+), 19 deletions(-)
 create mode 100644 libxcb/src/libxcb.def

diff --git a/libxcb/src/libxcb.def b/libxcb/src/libxcb.def
new file mode 100644
index 000000000..0a8526baf
--- /dev/null
+++ b/libxcb/src/libxcb.def
@@ -0,0 +1,58 @@
+LIBRARY libxcb
+EXPORTS
+  InitWSA
+  xcb_allow_events
+  xcb_connect
+  xcb_connect_to_display_with_auth_info
+  xcb_connection_has_error
+  xcb_create_glyph_cursor
+  xcb_depth_next
+  xcb_depth_visuals_iterator
+  xcb_discard_reply
+  xcb_disconnect
+  xcb_flush
+  xcb_generate_id
+  xcb_get_atom_name
+  xcb_get_atom_name_name
+  xcb_get_atom_name_name_length
+  xcb_get_atom_name_reply
+  xcb_get_extension_data
+  xcb_get_file_descriptor
+  xcb_get_geometry
+  xcb_get_geometry_reply
+  xcb_get_maximum_request_length
+  xcb_get_property
+  xcb_get_property_reply
+  xcb_get_property_value
+  xcb_get_property_value_length
+  xcb_get_setup
+  xcb_get_window_attributes
+  xcb_get_window_attributes_reply
+  xcb_grab_pointer
+  xcb_grab_pointer_reply
+  xcb_intern_atom
+  xcb_intern_atom_reply
+  xcb_open_font
+  xcb_parse_display
+  xcb_poll_for_event
+  xcb_poll_for_reply
+  xcb_query_pointer
+  xcb_query_pointer_reply
+  xcb_query_tree
+  xcb_query_tree_children
+  xcb_query_tree_children_length
+  xcb_query_tree_reply
+  xcb_screen_allowed_depths_iterator
+  xcb_screen_next
+  xcb_setup_roots_iterator
+  xcb_shape_id
+  xcb_shape_query_extents
+  xcb_shape_query_extents_reply
+  xcb_take_socket
+  xcb_translate_coordinates
+  xcb_translate_coordinates_reply
+  xcb_ungrab_pointer
+  xcb_visualtype_next
+  xcb_wait_for_event
+  xcb_wait_for_reply
+  xcb_writev
\ No newline at end of file
diff --git a/libxcb/src/makefile b/libxcb/src/makefile
index 8205311c6..5b63df63a 100644
--- a/libxcb/src/makefile
+++ b/libxcb/src/makefile
@@ -1,5 +1,4 @@
-
-LIBRARY=libxcb
+SHAREDLIB=libxcb
 
 CSRCS = \
 		xcb_conn.c xcb_out.c xcb_in.c xcb_ext.c xcb_xid.c \
@@ -7,6 +6,19 @@ CSRCS = \
 
 DEFINES += PTW32_STATIC_LIB HAVE_GETADDRINFO
 
+INCLUDELIBFILES = \
+ $(MHMAKECONF)\libxau\$(OBJDIR)\libXau.lib
+
+LIBDIRS=$(dir $(INCLUDELIBFILES))
+
+load_makefile $(LIBDIRS:%$(OBJDIR)\=%makefile MAKESERVER=0 DEBUG=$(DEBUG);)
+
+ifeq ($(DEBUG),1)
+LINKLIBS += $(MHMAKECONF)\pthreads\pthreadVC2d.lib
+else
+LINKLIBS += $(MHMAKECONF)\pthreads\pthreadVC2.lib
+endif
+
 XCBPROTO_XCBINCLUDEDIR = ..\xcb-proto\src
 
 XMLFILES := $(notdir $(wildcard $(XCBPROTO_XCBINCLUDEDIR)\*.xml))
diff --git a/xorg-server/installer/vcxsrv.nsi b/xorg-server/installer/vcxsrv.nsi
index ac22ac8dc..09ad13bcf 100644
--- a/xorg-server/installer/vcxsrv.nsi
+++ b/xorg-server/installer/vcxsrv.nsi
@@ -67,23 +67,6 @@ Section "VcXsrv (required)"
   IfFileExists "$INSTDIR\opengl32.dll" 0 +2
     Delete "$INSTDIR\opengl32.dll"
 
-  SectionGetFlags ${VcXsrv_debug_version"} $0
-  IntCmp $0 0 nodebug
-  nodebug:
-    IfFileExists "$INSTDIR\vcxsrv_dbg.exe" 0 +2
-      Delete "$INSTDIR\vcxsrv_dbg.exe"
-    IfFileExists "$INSTDIR\vcxsrv_dbg.pdb" 0 +2
-      Delete "$INSTDIR\vcxsrv_dbg.pdb"
-    IfFileExists "$INSTDIR\swrast_dri_dbg.dll" 0 +2
-      Delete "$INSTDIR\swrast_dri_dbg.dll"
-    IfFileExists "$INSTDIR\swrastwgl_dri_dbg.dll" 0 +2
-      Delete "$INSTDIR\swrastwgl_dri_dbg.dll"
-    IfFileExists "$INSTDIR\dxtn_dbg.dll" 0 +2
-      Delete "$INSTDIR\dxtn_dbg.dll"
-    IfFileExists "$INSTDIR\msvcr100d.dll" 0 +2
-      Delete "$INSTDIR\msvcr100d.dll"
-  done:
-
   ; Put files there
   File "..\obj\servrelease\vcxsrv.exe"
   File "..\protocol.txt"
@@ -109,6 +92,7 @@ Section "VcXsrv (required)"
   File "..\dxtn.dll"
   File "..\..\libxml2\bin\libxml2.dll"
   File "..\..\zlib\obj\release\zlib1.dll"
+  File "..\..\libxcb\src\obj\release\libxcb.dll"
   File "..\..\libXau\obj\release\libXau.dll"
   File "..\..\libX11\obj\release\libX11.dll"
   File "..\..\libxml2\bin\iconv.dll"
@@ -209,6 +193,25 @@ Section "VcXsrv debug version" VcXsrv_debug_version
 
 SectionEnd
 
+Section -removedbg
+  SectionGetFlags ${VcXsrv_debug_version} $0
+  IntCmp $0 0 nodebug done done
+  nodebug:
+    IfFileExists "$INSTDIR\vcxsrv_dbg.exe" 0 +2
+      Delete "$INSTDIR\vcxsrv_dbg.exe"
+    IfFileExists "$INSTDIR\vcxsrv_dbg.pdb" 0 +2
+      Delete "$INSTDIR\vcxsrv_dbg.pdb"
+    IfFileExists "$INSTDIR\swrast_dri_dbg.dll" 0 +2
+      Delete "$INSTDIR\swrast_dri_dbg.dll"
+    IfFileExists "$INSTDIR\swrastwgl_dri_dbg.dll" 0 +2
+      Delete "$INSTDIR\swrastwgl_dri_dbg.dll"
+    IfFileExists "$INSTDIR\dxtn_dbg.dll" 0 +2
+      Delete "$INSTDIR\dxtn_dbg.dll"
+    IfFileExists "$INSTDIR\msvcr100d.dll" 0 +2
+      Delete "$INSTDIR\msvcr100d.dll"
+  done:
+SectionEnd
+
 ;--------------------------------
 
 ; Uninstaller
@@ -251,6 +254,7 @@ Section "Uninstall"
   Delete "$INSTDIR\dxtn_dbg.dll"
   Delete "$INSTDIR\swrastwgl_dri.dll"
   Delete "$INSTDIR\swrastwgl_dri_dbg.dll"
+  Delete "$INSTDIR\libxcb.dll"
   Delete "$INSTDIR\libXau.dll"
   Delete "$INSTDIR\libX11.dll"
   Delete "$INSTDIR\libxml2.dll"
-- 
cgit v1.2.3