[packages/ClanLib.git] / ClanLib-build.patch

--- ClanLib-2.0.2/Sources/Display/X11/x11_window.cpp~	2009-05-15 10:13:14.000000000 +0200
+++ ClanLib-2.0.2/Sources/Display/X11/x11_window.cpp	2009-07-14 08:49:17.643976647 +0200
@@ -53,6 +53,8 @@
 #include "timer_provider_x11.h"
 #include <X11/Xatom.h>
 
+#include <cstdio>
+
 CL_X11Window::CL_X11Window(CL_DisplayMessageQueue_X11 *message_queue)
 : window(0), window_last_focus(0), cmap(0), allow_resize(false), bpp(0), message_queue(message_queue), fullscreen(false),
   disp(0), system_cursor(0), hidden_cursor(0), cursor_bitmap(0), 
--- ClanLib-2.0.2/Sources/Display/X11/input_device_provider_x11keyboard.cpp~	2009-05-14 12:07:59.000000000 +0200
+++ ClanLib-2.0.2/Sources/Display/X11/input_device_provider_x11keyboard.cpp	2009-07-14 08:50:11.947877097 +0200
@@ -34,6 +34,8 @@
 #include "API/Core/Text/string_help.h"
 #include "x11_window.h"
 
+#include <cstdio>
+
 /////////////////////////////////////////////////////////////////////////////
 // CL_InputDeviceProvider_X11Keyboard construction:
 
--- ClanLib-2.0.2/Sources/GL/GLX/opengl_window_provider_glx.cpp~	2009-05-14 17:13:42.000000000 +0200
+++ ClanLib-2.0.2/Sources/GL/GLX/opengl_window_provider_glx.cpp	2009-07-14 08:52:13.170573614 +0200
@@ -49,6 +49,8 @@
 #include "../opengl_target_provider.h"
 #include "Display/X11/timer_provider_x11.h"
 
+#include <cstdio>
+
 namespace
 {
 	class RenderWindowProvider_GLX: public CL_RenderWindowProvider
--- ClanLib-2.0.2/Sources/Core/Text/string_help.cpp~	2009-03-16 10:34:32.000000000 +0100
+++ ClanLib-2.0.2/Sources/Core/Text/string_help.cpp	2009-07-14 08:56:18.465131510 +0200
@@ -35,6 +35,7 @@
 #include <wctype.h>
 #include <string.h>
 #include <stdlib.h>
+#include <cstdio>
 #else
 #include <string.h>
 #include <tchar.h>
--- ClanLib-2.0.2/Sources/API/Makefile.am~	2009-05-06 18:09:22.000000000 +0200
+++ ClanLib-2.0.2/Sources/API/Makefile.am	2009-07-14 09:01:28.314442596 +0200
@@ -322,7 +322,6 @@
 	Display/2D/sprite_description.h \
 	Display/2D/subtexture.h \
 	Display/2D/color.h \
-	Display/2D/image.h \
 	Display/2D/span_layout.h \
 	Display/Collision/outline_accuracy.h \
 	Display/Collision/outline_provider_bitmap.h \
--- ClanLib-2.0.2/Examples/Makefile.conf.in~	2009-07-14 12:28:45.199275223 +0200
+++ ClanLib-2.0.2/Examples/Makefile.conf.in	2009-07-14 12:28:58.112848194 +0200
@@ -5,7 +5,7 @@
 #
 
 PACKAGES = $(patsubst %,%-@LT_RELEASE@,$(LIBS))
-CXXFLAGS += `pkg-config --cflags $(PACKAGES)` -pthread
+CXXFLAGS += -I. `pkg-config --cflags $(PACKAGES)` -pthread
 
 #EXAMPLE_BIN contains list of example binaries to build
 
--- ClanLib-2.0.2/Documentation/Utilities/ReferenceDocs/Makefile~	2009-03-27 11:19:52.000000000 +0100
+++ ClanLib-2.0.2/Documentation/Utilities/ReferenceDocs/Makefile	2009-07-14 12:39:30.959210323 +0200
@@ -1,7 +1,7 @@
 EXAMPLE_BIN=ReferenceDocs
 OBJF = reference_docs.o reference_all_classes.o reference_class.o reference_define.o reference_enum.o reference_function.o reference_grouped_classes.o reference_index.o reference_typedef.o
 LIBS=clanCore
-EXTRA_LIBS=-lpthread
+EXTRA_LIBS=-lpthread -L../../../Sources/Core/.libs/
 
 include ../../../Examples/Makefile.conf
 
--- ClanLib-2.0.2/Documentation/Reference/Makefile.am.org	2009-07-14 13:03:55.506979144 +0200
+++ ClanLib-2.0.2/Documentation/Reference/Makefile.am	2009-07-14 13:03:03.129200101 +0200
@@ -11,7 +11,7 @@
 	mkdir reftest
 	doxygen ./clanlib.doxygen
 	make -C ../Utilities/ReferenceDocs
-	../Utilities/ReferenceDocs/ReferenceDocs
+	LD_LIBRARY_PATH=../../Sources/Core/.libs/ ../Utilities/ReferenceDocs/ReferenceDocs
 
 install-html:
 	$(INSTALL) -d $(DESTDIR)$(HTML_PREFIX)
Commit	Line	Data
60314674 AM	1	--- ClanLib-2.0.2/Sources/Display/X11/x11_window.cpp~ 2009-05-15 10:13:14.000000000 +0200
	2	+++ ClanLib-2.0.2/Sources/Display/X11/x11_window.cpp 2009-07-14 08:49:17.643976647 +0200
	3	@@ -53,6 +53,8 @@
	4	#include "timer_provider_x11.h"
	5	#include <X11/Xatom.h>
	6
	7	+#include <cstdio>
	8	+
	9	CL_X11Window::CL_X11Window(CL_DisplayMessageQueue_X11 *message_queue)
	10	: window(0), window_last_focus(0), cmap(0), allow_resize(false), bpp(0), message_queue(message_queue), fullscreen(false),
	11	disp(0), system_cursor(0), hidden_cursor(0), cursor_bitmap(0),
	12	--- ClanLib-2.0.2/Sources/Display/X11/input_device_provider_x11keyboard.cpp~ 2009-05-14 12:07:59.000000000 +0200
	13	+++ ClanLib-2.0.2/Sources/Display/X11/input_device_provider_x11keyboard.cpp 2009-07-14 08:50:11.947877097 +0200
	14	@@ -34,6 +34,8 @@
	15	#include "API/Core/Text/string_help.h"
	16	#include "x11_window.h"
	17
	18	+#include <cstdio>
	19	+
	20	/////////////////////////////////////////////////////////////////////////////
	21	// CL_InputDeviceProvider_X11Keyboard construction:
	22
	23	--- ClanLib-2.0.2/Sources/GL/GLX/opengl_window_provider_glx.cpp~ 2009-05-14 17:13:42.000000000 +0200
	24	+++ ClanLib-2.0.2/Sources/GL/GLX/opengl_window_provider_glx.cpp 2009-07-14 08:52:13.170573614 +0200
	25	@@ -49,6 +49,8 @@
	26	#include "../opengl_target_provider.h"
	27	#include "Display/X11/timer_provider_x11.h"
	28
	29	+#include <cstdio>
	30	+
	31	namespace
	32	{
	33	class RenderWindowProvider_GLX: public CL_RenderWindowProvider
	34	--- ClanLib-2.0.2/Sources/Core/Text/string_help.cpp~ 2009-03-16 10:34:32.000000000 +0100
	35	+++ ClanLib-2.0.2/Sources/Core/Text/string_help.cpp 2009-07-14 08:56:18.465131510 +0200
	36	@@ -35,6 +35,7 @@
	37	#include <wctype.h>
	38	#include <string.h>
	39	#include <stdlib.h>
	40	+#include <cstdio>
	41	#else
	42	#include <string.h>
	43	#include <tchar.h>
	44	--- ClanLib-2.0.2/Sources/API/Makefile.am~ 2009-05-06 18:09:22.000000000 +0200
	45	+++ ClanLib-2.0.2/Sources/API/Makefile.am 2009-07-14 09:01:28.314442596 +0200
	46	@@ -322,7 +322,6 @@
	47	Display/2D/sprite_description.h \
	48	Display/2D/subtexture.h \
	49	Display/2D/color.h \
	50	- Display/2D/image.h \
	51	Display/2D/span_layout.h \
	52	Display/Collision/outline_accuracy.h \
	53	Display/Collision/outline_provider_bitmap.h \
	54	--- ClanLib-2.0.2/Examples/Makefile.conf.in~ 2009-07-14 12:28:45.199275223 +0200
	55	+++ ClanLib-2.0.2/Examples/Makefile.conf.in 2009-07-14 12:28:58.112848194 +0200
	56	@@ -5,7 +5,7 @@
	57	#
	58
	59	PACKAGES = $(patsubst %,%-@LT_RELEASE@,$(LIBS))
	60	-CXXFLAGS += `pkg-config --cflags $(PACKAGES)` -pthread
	61	+CXXFLAGS += -I. `pkg-config --cflags $(PACKAGES)` -pthread
	62
	63	#EXAMPLE_BIN contains list of example binaries to build
	64
65	--- ClanLib-2.0.2/Documentation/Utilities/ReferenceDocs/Makefile~ 2009-03-27 11:19:52.000000000 +0100
66	+++ ClanLib-2.0.2/Documentation/Utilities/ReferenceDocs/Makefile 2009-07-14 12:39:30.959210323 +0200
67	@@ -1,7 +1,7 @@
68	EXAMPLE_BIN=ReferenceDocs
69	OBJF = reference_docs.o reference_all_classes.o reference_class.o reference_define.o reference_enum.o reference_function.o reference_grouped_classes.o reference_index.o reference_typedef.o
70	LIBS=clanCore
71	-EXTRA_LIBS=-lpthread
72	+EXTRA_LIBS=-lpthread -L../../../Sources/Core/.libs/
73
74	include ../../../Examples/Makefile.conf
75
76	--- ClanLib-2.0.2/Documentation/Reference/Makefile.am.org 2009-07-14 13:03:55.506979144 +0200
77	+++ ClanLib-2.0.2/Documentation/Reference/Makefile.am 2009-07-14 13:03:03.129200101 +0200
78	@@ -11,7 +11,7 @@
79	mkdir reftest
80	doxygen ./clanlib.doxygen
81	make -C ../Utilities/ReferenceDocs
82	- ../Utilities/ReferenceDocs/ReferenceDocs
83	+ LD_LIBRARY_PATH=../../Sources/Core/.libs/ ../Utilities/ReferenceDocs/ReferenceDocs
84
85	install-html:
86	$(INSTALL) -d $(DESTDIR)$(HTML_PREFIX)