[Exult-cvs-logs] SF.net SVN: exult:[7523] exult/trunk/exult.cc

[<do...@us...>]

Revision: 7523
          http://sourceforge.net/p/exult/code/7523
Author:   dominus
Date:     2016-01-10 14:30:14 +0000 (Sun, 10 Jan 2016)
Log Message:
-----------
Fixed compilation with SDL2 and X11.
Thanks to Jason Galens

Modified Paths:
--------------
    exult/trunk/exult.cc

Modified: exult/trunk/exult.cc
===================================================================
--- exult/trunk/exult.cc	2015-10-26 15:17:50 UTC (rev 7522)
+++ exult/trunk/exult.cc	2016-01-10 14:30:14 UTC (rev 7523)
@@ -1049,7 +1049,11 @@
 #endif
 	xfd = ConnectionNumber(info.info.x11.display);
 	Server_init();          // Initialize server (for map-editor).
+#if SDL_VERSION_ATLEAST(2, 0, 0)
+	xdnd = new Xdnd(info.info.x11.display, info.info.x11.window,
+#else
 	xdnd = new Xdnd(info.info.x11.display, info.info.x11.wmwindow,
+#endif
 	                info.info.x11.window,
 	                Move_dragged_shape, Move_dragged_combo,
 	                Drop_dragged_shape, Drop_dragged_chunk,
@@ -1737,7 +1741,11 @@
 #ifdef USE_EXULTSTUDIO
 #ifndef WIN32
 	case SDL_SYSWMEVENT: {
+#if SDL_VERSION_ATLEAST(2, 0, 0)
+		XEvent &ev = event.syswm.msg->msg.x11.event;
+#else
 		XEvent &ev = event.syswm.msg->event.xevent;
+#endif
 		if (ev.type == ClientMessage)
 			xdnd->client_msg(reinterpret_cast<XClientMessageEvent &>(ev));
 		else if (ev.type == SelectionNotify)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.