/[pkgs]/devel/ClanLib06/ClanLib-0.6.5-suse.patch
ViewVC logotype

Contents of /devel/ClanLib06/ClanLib-0.6.5-suse.patch

Parent Directory Parent Directory | Revision Log Revision Log

Revision 1.2 - (show annotations) (download) (as text)
Sun Sep 7 12:12:32 2008 UTC (14 months, 2 weeks ago) by jwrdegoede
Branch: MAIN
CVS Tags: F-12-split, F-10-split, F-11-split, ClanLib06-0_6_5-14_fc11, ClanLib06-0_6_5-15_fc12, ClanLib06-0_6_5-13_fc10, HEAD
Changes since 1.1: +785 -733 lines
File MIME type: text/x-patch 
* Sun Sep  7 2008 Hans de Goede <hdegoede@redhat.com> 0.6.5-13
- Fix patch fuzz build failure
1 diff -up ClanLib-0.6.5/Setup/Unix/Makefile.app.in.foo ClanLib-0.6.5/Setup/Unix/Makefile.app.in
2 --- ClanLib-0.6.5/Setup/Unix/Makefile.app.in.foo 2008-09-07 13:39:25.000000000 +0200
3 +++ ClanLib-0.6.5/Setup/Unix/Makefile.app.in 2008-09-07 13:39:37.000000000 +0200
4 @@ -5,14 +5,14 @@
5 clanApp: Libs/libclanApp.so Libs/libclanApp.a
6
7 installApp: clanApp
8 - @for i in `find Sources/API/Application -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(INC_PREFIX)/ClanLib/$$i; done
9 - @for i in `find Sources/API/Application -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(INC_PREFIX)/ClanLib/$$i; done
10 - @install -m 0644 Sources/API/application.h $(INC_PREFIX)/ClanLib/application.h
11 - @install -d $(LIB_PREFIX)
12 - @install Libs/libclanApp.so.$(D_VERSION_MINOR) $(LIB_PREFIX)
13 - @install Libs/libclanApp.a $(LIB_PREFIX)
14 - @ln -s -f libclanApp.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanApp.so.$(D_VERSION_MAJOR)
15 - @ln -s -f libclanApp.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanApp.so
16 + @for i in `find Sources/API/Application -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
17 + @for i in `find Sources/API/Application -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
18 + @install -m 0644 Sources/API/application.h $(DESTDIR)$(INC_PREFIX)/ClanLib/application.h
19 + @install -d $(DESTDIR)$(LIB_PREFIX)
20 + @install Libs/libclanApp.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)
21 + @install Libs/libclanApp.a $(DESTDIR)$(LIB_PREFIX)
22 + @ln -s -f libclanApp.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)/libclanApp.so.$(D_VERSION_MAJOR)
23 + @ln -s -f libclanApp.so.$(D_VERSION_MAJOR) $(DESTDIR)$(LIB_PREFIX)/libclanApp.so
24
25
26 OBJF_LIB_App = Libs/Intermediate/clanapp.o
27 diff -up ClanLib-0.6.5/Setup/Unix/Makefile.conf.in.foo ClanLib-0.6.5/Setup/Unix/Makefile.conf.in
28 --- ClanLib-0.6.5/Setup/Unix/Makefile.conf.in.foo 2008-09-07 13:39:25.000000000 +0200
29 +++ ClanLib-0.6.5/Setup/Unix/Makefile.conf.in 2008-09-07 13:39:37.000000000 +0200
30 @@ -13,7 +13,7 @@ INC_PREFIX = @includedir@
31 BIN_PREFIX = @bindir@
32 TARGET_PREFIX = @libdir@/ClanLib
33 MAN_PREFIX = @mandir@
34 -
35 +DESTDIR =
36 INCLUDE_DIRS = -I Sources @x_includes@ @extra_includes@
37
38 COMP_OPTIONS = -Wall $(INCLUDE_DIRS) -fPIC -DNOCONTROLS -D__int64=int64_t @DEFS@ @comp_mode@ @directfb_cflags@
39 @@ -34,19 +34,19 @@ Libs/Intermediate/%.o : %.cpp
40 @echo "Compiling $<"
41 -@if [ ! -d Libs ]; then mkdir Libs; fi
42 -@if [ ! -d Libs/Intermediate ]; then mkdir Libs/Intermediate; fi
43 - @$(CXX_COMMAND) $< -o $@
44 + $(CXX_COMMAND) $< -o $@
45
46 Libs/Intermediate/%.o : %.c
47 @echo "Compiling $<"
48 -@if [ ! -d Libs ]; then mkdir Libs; fi
49 -@if [ ! -d Libs/Intermediate ]; then mkdir Libs/Intermediate; fi
50 - @$(CC_COMMAND) -c $< -o $@
51 + $(CC_COMMAND) -c $< -o $@
52
53 Libs/Intermediate/%.o : %.s
54 @echo "Assembling $<"
55 -@if [ ! -d Libs ]; then mkdir Libs; fi
56 -@if [ ! -d Libs/Intermediate ]; then mkdir Libs/Intermediate; fi
57 - @$(AS_COMMAND) $< -o $@
58 + $(AS_COMMAND) $< -o $@
59
60 build_info:
61 @echo Compile command .cpp = $(CXX_COMMAND)
62 diff -up ClanLib-0.6.5/Setup/Unix/Makefile.core.in.foo ClanLib-0.6.5/Setup/Unix/Makefile.core.in
63 --- ClanLib-0.6.5/Setup/Unix/Makefile.core.in.foo 2008-09-07 13:39:25.000000000 +0200
64 +++ ClanLib-0.6.5/Setup/Unix/Makefile.core.in 2008-09-07 13:39:37.000000000 +0200
65 @@ -5,21 +5,21 @@
66 clanCore: build_info Libs/libclanCore.so Libs/libclanCore.a
67
68 installCore: clanCore
69 - @for i in `find Sources/API/Core -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(INC_PREFIX)/ClanLib/$$i; done
70 - @for i in `find Sources/API/Core -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(INC_PREFIX)/ClanLib/$$i; done
71 - @for i in `find Sources/API/Sound -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(INC_PREFIX)/ClanLib/$$i; done
72 - @for i in `find Sources/API/Sound -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(INC_PREFIX)/ClanLib/$$i; done
73 - @install -m 0644 Sources/API/core.h $(INC_PREFIX)/ClanLib/core.h
74 - @install -m 0644 Sources/API/sound.h $(INC_PREFIX)/ClanLib/sound.h
75 - @install -m 0644 Sources/API/efence.h $(INC_PREFIX)/ClanLib/efence.h
76 - @install -d $(LIB_PREFIX)
77 - @install Libs/libclanCore.so.$(D_VERSION_MINOR) $(LIB_PREFIX)
78 - @install Libs/libclanCore.a $(LIB_PREFIX)
79 - @ln -s -f libclanCore.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanCore.so.$(D_VERSION_MAJOR)
80 - @ln -s -f libclanCore.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanCore.so
81 - @install -d $(BIN_PREFIX) $(MAN_PREFIX)/man1/
82 - @install Setup/Unix/clanlib-config $(BIN_PREFIX)
83 - @install Setup/Unix/clanlib-config.1 $(MAN_PREFIX)/man1/
84 + @for i in `find Sources/API/Core -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
85 + @for i in `find Sources/API/Core -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
86 + @for i in `find Sources/API/Sound -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
87 + @for i in `find Sources/API/Sound -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
88 + @install -m 0644 Sources/API/core.h $(DESTDIR)$(INC_PREFIX)/ClanLib/core.h
89 + @install -m 0644 Sources/API/sound.h $(DESTDIR)$(INC_PREFIX)/ClanLib/sound.h
90 + @install -m 0644 Sources/API/efence.h $(DESTDIR)$(INC_PREFIX)/ClanLib/efence.h
91 + @install -d $(DESTDIR)$(LIB_PREFIX)
92 + @install Libs/libclanCore.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)
93 + @install Libs/libclanCore.a $(DESTDIR)$(LIB_PREFIX)
94 + @ln -s -f libclanCore.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)/libclanCore.so.$(D_VERSION_MAJOR)
95 + @ln -s -f libclanCore.so.$(D_VERSION_MAJOR) $(DESTDIR)$(LIB_PREFIX)/libclanCore.so
96 + @install -d $(DESTDIR)$(BIN_PREFIX) $(DESTDIR)$(MAN_PREFIX)/man1/
97 + @install Setup/Unix/clanlib-config $(DESTDIR)$(BIN_PREFIX)
98 + @install Setup/Unix/clanlib-config.1 $(DESTDIR)$(MAN_PREFIX)/man1/
99
100 OBJF_CORE_GENERIC = \
101 Libs/Intermediate/cl_assert.o \
102 diff -up ClanLib-0.6.5/Setup/Unix/Makefile.display.in.foo ClanLib-0.6.5/Setup/Unix/Makefile.display.in
103 --- ClanLib-0.6.5/Setup/Unix/Makefile.display.in.foo 2008-09-07 13:39:25.000000000 +0200
104 +++ ClanLib-0.6.5/Setup/Unix/Makefile.display.in 2008-09-07 13:39:37.000000000 +0200
105 @@ -4,14 +4,14 @@
106 clanDisplay: Libs/libclanDisplay.so Libs/libclanDisplay.a
107
108 installDisplay: clanDisplay
109 - @for i in `find Sources/API/Display -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(INC_PREFIX)/ClanLib/$$i; done
110 - @for i in `find Sources/API/Display -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(INC_PREFIX)/ClanLib/$$i; done
111 - @install -m 0644 Sources/API/display.h $(INC_PREFIX)/ClanLib/display.h
112 - @install -d $(LIB_PREFIX)
113 - @install Libs/libclanDisplay.so.$(D_VERSION_MINOR) $(LIB_PREFIX)
114 - @install Libs/libclanDisplay.a $(LIB_PREFIX)
115 - @ln -s -f libclanDisplay.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanDisplay.so.$(D_VERSION_MAJOR)
116 - @ln -s -f libclanDisplay.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanDisplay.so
117 + @for i in `find Sources/API/Display -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
118 + @for i in `find Sources/API/Display -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
119 + @install -m 0644 Sources/API/display.h $(DESTDIR)$(INC_PREFIX)/ClanLib/display.h
120 + @install -d $(DESTDIR)$(LIB_PREFIX)
121 + @install Libs/libclanDisplay.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)
122 + @install Libs/libclanDisplay.a $(DESTDIR)$(LIB_PREFIX)
123 + @ln -s -f libclanDisplay.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)/libclanDisplay.so.$(D_VERSION_MAJOR)
124 + @ln -s -f libclanDisplay.so.$(D_VERSION_MAJOR) $(DESTDIR)$(LIB_PREFIX)/libclanDisplay.so
125
126
127 OBJF_DISP_GENERIC = \
128 diff -up ClanLib-0.6.5/Setup/Unix/Makefile.gl.in.foo ClanLib-0.6.5/Setup/Unix/Makefile.gl.in
129 --- ClanLib-0.6.5/Setup/Unix/Makefile.gl.in.foo 2008-09-07 13:39:25.000000000 +0200
130 +++ ClanLib-0.6.5/Setup/Unix/Makefile.gl.in 2008-09-07 13:39:37.000000000 +0200
131 @@ -5,14 +5,14 @@
132 clanGL: Libs/libclanGL.so Libs/libclanGL.a
133
134 installGL: clanGL
135 - @for i in `find Sources/API/GL -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(INC_PREFIX)/ClanLib/$$i; done
136 - @for i in `find Sources/API/GL -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(INC_PREFIX)/ClanLib/$$i; done
137 - @install -m 0644 Sources/API/gl.h $(INC_PREFIX)/ClanLib/gl.h
138 - @install -d $(LIB_PREFIX)
139 - @install Libs/libclanGL.so.$(D_VERSION_MINOR) $(LIB_PREFIX)
140 - @install Libs/libclanGL.a $(LIB_PREFIX)
141 - @ln -s -f libclanGL.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanGL.so.$(D_VERSION_MAJOR)
142 - @ln -s -f libclanGL.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanGL.so
143 + @for i in `find Sources/API/GL -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
144 + @for i in `find Sources/API/GL -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
145 + @install -m 0644 Sources/API/gl.h $(DESTDIR)$(INC_PREFIX)/ClanLib/gl.h
146 + @install -d $(DESTDIR)$(LIB_PREFIX)
147 + @install Libs/libclanGL.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)
148 + @install Libs/libclanGL.a $(DESTDIR)$(LIB_PREFIX)
149 + @ln -s -f libclanGL.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)/libclanGL.so.$(D_VERSION_MAJOR)
150 + @ln -s -f libclanGL.so.$(D_VERSION_MAJOR) $(DESTDIR)$(LIB_PREFIX)/libclanGL.so
151
152 OBJF_LIB_GL = Libs/Intermediate/texture_gl.o \
153 Libs/Intermediate/opengl.o \
154 diff -up ClanLib-0.6.5/Setup/Unix/Makefile.gui.in.foo ClanLib-0.6.5/Setup/Unix/Makefile.gui.in
155 --- ClanLib-0.6.5/Setup/Unix/Makefile.gui.in.foo 2008-09-07 13:39:25.000000000 +0200
156 +++ ClanLib-0.6.5/Setup/Unix/Makefile.gui.in 2008-09-07 13:39:37.000000000 +0200
157 @@ -5,14 +5,14 @@
158 clanGUI: Libs/libclanGUI.so Libs/libclanGUI.a
159
160 installGUI: clanGUI
161 - @for i in `find Sources/API/GUI -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(INC_PREFIX)/ClanLib/$$i; done
162 - @for i in `find Sources/API/GUI -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(INC_PREFIX)/ClanLib/$$i; done
163 - @install -m 0644 Sources/API/gui.h $(INC_PREFIX)/ClanLib/gui.h
164 - @install -d $(LIB_PREFIX)
165 - @install Libs/libclanGUI.so.$(D_VERSION_MINOR) $(LIB_PREFIX)
166 - @install Libs/libclanGUI.a $(LIB_PREFIX)
167 - @ln -s -f libclanGUI.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanGUI.so.$(D_VERSION_MAJOR)
168 - @ln -s -f libclanGUI.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanGUI.so
169 + @for i in `find Sources/API/GUI -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
170 + @for i in `find Sources/API/GUI -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
171 + @install -m 0644 Sources/API/gui.h $(DESTDIR)$(INC_PREFIX)/ClanLib/gui.h
172 + @install -d $(DESTDIR)$(LIB_PREFIX)
173 + @install Libs/libclanGUI.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)
174 + @install Libs/libclanGUI.a $(DESTDIR)$(LIB_PREFIX)
175 + @ln -s -f libclanGUI.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)/libclanGUI.so.$(D_VERSION_MAJOR)
176 + @ln -s -f libclanGUI.so.$(D_VERSION_MAJOR) $(DESTDIR)$(LIB_PREFIX)/libclanGUI.so
177
178 OBJF_LIB_GUI = \
179 Libs/Intermediate/button.o \
180 diff -up ClanLib-0.6.5/Setup/Unix/Makefile.jpeg.in.foo ClanLib-0.6.5/Setup/Unix/Makefile.jpeg.in
181 --- ClanLib-0.6.5/Setup/Unix/Makefile.jpeg.in.foo 2008-09-07 13:39:25.000000000 +0200
182 +++ ClanLib-0.6.5/Setup/Unix/Makefile.jpeg.in 2008-09-07 13:39:37.000000000 +0200
183 @@ -5,14 +5,14 @@
184 clanJPEG: Libs/libclanJPEG.so Libs/libclanJPEG.a
185
186 installJPEG: clanJPEG
187 - @for i in `find Sources/API/JPEG -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(INC_PREFIX)/ClanLib/$$i; done
188 - @for i in `find Sources/API/JPEG -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(INC_PREFIX)/ClanLib/$$i; done
189 - @install -m 0644 Sources/API/jpeg.h $(INC_PREFIX)/ClanLib/jpeg.h
190 - @install -d $(LIB_PREFIX)
191 - @install Libs/libclanJPEG.so.$(D_VERSION_MINOR) $(LIB_PREFIX)
192 - @install Libs/libclanJPEG.a $(LIB_PREFIX)
193 - @ln -s -f libclanJPEG.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanJPEG.so.$(D_VERSION_MAJOR)
194 - @ln -s -f libclanJPEG.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanJPEG.so
195 + @for i in `find Sources/API/JPEG -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
196 + @for i in `find Sources/API/JPEG -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
197 + @install -m 0644 Sources/API/jpeg.h $(DESTDIR)$(INC_PREFIX)/ClanLib/jpeg.h
198 + @install -d $(DESTDIR)$(LIB_PREFIX)
199 + @install Libs/libclanJPEG.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)
200 + @install Libs/libclanJPEG.a $(DESTDIR)$(LIB_PREFIX)
201 + @ln -s -f libclanJPEG.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)/libclanJPEG.so.$(D_VERSION_MAJOR)
202 + @ln -s -f libclanJPEG.so.$(D_VERSION_MAJOR) $(DESTDIR)$(LIB_PREFIX)/libclanJPEG.so
203
204
205 OBJF_LIB_JPEG = \
206 diff -up ClanLib-0.6.5/Setup/Unix/Makefile.lua.in.foo ClanLib-0.6.5/Setup/Unix/Makefile.lua.in
207 --- ClanLib-0.6.5/Setup/Unix/Makefile.lua.in.foo 2008-09-07 13:39:25.000000000 +0200
208 +++ ClanLib-0.6.5/Setup/Unix/Makefile.lua.in 2008-09-07 13:39:37.000000000 +0200
209 @@ -5,14 +5,14 @@
210 clanLua: Libs/libclanLua.so Libs/libclanLua.a
211
212 installLua: clanLua
213 - @for i in `find Sources/API/Lua -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(INC_PREFIX)/ClanLib/$$i; done
214 - @for i in `find Sources/API/Lua -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(INC_PREFIX)/ClanLib/$$i; done
215 - @install -m 0644 Sources/API/lua.h $(INC_PREFIX)/ClanLib/lua.h
216 - @install -d $(LIB_PREFIX)
217 - @install Libs/libclanLua.so.$(D_VERSION_MINOR) $(LIB_PREFIX)
218 - @install Libs/libclanLua.a $(LIB_PREFIX)
219 - @ln -s -f libclanLua.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanLua.so.$(D_VERSION_MAJOR)
220 - @ln -s -f libclanLua.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanLua.so
221 + @for i in `find Sources/API/Lua -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
222 + @for i in `find Sources/API/Lua -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
223 + @install -m 0644 Sources/API/lua.h $(DESTDIR)$(INC_PREFIX)/ClanLib/lua.h
224 + @install -d $(DESTDIR)$(LIB_PREFIX)
225 + @install Libs/libclanLua.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)
226 + @install Libs/libclanLua.a $(DESTDIR)$(LIB_PREFIX)
227 + @ln -s -f libclanLua.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)/libclanLua.so.$(D_VERSION_MAJOR)
228 + @ln -s -f libclanLua.so.$(D_VERSION_MAJOR) $(DESTDIR)$(LIB_PREFIX)/libclanLua.so
229
230 OBJF_LIB_LUA = \
231 Libs/Intermediate/clanbindings.o
232 diff -up ClanLib-0.6.5/Setup/Unix/Makefile.mikmod.in.foo ClanLib-0.6.5/Setup/Unix/Makefile.mikmod.in
233 --- ClanLib-0.6.5/Setup/Unix/Makefile.mikmod.in.foo 2008-09-07 13:39:25.000000000 +0200
234 +++ ClanLib-0.6.5/Setup/Unix/Makefile.mikmod.in 2008-09-07 13:39:37.000000000 +0200
235 @@ -5,14 +5,14 @@
236 clanMikMod: Libs/libclanMikMod.so Libs/libclanMikMod.a
237
238 installMikMod: clanMikMod
239 - @for i in `find Sources/API/MikMod -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(INC_PREFIX)/ClanLib/$$i; done
240 - @for i in `find Sources/API/MikMod -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(INC_PREFIX)/ClanLib/$$i; done
241 - @install -m 0644 Sources/API/mikmod.h $(INC_PREFIX)/ClanLib/mikmod.h
242 - @install -d $(LIB_PREFIX)
243 - @install Libs/libclanMikMod.so.$(D_VERSION_MINOR) $(LIB_PREFIX)
244 - @install Libs/libclanMikMod.a $(LIB_PREFIX)
245 - @ln -s -f libclanMikMod.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanMikMod.so.$(D_VERSION_MAJOR)
246 - @ln -s -f libclanMikMod.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanMikMod.so
247 + @for i in `find Sources/API/MikMod -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
248 + @for i in `find Sources/API/MikMod -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
249 + @install -m 0644 Sources/API/mikmod.h $(DESTDIR)$(INC_PREFIX)/ClanLib/mikmod.h
250 + @install -d $(DESTDIR)$(LIB_PREFIX)
251 + @install Libs/libclanMikMod.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)
252 + @install Libs/libclanMikMod.a $(DESTDIR)$(LIB_PREFIX)
253 + @ln -s -f libclanMikMod.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)/libclanMikMod.so.$(D_VERSION_MAJOR)
254 + @ln -s -f libclanMikMod.so.$(D_VERSION_MAJOR) $(DESTDIR)$(LIB_PREFIX)/libclanMikMod.so
255
256 OBJF_LIB_MIKMOD = \
257 Libs/Intermediate/resourcetype_module.o \
258 diff -up ClanLib-0.6.5/Setup/Unix/Makefile.mpeg.in.foo ClanLib-0.6.5/Setup/Unix/Makefile.mpeg.in
259 --- ClanLib-0.6.5/Setup/Unix/Makefile.mpeg.in.foo 2008-09-07 13:39:25.000000000 +0200
260 +++ ClanLib-0.6.5/Setup/Unix/Makefile.mpeg.in 2008-09-07 13:39:37.000000000 +0200
261 @@ -5,14 +5,14 @@
262 clanMPEG: Libs/libclanMPEG.so Libs/libclanMPEG.a
263
264 installMPEG: clanMPEG
265 - @for i in `find Sources/API/MPEG -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(INC_PREFIX)/ClanLib/$$i; done
266 - @for i in `find Sources/API/MPEG -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(INC_PREFIX)/ClanLib/$$i; done
267 - @install -m 0644 Sources/API/mpeg.h $(INC_PREFIX)/ClanLib/mpeg.h
268 - @install -d $(LIB_PREFIX)
269 - @install Libs/libclanMPEG.so.$(D_VERSION_MINOR) $(LIB_PREFIX)
270 - @install Libs/libclanMPEG.a $(LIB_PREFIX)
271 - @ln -s -f libclanMPEG.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanMPEG.so.$(D_VERSION_MAJOR)
272 - @ln -s -f libclanMPEG.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanMPEG.so
273 + @for i in `find Sources/API/MPEG -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
274 + @for i in `find Sources/API/MPEG -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
275 + @install -m 0644 Sources/API/mpeg.h $(DESTDIR)$(INC_PREFIX)/ClanLib/mpeg.h
276 + @install -d $(DESTDIR)$(LIB_PREFIX)
277 + @install Libs/libclanMPEG.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)
278 + @install Libs/libclanMPEG.a $(DESTDIR)$(LIB_PREFIX)
279 + @ln -s -f libclanMPEG.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)/libclanMPEG.so.$(D_VERSION_MAJOR)
280 + @ln -s -f libclanMPEG.so.$(D_VERSION_MAJOR) $(DESTDIR)$(LIB_PREFIX)/libclanMPEG.so
281
282 OBJF_LIB_MPEG = \
283 Libs/Intermediate/mpeg_soundprovider.o
284 diff -up ClanLib-0.6.5/Setup/Unix/Makefile.network.in.foo ClanLib-0.6.5/Setup/Unix/Makefile.network.in
285 --- ClanLib-0.6.5/Setup/Unix/Makefile.network.in.foo 2008-09-07 13:39:25.000000000 +0200
286 +++ ClanLib-0.6.5/Setup/Unix/Makefile.network.in 2008-09-07 13:39:37.000000000 +0200
287 @@ -5,14 +5,14 @@
288 clanNetwork: Libs/libclanNetwork.so Libs/libclanNetwork.a
289
290 installNetwork: clanNetwork
291 - @for i in `find Sources/API/Network -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(INC_PREFIX)/ClanLib/$$i; done
292 - @for i in `find Sources/API/Network -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(INC_PREFIX)/ClanLib/$$i; done
293 - @install -m 0644 Sources/API/network.h $(INC_PREFIX)/ClanLib/network.h
294 - @install -d $(LIB_PREFIX)
295 - @install Libs/libclanNetwork.so.$(D_VERSION_MINOR) $(LIB_PREFIX)
296 - @install Libs/libclanNetwork.a $(LIB_PREFIX)
297 - @ln -s -f libclanNetwork.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanNetwork.so.$(D_VERSION_MAJOR)
298 - @ln -s -f libclanNetwork.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanNetwork.so
299 + @for i in `find Sources/API/Network -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
300 + @for i in `find Sources/API/Network -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
301 + @install -m 0644 Sources/API/network.h $(DESTDIR)$(INC_PREFIX)/ClanLib/network.h
302 + @install -d $(DESTDIR)$(LIB_PREFIX)
303 + @install Libs/libclanNetwork.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)
304 + @install Libs/libclanNetwork.a $(DESTDIR)$(LIB_PREFIX)
305 + @ln -s -f libclanNetwork.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)/libclanNetwork.so.$(D_VERSION_MAJOR)
306 + @ln -s -f libclanNetwork.so.$(D_VERSION_MAJOR) $(DESTDIR)$(LIB_PREFIX)/libclanNetwork.so
307
308 OBJF_LIB_NETWORK = Libs/Intermediate/netcomputer.o \
309 Libs/Intermediate/browse_client.o \
310 diff -up ClanLib-0.6.5/Setup/Unix/Makefile.png.in.foo ClanLib-0.6.5/Setup/Unix/Makefile.png.in
311 --- ClanLib-0.6.5/Setup/Unix/Makefile.png.in.foo 2008-09-07 13:39:25.000000000 +0200
312 +++ ClanLib-0.6.5/Setup/Unix/Makefile.png.in 2008-09-07 13:39:37.000000000 +0200
313 @@ -5,14 +5,14 @@
314 clanPNG: Libs/libclanPNG.so Libs/libclanPNG.a
315
316 installPNG: clanPNG
317 - @for i in `find Sources/API/PNG -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(INC_PREFIX)/ClanLib/$$i; done
318 - @for i in `find Sources/API/PNG -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(INC_PREFIX)/ClanLib/$$i; done
319 - @install -m 0644 Sources/API/png.h $(INC_PREFIX)/ClanLib/png.h
320 - @install -d $(LIB_PREFIX)
321 - @install Libs/libclanPNG.so.$(D_VERSION_MINOR) $(LIB_PREFIX)
322 - @install Libs/libclanPNG.a $(LIB_PREFIX)
323 - @ln -s -f libclanPNG.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanPNG.so.$(D_VERSION_MAJOR)
324 - @ln -s -f libclanPNG.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanPNG.so
325 + @for i in `find Sources/API/PNG -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
326 + @for i in `find Sources/API/PNG -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
327 + @install -m 0644 Sources/API/png.h $(DESTDIR)$(INC_PREFIX)/ClanLib/png.h
328 + @install -d $(DESTDIR)$(LIB_PREFIX)
329 + @install Libs/libclanPNG.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)
330 + @install Libs/libclanPNG.a $(DESTDIR)$(LIB_PREFIX)
331 + @ln -s -f libclanPNG.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)/libclanPNG.so.$(D_VERSION_MAJOR)
332 + @ln -s -f libclanPNG.so.$(D_VERSION_MAJOR) $(DESTDIR)$(LIB_PREFIX)/libclanPNG.so
333
334
335 OBJF_LIB_PNG = \
336 diff -up ClanLib-0.6.5/Setup/Unix/Makefile.signals.in.foo ClanLib-0.6.5/Setup/Unix/Makefile.signals.in
337 --- ClanLib-0.6.5/Setup/Unix/Makefile.signals.in.foo 2001-03-17 00:56:33.000000000 +0100
338 +++ ClanLib-0.6.5/Setup/Unix/Makefile.signals.in 2008-09-07 13:39:37.000000000 +0200
339 @@ -5,6 +5,6 @@
340 clanSignals:
341
342 installSignals: clanSignals
343 - @for i in `find Sources/API/Signals -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(INC_PREFIX)/ClanLib/$$i; done
344 - @for i in `find Sources/API/Signals -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(INC_PREFIX)/ClanLib/$$i; done
345 - @install -m 0644 Sources/API/signals.h $(INC_PREFIX)/ClanLib/signals.h
346 + @for i in `find Sources/API/Signals -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
347 + @for i in `find Sources/API/Signals -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
348 + @install -m 0644 Sources/API/signals.h $(DESTDIR)$(INC_PREFIX)/ClanLib/signals.h
349 diff -up ClanLib-0.6.5/Setup/Unix/Makefile.smalljpeg.in.foo ClanLib-0.6.5/Setup/Unix/Makefile.smalljpeg.in
350 --- ClanLib-0.6.5/Setup/Unix/Makefile.smalljpeg.in.foo 2008-09-07 13:39:25.000000000 +0200
351 +++ ClanLib-0.6.5/Setup/Unix/Makefile.smalljpeg.in 2008-09-07 13:39:37.000000000 +0200
352 @@ -5,14 +5,14 @@
353 clanSmallJPEG: Libs/libclanSmallJPEG.so Libs/libclanSmallJPEG.a
354
355 installSmallJPEG: clanSmallJPEG
356 - @for i in `find Sources/API/SmallJPEG -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(INC_PREFIX)/ClanLib/$$i; done
357 - @for i in `find Sources/API/SmallJPEG -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(INC_PREFIX)/ClanLib/$$i; done
358 - @install -m 0644 Sources/API/jpeg.h $(INC_PREFIX)/ClanLib/jpeg.h
359 - @install -d $(LIB_PREFIX)
360 - @install Libs/libclanSmallJPEG.so.$(D_VERSION_MINOR) $(LIB_PREFIX)
361 - @install Libs/libclanSmallJPEG.a $(LIB_PREFIX)
362 - @ln -s -f libclanSmallJPEG.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanSmallJPEG.so.$(D_VERSION_MAJOR)
363 - @ln -s -f libclanSmallJPEG.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanSmallJPEG.so
364 + @for i in `find Sources/API/SmallJPEG -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
365 + @for i in `find Sources/API/SmallJPEG -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
366 + @install -m 0644 Sources/API/jpeg.h $(DESTDIR)$(INC_PREFIX)/ClanLib/jpeg.h
367 + @install -d $(DESTDIR)$(LIB_PREFIX)
368 + @install Libs/libclanSmallJPEG.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)
369 + @install Libs/libclanSmallJPEG.a $(DESTDIR)$(LIB_PREFIX)
370 + @ln -s -f libclanSmallJPEG.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)/libclanSmallJPEG.so.$(D_VERSION_MAJOR)
371 + @ln -s -f libclanSmallJPEG.so.$(D_VERSION_MAJOR) $(DESTDIR)$(LIB_PREFIX)/libclanSmallJPEG.so
372
373
374 OBJF_LIB_SMALLJPEG = \
375 diff -up ClanLib-0.6.5/Setup/Unix/Makefile.sound.in.foo ClanLib-0.6.5/Setup/Unix/Makefile.sound.in
376 --- ClanLib-0.6.5/Setup/Unix/Makefile.sound.in.foo 2008-09-07 13:39:25.000000000 +0200
377 +++ ClanLib-0.6.5/Setup/Unix/Makefile.sound.in 2008-09-07 13:39:37.000000000 +0200
378 @@ -4,14 +4,14 @@
379 clanSound: Libs/libclanSound.so Libs/libclanSound.a
380
381 installSound: clanSound
382 - @for i in `find Sources/API/Sound -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(INC_PREFIX)/ClanLib/$$i; done
383 - @for i in `find Sources/API/Sound -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(INC_PREFIX)/ClanLib/$$i; done
384 - @install -m 0644 Sources/API/sound.h $(INC_PREFIX)/ClanLib/sound.h
385 - @install -d $(LIB_PREFIX)
386 - @install Libs/libclanSound.so.$(D_VERSION_MINOR) $(LIB_PREFIX)
387 - @install Libs/libclanSound.a $(LIB_PREFIX)
388 - @ln -s -f libclanSound.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanSound.so.$(D_VERSION_MAJOR)
389 - @ln -s -f libclanSound.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanSound.so
390 + @for i in `find Sources/API/Sound -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
391 + @for i in `find Sources/API/Sound -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
392 + @install -m 0644 Sources/API/sound.h $(DESTDIR)$(INC_PREFIX)/ClanLib/sound.h
393 + @install -d $(DESTDIR)$(LIB_PREFIX)
394 + @install Libs/libclanSound.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)
395 + @install Libs/libclanSound.a $(DESTDIR)$(LIB_PREFIX)
396 + @ln -s -f libclanSound.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)/libclanSound.so.$(D_VERSION_MAJOR)
397 + @ln -s -f libclanSound.so.$(D_VERSION_MAJOR) $(DESTDIR)$(LIB_PREFIX)/libclanSound.so
398
399 OBJF_SOUND_GENERIC = \
400 Libs/Intermediate/sound.o \
401 diff -up ClanLib-0.6.5/Setup/Unix/Makefile.ttf.in.foo ClanLib-0.6.5/Setup/Unix/Makefile.ttf.in
402 --- ClanLib-0.6.5/Setup/Unix/Makefile.ttf.in.foo 2008-09-07 13:39:25.000000000 +0200
403 +++ ClanLib-0.6.5/Setup/Unix/Makefile.ttf.in 2008-09-07 13:39:37.000000000 +0200
404 @@ -5,14 +5,14 @@
405 clanTTF: Libs/libclanTTF.so Libs/libclanTTF.a
406
407 installTTF: clanTTF
408 - @for i in `find Sources/API/TTF -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(INC_PREFIX)/ClanLib/$$i; done
409 - @for i in `find Sources/API/TTF -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(INC_PREFIX)/ClanLib/$$i; done
410 - @install -m 0644 Sources/API/ttf.h $(INC_PREFIX)/ClanLib/ttf.h
411 - @install -d $(LIB_PREFIX)
412 - @install Libs/libclanTTF.so.$(D_VERSION_MINOR) $(LIB_PREFIX)
413 - @install Libs/libclanTTF.a $(LIB_PREFIX)
414 - @ln -s -f libclanTTF.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanTTF.so.$(D_VERSION_MAJOR)
415 - @ln -s -f libclanTTF.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanTTF.so
416 + @for i in `find Sources/API/TTF -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
417 + @for i in `find Sources/API/TTF -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
418 + @install -m 0644 Sources/API/ttf.h $(DESTDIR)$(INC_PREFIX)/ClanLib/ttf.h
419 + @install -d $(DESTDIR)$(LIB_PREFIX)
420 + @install Libs/libclanTTF.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)
421 + @install Libs/libclanTTF.a $(DESTDIR)$(LIB_PREFIX)
422 + @ln -s -f libclanTTF.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)/libclanTTF.so.$(D_VERSION_MAJOR)
423 + @ln -s -f libclanTTF.so.$(D_VERSION_MAJOR) $(DESTDIR)$(LIB_PREFIX)/libclanTTF.so
424
425
426 OBJF_LIB_TTF = \
427 diff -up ClanLib-0.6.5/Setup/Unix/Makefile.vorbis.in.foo ClanLib-0.6.5/Setup/Unix/Makefile.vorbis.in
428 --- ClanLib-0.6.5/Setup/Unix/Makefile.vorbis.in.foo 2008-09-07 13:39:25.000000000 +0200
429 +++ ClanLib-0.6.5/Setup/Unix/Makefile.vorbis.in 2008-09-07 13:39:37.000000000 +0200
430 @@ -5,14 +5,14 @@
431 clanVorbis: Libs/libclanVorbis.so Libs/libclanVorbis.a
432
433 installVorbis: clanVorbis
434 - @for i in `find Sources/API/Vorbis -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(INC_PREFIX)/ClanLib/$$i; done
435 - @for i in `find Sources/API/Vorbis -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(INC_PREFIX)/ClanLib/$$i; done
436 - @install -m 0644 Sources/API/vorbis.h $(INC_PREFIX)/ClanLib/vorbis.h
437 - @install -d $(LIB_PREFIX)
438 - @install Libs/libclanVorbis.so.$(D_VERSION_MINOR) $(LIB_PREFIX)
439 - @install Libs/libclanVorbis.a $(LIB_PREFIX)
440 - @ln -s -f libclanVorbis.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanVorbis.so.$(D_VERSION_MAJOR)
441 - @ln -s -f libclanVorbis.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanVorbis.so
442 + @for i in `find Sources/API/Vorbis -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
443 + @for i in `find Sources/API/Vorbis -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
444 + @install -m 0644 Sources/API/vorbis.h $(DESTDIR)$(INC_PREFIX)/ClanLib/vorbis.h
445 + @install -d $(DESTDIR)$(LIB_PREFIX)
446 + @install Libs/libclanVorbis.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)
447 + @install Libs/libclanVorbis.a $(DESTDIR)$(LIB_PREFIX)
448 + @ln -s -f libclanVorbis.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)/libclanVorbis.so.$(D_VERSION_MAJOR)
449 + @ln -s -f libclanVorbis.so.$(D_VERSION_MAJOR) $(DESTDIR)$(LIB_PREFIX)/libclanVorbis.so
450
451 OBJF_LIB_VORBIS = \
452 Libs/Intermediate/vorbis_soundprovider_generic.o \
453 diff -up ClanLib-0.6.5/Sources/API/Core/IOData/inputsource_file.h.foo ClanLib-0.6.5/Sources/API/Core/IOData/inputsource_file.h
454 --- ClanLib-0.6.5/Sources/API/Core/IOData/inputsource_file.h.foo 2001-12-11 21:44:18.000000000 +0100
455 +++ ClanLib-0.6.5/Sources/API/Core/IOData/inputsource_file.h 2008-09-07 13:39:37.000000000 +0200
456 @@ -23,7 +23,11 @@
457
458 #include <string>
459 #include <stack>
460 +#ifndef WIN32
461 +#include <cstdio>
462 +#else
463 #include <stdio.h>
464 +#endif
465
466 //: Inputsource reading from file.
467 class CL_InputSource_File : public CL_InputSource
468 diff -up ClanLib-0.6.5/Sources/API/Core/IOData/outputsource_file.h.foo ClanLib-0.6.5/Sources/API/Core/IOData/outputsource_file.h
469 --- ClanLib-0.6.5/Sources/API/Core/IOData/outputsource_file.h.foo 2001-12-11 21:44:18.000000000 +0100
470 +++ ClanLib-0.6.5/Sources/API/Core/IOData/outputsource_file.h 2008-09-07 13:39:37.000000000 +0200
471 @@ -22,7 +22,11 @@
472 #include "outputsource.h"
473
474 #include <string>
475 +#ifndef WIN32
476 +#include <cstdio>
477 +#else
478 #include <stdio.h>
479 +#endif
480
481 //: Outputsource writing to file.
482 class CL_OutputSource_File : public CL_OutputSource
483 diff -up ClanLib-0.6.5/Sources/API/Core/Math/math.h.foo ClanLib-0.6.5/Sources/API/Core/Math/math.h
484 --- ClanLib-0.6.5/Sources/API/Core/Math/math.h.foo 2001-09-06 20:52:05.000000000 +0200
485 +++ ClanLib-0.6.5/Sources/API/Core/Math/math.h 2008-09-07 13:39:37.000000000 +0200
486 @@ -16,7 +16,11 @@
487 #ifndef header_math
488 #define header_math
489
490 +#ifndef WIN32
491 +#include <cmath>
492 +#else
493 #include <math.h>
494 +#endif
495
496 #ifndef PI
497 #ifndef M_PI
498 diff -up ClanLib-0.6.5/Sources/API/Core/System/cl_assert.h.foo ClanLib-0.6.5/Sources/API/Core/System/cl_assert.h
499 --- ClanLib-0.6.5/Sources/API/Core/System/cl_assert.h.foo 2001-09-22 17:52:11.000000000 +0200
500 +++ ClanLib-0.6.5/Sources/API/Core/System/cl_assert.h 2008-09-07 13:39:37.000000000 +0200
501 @@ -81,7 +81,7 @@ public:
502 static void die(bool a, const char *file, int line, const char *func, const char *assert_str);
503
504 //: Writes an info statements on the specified channel.
505 - //: <p>Don't callthis one directly, instead use the cl_info macro.
506 + //: <p>Don't call this one directly, instead use the cl_info macro.
507 //: For example: cl_info(info_network, "MyClass::my_funx - Hello World.");</p>
508 //- channel - Channel to use. (Use the ErrorChannels enum's)
509 //- text - text to print.
510 diff -up ClanLib-0.6.5/Sources/API/Core/System/clanstring.h.foo ClanLib-0.6.5/Sources/API/Core/System/clanstring.h
511 --- ClanLib-0.6.5/Sources/API/Core/System/clanstring.h.foo 2002-02-20 09:06:28.000000000 +0100
512 +++ ClanLib-0.6.5/Sources/API/Core/System/clanstring.h 2008-09-07 13:39:37.000000000 +0200
513 @@ -21,11 +21,19 @@
514
515 #include <string>
516
517 +#ifndef WIN32
518 +#include <cstdio>
519 +#include <cstdlib>
520 +#include <cstring>
521 +#include <cstdio>
522 +#else
523 #include <stdio.h>
524 #include <stdlib.h>
525 #include <string.h>
526 -#include <iostream>
527 #include <stdio.h>
528 +#endif
529 +
530 +#include <iostream>
531
532 #ifndef WIN32
533 #include <cctype>
534 @@ -53,7 +61,8 @@ extern char *fcvt (double, int, int *, i
535 #include "../Resources/resource_manager.h"
536 #include "error.h"
537
538 -using namespace std;
539 +//this should *never* appear in a header
540 +//using namespace std;
541
542 //: Clan String Class
543 class CL_String
544 diff -up ClanLib-0.6.5/Sources/API/Display/Display/pixeldata.h.foo ClanLib-0.6.5/Sources/API/Display/Display/pixeldata.h
545 --- ClanLib-0.6.5/Sources/API/Display/Display/pixeldata.h.foo 2001-11-01 14:56:50.000000000 +0100
546 +++ ClanLib-0.6.5/Sources/API/Display/Display/pixeldata.h 2008-09-07 13:39:37.000000000 +0200
547 @@ -167,24 +167,24 @@ public:
548 case 15:
549 case 16:
550 {
551 - unsigned short *ptr =
552 - (unsigned short *) m_provider->get_data();
553 + unsigned char *ptr =
554 + (unsigned char *) m_provider->get_data();
555
556 for (int x=0; x<width; x++)
557 {
558 - dest[x] = (unsigned char) (ptr[x+y*width]&255);
559 + dest[x] = ptr[(x+y*width)*2];
560 }
561 }
562 return;
563
564 case 32:
565 {
566 - unsigned int *ptr =
567 - (unsigned int *) m_provider->get_data();
568 + unsigned char *ptr =
569 + (unsigned char *) m_provider->get_data();
570
571 for (int x=0; x<width; x++)
572 {
573 - dest[x] = (unsigned char) (ptr[x+y*width]&255);
574 + dest[x] = ptr[(x+y*width)*4];
575 }
576 }
577 return;
578 diff -up ClanLib-0.6.5/Sources/API/GUI/component_options.h.foo ClanLib-0.6.5/Sources/API/GUI/component_options.h
579 --- ClanLib-0.6.5/Sources/API/GUI/component_options.h.foo 2002-02-20 08:47:11.000000000 +0100
580 +++ ClanLib-0.6.5/Sources/API/GUI/component_options.h 2008-09-07 13:39:37.000000000 +0200
581 @@ -23,7 +23,12 @@
582 #include "../Core/System/error.h"
583 #include <map>
584 #include <string>
585 +
586 +#ifndef WIN32
587 +#include <cstdio>
588 +#else
589 #include <stdio.h>
590 +#endif
591
592 #ifdef WIN32
593 #define snprintf _snprintf
594 diff -up ClanLib-0.6.5/Sources/API/GUI/gui_manager.h.foo ClanLib-0.6.5/Sources/API/GUI/gui_manager.h
595 --- ClanLib-0.6.5/Sources/API/GUI/gui_manager.h.foo 2002-01-30 14:17:16.000000000 +0100
596 +++ ClanLib-0.6.5/Sources/API/GUI/gui_manager.h 2008-09-07 13:39:37.000000000 +0200
597 @@ -19,7 +19,11 @@
598 #ifndef header_gui_manager
599 #define header_gui_manager
600
601 +#ifndef WIN32
602 +#include <cstddef>
603 +#else
604 #include <stddef.h>
605 +#endif
606
607 #include "component.h"
608
609 diff -up ClanLib-0.6.5/Sources/API/MikMod/streamed_mikmod_sample.h.foo ClanLib-0.6.5/Sources/API/MikMod/streamed_mikmod_sample.h
610 --- ClanLib-0.6.5/Sources/API/MikMod/streamed_mikmod_sample.h.foo 2001-12-11 21:44:20.000000000 +0100
611 +++ ClanLib-0.6.5/Sources/API/MikMod/streamed_mikmod_sample.h 2008-09-07 13:39:37.000000000 +0200
612 @@ -22,7 +22,12 @@
613 #ifndef header_streamed_mikmod_sample
614 #define header_streamed_mikmod_sample
615
616 +#ifndef WIN32
617 +#include <cstdlib>
618 +#else
619 #include <stdlib.h>
620 +#endif
621 +
622 #include "../core.h"
623 #include "../Sound/stream_soundprovider.h"
624 #include "../Sound/soundbuffer.h"
625 diff -up ClanLib-0.6.5/Sources/API/Signals/slot.h.foo ClanLib-0.6.5/Sources/API/Signals/slot.h
626 --- ClanLib-0.6.5/Sources/API/Signals/slot.h.foo 2001-09-22 17:52:17.000000000 +0200
627 +++ ClanLib-0.6.5/Sources/API/Signals/slot.h 2008-09-07 13:39:37.000000000 +0200
628 @@ -20,7 +20,11 @@
629 #define header_slot
630
631 #include "slot_generic.h"
632 +#ifndef WIN32
633 +#include <cstdlib>
634 +#else
635 #include <stdlib.h>
636 +#endif
637
638 //: Slot class
639 class CL_Slot
640 diff -up ClanLib-0.6.5/Sources/API/Sound/SoundProviders/stream_provider_raw.h.foo ClanLib-0.6.5/Sources/API/Sound/SoundProviders/stream_provider_raw.h
641 --- ClanLib-0.6.5/Sources/API/Sound/SoundProviders/stream_provider_raw.h.foo 2001-12-11 21:44:21.000000000 +0100
642 +++ ClanLib-0.6.5/Sources/API/Sound/SoundProviders/stream_provider_raw.h 2008-09-07 13:39:37.000000000 +0200
643 @@ -22,7 +22,12 @@
644 #ifndef header_streamed_raw_sample
645 #define header_streamed_raw_sample
646
647 +#ifndef WIN32
648 +#include <cstdlib>
649 +#else
650 #include <stdlib.h>
651 +#endif
652 +
653 #include "../stream_soundprovider.h"
654 #include "../soundbuffer.h"
655
656 diff -up ClanLib-0.6.5/Sources/API/Sound/SoundProviders/stream_provider_wave.h.foo ClanLib-0.6.5/Sources/API/Sound/SoundProviders/stream_provider_wave.h
657 --- ClanLib-0.6.5/Sources/API/Sound/SoundProviders/stream_provider_wave.h.foo 2001-12-11 21:44:21.000000000 +0100
658 +++ ClanLib-0.6.5/Sources/API/Sound/SoundProviders/stream_provider_wave.h 2008-09-07 13:39:37.000000000 +0200
659 @@ -22,7 +22,12 @@
660 #ifndef header_streamed_wave_sample
661 #define header_streamed_wave_sample
662
663 +#ifndef WIN32
664 +#include <cstdlib>
665 +#else
666 #include <stdlib.h>
667 +#endif
668 +
669 #include "../../Core/IOData/inputsource.h"
670 #include "../stream_soundprovider.h"
671 #include "../soundbuffer.h"
672 diff -up ClanLib-0.6.5/Sources/API/Sound/sound.h.foo ClanLib-0.6.5/Sources/API/Sound/sound.h
673 --- ClanLib-0.6.5/Sources/API/Sound/sound.h.foo 2002-06-13 16:43:17.000000000 +0200
674 +++ ClanLib-0.6.5/Sources/API/Sound/sound.h 2008-09-07 13:39:37.000000000 +0200
675 @@ -20,7 +20,11 @@
676 #define header_sound
677
678 #include <vector>
679 +#ifndef WIN32
680 +#include <cstdlib>
681 +#else
682 #include <stdlib.h>
683 +#endif
684 #include "soundbuffer.h"
685 #include "../Core/System/cl_assert.h"
686
687 diff -up ClanLib-0.6.5/Sources/API/Sound/soundbuffer_session.h.foo ClanLib-0.6.5/Sources/API/Sound/soundbuffer_session.h
688 --- ClanLib-0.6.5/Sources/API/Sound/soundbuffer_session.h.foo 2001-09-22 17:52:18.000000000 +0200
689 +++ ClanLib-0.6.5/Sources/API/Sound/soundbuffer_session.h 2008-09-07 13:39:37.000000000 +0200
690 @@ -19,7 +19,11 @@
691 #ifndef header_soundbuffer_session
692 #define header_soundbuffer_session
693
694 +#ifndef WIN32
695 +#include <cstdlib>
696 +#else
697 #include <stdlib.h>
698 +#endif
699
700 class CL_SoundCard;
701 class CL_SoundPlayBackDesc;
702 diff -up ClanLib-0.6.5/Sources/API/efence.h.foo ClanLib-0.6.5/Sources/API/efence.h
703 --- ClanLib-0.6.5/Sources/API/efence.h.foo 2001-09-06 20:52:04.000000000 +0200
704 +++ ClanLib-0.6.5/Sources/API/efence.h 2008-09-07 13:39:37.000000000 +0200
705 @@ -23,7 +23,7 @@
706
707 #ifndef WIN32
708
709 -#include <stdlib.h>
710 +#include <cstdlib>
711
712 void *operator new(size_t size)
713 {
714 diff -up ClanLib-0.6.5/Sources/Core/IOData/Unix/directory_scanner_unix.cpp.foo ClanLib-0.6.5/Sources/Core/IOData/Unix/directory_scanner_unix.cpp
715 --- ClanLib-0.6.5/Sources/Core/IOData/Unix/directory_scanner_unix.cpp.foo 2002-01-10 11:23:30.000000000 +0100
716 +++ ClanLib-0.6.5/Sources/Core/IOData/Unix/directory_scanner_unix.cpp 2008-09-07 13:39:37.000000000 +0200
717 @@ -13,6 +13,7 @@
718 ------------------------------------------------------------------------
719 */
720
721 +#include <cassert>
722 #include <API/Core/System/error.h>
723 #include <iostream>
724 #include <libgen.h>
725 diff -up ClanLib-0.6.5/Sources/Core/IOData/Unix/directory_scanner_unix.h.foo ClanLib-0.6.5/Sources/Core/IOData/Unix/directory_scanner_unix.h
726 --- ClanLib-0.6.5/Sources/Core/IOData/Unix/directory_scanner_unix.h.foo 2002-01-10 00:45:16.000000000 +0100
727 +++ ClanLib-0.6.5/Sources/Core/IOData/Unix/directory_scanner_unix.h 2008-09-07 13:39:37.000000000 +0200
728 @@ -21,7 +21,11 @@
729 #include <sys/types.h>
730 #include <sys/stat.h>
731 #include <dirent.h>
732 -#include <stdio.h>
733 +#ifndef WIN32
734 +#include <cstdio>
735 +#else
736 +#include <cstdio>
737 +#endif
738 #include <unistd.h>
739
740 class CL_DirectoryScanner_Unix : public CL_DirectoryScanner_Generic
741 diff -up ClanLib-0.6.5/Sources/Core/System/Unix/appconf.h.foo ClanLib-0.6.5/Sources/Core/System/Unix/appconf.h
742 --- ClanLib-0.6.5/Sources/Core/System/Unix/appconf.h.foo 2000-05-03 20:29:00.000000000 +0200
743 +++ ClanLib-0.6.5/Sources/Core/System/Unix/appconf.h 2008-09-07 13:39:37.000000000 +0200
744 @@ -435,6 +435,7 @@ private:
745
746 class FileConfig : public BaseConfig
747 {
748 +protected: class ConfigGroup; /* prototype for later definition */
749 public:
750 /** @name Constructors and destructor */
751 //@{
752 @@ -527,7 +528,6 @@ public:
753
754 //protected: --- if FileConfig::ConfigEntry is not public, functions in
755 // ConfigGroup such as Find/AddEntry can't return ConfigEntry*!
756 - class ConfigGroup;
757 class ConfigEntry
758 {
759 private:
760 diff -up ClanLib-0.6.5/Sources/Display/Display/DirectFB/display_directfb.cpp.foo ClanLib-0.6.5/Sources/Display/Display/DirectFB/display_directfb.cpp
761 --- ClanLib-0.6.5/Sources/Display/Display/DirectFB/display_directfb.cpp.foo 2002-02-26 21:38:11.000000000 +0100
762 +++ ClanLib-0.6.5/Sources/Display/Display/DirectFB/display_directfb.cpp 2008-09-07 13:39:37.000000000 +0200
763 @@ -17,12 +17,12 @@
764 #ifdef USE_DIRECTFB
765
766
767 -#include <stdlib.h>
768 -#include <stdio.h>
769 -#include <string.h>
770 -#include <iostream>
771 +#include <cstdlib>
772 +#include <cstdio>
773 +#include <cstring>
774 +#include <cmath>
775
776 -#include <math.h>
777 +#include <iostream>
778
779 #include <API/Display/Display/mousecursor.h>
780 #include <API/Display/Display/cliprect.h>
781 @@ -177,7 +177,7 @@ void CL_DirectFB_DisplayCard::set_videom
782
783 if (fullscreen)
784 {
785 - cerr << "CL_DirectFB_DisplayCard: Falling back to DFSCL_NORMAL" << endl;
786 + std::cerr << "CL_DirectFB_DisplayCard: Falling back to DFSCL_NORMAL" << std::endl;
787 dfb->SetCooperativeLevel (dfb, DFSCL_NORMAL);
788 ret = dfb->SetVideoMode (dfb, get_width(), get_height(), bpp);
789 }
790 diff -up ClanLib-0.6.5/Sources/Display/Display/DirectFB/target_directfb.cpp.foo ClanLib-0.6.5/Sources/Display/Display/DirectFB/target_directfb.cpp
791 --- ClanLib-0.6.5/Sources/Display/Display/DirectFB/target_directfb.cpp.foo 2002-02-26 21:38:11.000000000 +0100
792 +++ ClanLib-0.6.5/Sources/Display/Display/DirectFB/target_directfb.cpp 2008-09-07 13:39:37.000000000 +0200
793 @@ -104,7 +104,7 @@ unsigned int CL_Target_DirectFB::get_num
794
795 unsigned int CL_Target_DirectFB::get_width() const
796 {
797 - unsigned int width = 0;
798 + int width = 0;
799
800 surface->GetSize (surface, &width, NULL);
801
802 @@ -113,7 +113,7 @@ unsigned int CL_Target_DirectFB::get_wid
803
804 unsigned int CL_Target_DirectFB::get_height() const
805 {
806 - unsigned int height = 0;
807 + int height = 0;
808
809 surface->GetSize (surface, NULL, &height);
810
811 @@ -147,7 +147,7 @@ unsigned int CL_Target_DirectFB::get_red
812 {
813 case DSPF_A8:
814 return 0;
815 - case DSPF_RGB15:
816 + case DSPF_ARGB1555:
817 return 0x007c00;
818 case DSPF_RGB16:
819 return 0x00f800;
820 @@ -170,7 +170,7 @@ unsigned int CL_Target_DirectFB::get_gre
821 {
822 case DSPF_A8:
823 return 0;
824 - case DSPF_RGB15:
825 + case DSPF_ARGB1555:
826 return 0x0003e0;
827 case DSPF_RGB16:
828 return 0x0007e0;
829 @@ -193,7 +193,7 @@ unsigned int CL_Target_DirectFB::get_blu
830 {
831 case DSPF_A8:
832 return 0;
833 - case DSPF_RGB15:
834 + case DSPF_ARGB1555:
835 case DSPF_RGB16:
836 return 0x00001f;
837 case DSPF_RGB24:
838 @@ -215,7 +215,7 @@ unsigned int CL_Target_DirectFB::get_alp
839 {
840 case DSPF_A8:
841 return 0xff;
842 - case DSPF_RGB15:
843 + case DSPF_ARGB1555:
844 case DSPF_RGB16:
845 case DSPF_RGB24:
846 case DSPF_RGB32:
847 @@ -263,7 +263,7 @@ void CL_Target_DirectFB::Flip (DFBRegion
848
849 void CL_Target_DirectFB::Clear (float r, float g, float b, float a)
850 {
851 - unsigned int width, height;
852 + int width, height;
853
854 surface->GetSize (surface, &width, &height);
855
856 diff -up ClanLib-0.6.5/Sources/Display/Display/Generic/blit_alphamask_rle.h.foo ClanLib-0.6.5/Sources/Display/Display/Generic/blit_alphamask_rle.h
857 --- ClanLib-0.6.5/Sources/Display/Display/Generic/blit_alphamask_rle.h.foo 2001-09-02 19:33:37.000000000 +0200
858 +++ ClanLib-0.6.5/Sources/Display/Display/Generic/blit_alphamask_rle.h 2008-09-07 13:39:37.000000000 +0200
859 @@ -107,14 +107,14 @@ public:
860 {
861 T a = alpha_data[x];
862 T destval = dst_data[x];
863 - T r = lookup_r[(((destval&rmask)>>rstart)<<8)+a]; //(((destval&rmask)>>rstart)*a)>>8;
864 - T g = lookup_g[(((destval&gmask)>>gstart)<<8)+a]; //(((destval&gmask)>>gstart)*a)>>8;
865 - T b = lookup_b[(((destval&bmask)>>bstart)<<8)+a]; //(((destval&bmask)>>bstart)*a)>>8;
866 + T r = this->lookup_r[(((destval&this->rmask)>>this->rstart)<<8)+a]; //(((destval&rmask)>>rstart)*a)>>8;
867 + T g = this->lookup_g[(((destval&this->gmask)>>this->gstart)<<8)+a]; //(((destval&gmask)>>gstart)*a)>>8;
868 + T b = this->lookup_b[(((destval&this->bmask)>>this->bstart)<<8)+a]; //(((destval&bmask)>>bstart)*a)>>8;
869
870 T amix =
871 - (r<<rstart) +
872 - (g<<gstart) +
873 - (b<<bstart);
874 + (r<<this->rstart) +
875 + (g<<this->gstart) +
876 + (b<<this->bstart);
877
878 dst_data[x] = amix + *(src_data++);
879 }
880 @@ -151,13 +151,13 @@ public:
881 {
882 T a = alpha_data[x];
883 T destval = dst_buf[x];
884 - T r = lookup_r[(((destval&rmask)>>rstart)<<8)+a];
885 - T g = lookup_g[(((destval&gmask)>>gstart)<<8)+a];
886 - T b = lookup_b[(((destval&bmask)>>bstart)<<8)+a];
887 + T r = this->lookup_r[(((destval&this->rmask)>>this->rstart)<<8)+a];
888 + T g = this->lookup_g[(((destval&this->gmask)>>this->gstart)<<8)+a];
889 + T b = this->lookup_b[(((destval&this->bmask)>>this->bstart)<<8)+a];
890 T amix =
891 - (r<<rstart) +
892 - (g<<gstart) +
893 - (b<<bstart);
894 + (r<<this->rstart) +
895 + (g<<this->gstart) +
896 + (b<<this->bstart);
897 dst_buf[x] = amix + *(src_data++);
898 }
899 memcpy(dst_data, dst_buf, sizeof(T)*rep);
900 diff -up ClanLib-0.6.5/Sources/Display/Display/Generic/blit_transparent.cpp.foo ClanLib-0.6.5/Sources/Display/Display/Generic/blit_transparent.cpp
901 --- ClanLib-0.6.5/Sources/Display/Display/Generic/blit_transparent.cpp.foo 2001-09-02 04:24:43.000000000 +0200
902 +++ ClanLib-0.6.5/Sources/Display/Display/Generic/blit_transparent.cpp 2008-09-07 13:39:37.000000000 +0200
903 @@ -278,7 +278,7 @@ void SubBlitter_Transparent<T>::blt_nocl
904 unsigned int dest_pitch = target->get_pitch();
905
906 unsigned char *dest = (unsigned char *) target->get_data();
907 - dest += x*sizeof(T) + (y-1)*dest_pitch;
908 + dest += x*sizeof(T) + y*dest_pitch - dest_pitch;
909
910 // T *dd;
911
912 diff -up ClanLib-0.6.5/Sources/Display/Display/Generic/blitters.h.foo ClanLib-0.6.5/Sources/Display/Display/Generic/blitters.h
913 --- ClanLib-0.6.5/Sources/Display/Display/Generic/blitters.h.foo 2001-04-12 21:58:17.000000000 +0200
914 +++ ClanLib-0.6.5/Sources/Display/Display/Generic/blitters.h 2008-09-07 13:39:37.000000000 +0200
915 @@ -20,7 +20,11 @@
916 #define header_blitters
917
918 class CL_Target;
919 +#ifndef WIN32
920 +#include <cstdlib>
921 +#else
922 #include <stdlib.h>
923 +#endif
924 #include "API/Display/Display/cliprect.h"
925 /*
926 #include "API/Display/Display/surfaceprovider.h"
927 diff -up ClanLib-0.6.5/Sources/Display/Display/Generic/target_generic.cpp.foo ClanLib-0.6.5/Sources/Display/Display/Generic/target_generic.cpp
928 --- ClanLib-0.6.5/Sources/Display/Display/Generic/target_generic.cpp.foo 2002-02-18 23:47:37.000000000 +0100
929 +++ ClanLib-0.6.5/Sources/Display/Display/Generic/target_generic.cpp 2008-09-07 13:39:37.000000000 +0200
930 @@ -713,13 +713,13 @@ void cl_fill_rect_opaque(
931 }
932 }
933 }
934 -
935 + break;
936 case 2:
937 {
938 register unsigned short _color = (unsigned short) color;
939 int skip = dest_pitch - delta_x * 2;
940 // the blitter probes if it can perform a memset (when hi and lo byte of _color are equal)
941 - if ((_color & 0x00FF) != (_color & 0xFF00))
942 + if ((_color & 0x00FF) != ((_color & 0xFF00) >> 8))
943 {
944 for (unsigned int y = 0; y < delta_y; y++)
945 {
946 @@ -758,8 +758,8 @@ void cl_fill_rect_opaque(
947 for (unsigned int x = 0; x < delta_x; x++)
948 {
949 *(dest++) = color & 0x0000FF;
950 - *(dest++) = color & 0x00FF00;
951 - *(dest++) = color & 0xFF0000;
952 + *(dest++) = (color & 0x00FF00) >> 8;
953 + *(dest++) = (color & 0xFF0000) >> 16;
954 }
955 dest += skip;
956 }
957 diff -up ClanLib-0.6.5/Sources/Display/Display/X11/target_ximage_std.cpp.foo ClanLib-0.6.5/Sources/Display/Display/X11/target_ximage_std.cpp
958 --- ClanLib-0.6.5/Sources/Display/Display/X11/target_ximage_std.cpp.foo 2001-03-06 16:09:19.000000000 +0100
959 +++ ClanLib-0.6.5/Sources/Display/Display/X11/target_ximage_std.cpp 2008-09-07 13:39:37.000000000 +0200
960 @@ -153,15 +153,12 @@ unsigned int CL_Target_XImage_Std::get_h
961
962 unsigned int CL_Target_XImage_Std::get_pitch() const
963 {
964 - int bytes_per_pixel = (get_depth()+7)/8;
965 -
966 - return m_width*bytes_per_pixel;
967 + return m_pitch;
968 }
969
970 unsigned int CL_Target_XImage_Std::get_depth() const
971 {
972 - int hack = (m_visual_info.bits_per_rgb+7)/8;
973 - return hack*8;
974 + return m_depth;
975 }
976
977 unsigned int CL_Target_XImage_Std::get_red_mask() const
978 diff -up ClanLib-0.6.5/Sources/Display/Display/X11/x11_resolution.cpp.foo ClanLib-0.6.5/Sources/Display/Display/X11/x11_resolution.cpp
979 --- ClanLib-0.6.5/Sources/Display/Display/X11/x11_resolution.cpp.foo 2002-04-04 03:16:11.000000000 +0200
980 +++ ClanLib-0.6.5/Sources/Display/Display/X11/x11_resolution.cpp 2008-09-07 13:39:37.000000000 +0200
981 @@ -51,12 +51,32 @@ void CL_X11Resolution::set_mode(int widt
982
983 if (!mode_set) // save original mode
984 {
985 + XF86VidModeModeLine l;
986 memset(&orig_mode, 0, sizeof(orig_mode));
987 memset(&orig_view, 0, sizeof(orig_view));
988 + memset(&l, 0, sizeof(l));
989
990 // Get mode info. (missing XF86VidModeGetModeInfo)
991 - XF86VidModeModeLine *l = (XF86VidModeModeLine*)((char*) &orig_mode + sizeof orig_mode.dotclock);
992 - cl_assert(XF86VidModeGetModeLine(dpy, scr, (int*) &orig_mode.dotclock, l) == True);
993 + // XF86VidModeModeLine *l = (XF86VidModeModeLine*)((char*) &orig_mode + sizeof orig_mode.dotclock);
994 + // there is a problem with alignment on 64bit platforms
995 +
996 +
997 + cl_assert(XF86VidModeGetModeLine(dpy, scr, (int*) &orig_mode.dotclock, &l) == True);
998 +
999 +
1000 + // this should be ok on all platforms
1001 + orig_mode.hdisplay = l.hdisplay;
1002 + orig_mode.hsyncstart = l.hsyncstart;
1003 + orig_mode.hsyncend = l.hsyncend;
1004 + orig_mode.htotal = l.htotal;
1005 + orig_mode.hskew = l.hskew;
1006 + orig_mode.vdisplay = l.vdisplay;
1007 + orig_mode.vsyncstart = l.vsyncstart;
1008 + orig_mode.vsyncend = l.vsyncend;
1009 + orig_mode.vtotal = l.vtotal;
1010 + orig_mode.flags = l.flags;
1011 + orig_mode.privsize = l.privsize;
1012 + orig_mode.c_private = l.c_private;
1013
1014 // Get the viewport position.
1015 cl_assert(XF86VidModeGetViewPort(dpy, scr, &orig_view.x, &orig_view.y) == True);
1016 diff -up ClanLib-0.6.5/Sources/GL/GLX/displaycard_glx.cpp.foo ClanLib-0.6.5/Sources/GL/GLX/displaycard_glx.cpp
1017 --- ClanLib-0.6.5/Sources/GL/GLX/displaycard_glx.cpp.foo 2002-02-16 17:10:41.000000000 +0100
1018 +++ ClanLib-0.6.5/Sources/GL/GLX/displaycard_glx.cpp 2008-09-07 13:39:37.000000000 +0200
1019 @@ -363,7 +363,8 @@ void CL_GLX_DisplayCard::keep_alive()
1020
1021 void (*CL_GLX_DisplayCard::get_proc_address(const std::string& function_name))()
1022 {
1023 - return glXGetProcAddressARB((GLubyte*)function_name.c_str());
1024 + return glXGetProcAddress(reinterpret_cast<GLubyte*>(
1025 + const_cast<char *>(function_name.c_str())));
1026 }
1027
1028
1029 diff -up ClanLib-0.6.5/Sources/GUI/component_manager_generic.h.foo ClanLib-0.6.5/Sources/GUI/component_manager_generic.h
1030 --- ClanLib-0.6.5/Sources/GUI/component_manager_generic.h.foo 2002-01-08 11:17:25.000000000 +0100
1031 +++ ClanLib-0.6.5/Sources/GUI/component_manager_generic.h 2008-09-07 13:39:37.000000000 +0200
1032 @@ -14,7 +14,11 @@
1033 #include <string>
1034 #include <stack>
1035 #include <vector>
1036 +#ifndef WIN32
1037 +#include <cstdio>
1038 +#else
1039 #include <stdio.h>
1040 +#endif
1041
1042 #include "API/GUI/component_manager.h"
1043 #include "API/GUI/stylemanager.h"
1044 diff -up ClanLib-0.6.5/Sources/JPEG/provider_jpeg_generic.h.foo ClanLib-0.6.5/Sources/JPEG/provider_jpeg_generic.h
1045 --- ClanLib-0.6.5/Sources/JPEG/provider_jpeg_generic.h.foo 2001-09-08 21:12:52.000000000 +0200
1046 +++ ClanLib-0.6.5/Sources/JPEG/provider_jpeg_generic.h 2008-09-07 13:39:37.000000000 +0200
1047 @@ -23,7 +23,12 @@
1048 #define XMD_H
1049 #endif
1050
1051 +#ifndef WIN32
1052 +#include <cstdio>
1053 +#else
1054 #include <stdio.h>
1055 +#endif
1056 +
1057 extern "C"
1058 {
1059 #include <jpeglib.h>
1060 diff -up ClanLib-0.6.5/Sources/Network/Generic/network_delivery_socket.h.foo ClanLib-0.6.5/Sources/Network/Generic/network_delivery_socket.h
1061 --- ClanLib-0.6.5/Sources/Network/Generic/network_delivery_socket.h.foo 2001-11-01 21:27:57.000000000 +0100
1062 +++ ClanLib-0.6.5/Sources/Network/Generic/network_delivery_socket.h 2008-09-07 13:39:37.000000000 +0200
1063 @@ -20,18 +20,19 @@
1064
1065 #ifdef WIN32
1066 #include <windows.h>
1067 + #include <string.h>
1068 #else
1069 + #include <cstring>
1070 + #include <cerrno>
1071 #include <sys/time.h>
1072 #include <sys/types.h>
1073 #include <sys/socket.h>
1074 #include <arpa/inet.h>
1075 #include <netinet/in.h>
1076 #include <unistd.h>
1077 - #include <errno.h>
1078 #include <fcntl.h>
1079 #endif
1080
1081 -#include <string.h>
1082 #include <list>
1083 #include <queue>
1084
1085 diff -up ClanLib-0.6.5/Sources/Network/Unix/unix_pipe_connection.h.foo ClanLib-0.6.5/Sources/Network/Unix/unix_pipe_connection.h
1086 --- ClanLib-0.6.5/Sources/Network/Unix/unix_pipe_connection.h.foo 2001-09-08 21:24:20.000000000 +0200
1087 +++ ClanLib-0.6.5/Sources/Network/Unix/unix_pipe_connection.h 2008-09-07 13:39:37.000000000 +0200
1088 @@ -20,14 +20,20 @@
1089 #ifndef header_network_delivery_pipe
1090 #define header_network_delivery_pipe
1091
1092 +#ifndef WIN32
1093 +#include <cerrno>
1094 +#include <cstring>
1095 +#else
1096 +#include <errno.h>
1097 +#include <string.h>
1098 +#endif
1099 +
1100 #include <sys/time.h>
1101 #include <sys/types.h>
1102 #include <sys/socket.h>
1103 #include <arpa/inet.h>
1104 #include <netinet/in.h>
1105 #include <unistd.h>
1106 -#include <errno.h>
1107 -#include <string.h>
1108 #include <list>
1109
1110 #include "Network/Generic/network_delivery_impl.h"
1111 diff -up ClanLib-0.6.5/Sources/SmallJPEG/jpgd/main.h.foo ClanLib-0.6.5/Sources/SmallJPEG/jpgd/main.h
1112 --- ClanLib-0.6.5/Sources/SmallJPEG/jpgd/main.h.foo 2001-04-20 14:54:18.000000000 +0200
1113 +++ ClanLib-0.6.5/Sources/SmallJPEG/jpgd/main.h 2008-09-07 13:39:37.000000000 +0200
1114 @@ -22,6 +22,15 @@
1115 #ifndef MAIN_H
1116 #define MAIN_H
1117
1118 +#ifndef WIN32
1119 +#include <cstdlib>
1120 +#include <cstdio>
1121 +#include <cmath>
1122 +#include <cstring>
1123 +#include <cctype>
1124 +#include <csetjmp>
1125 +#include <cassert>
1126 +#else
1127 #include <stdlib.h>
1128 #include <stdio.h>
1129 #include <math.h>
1130 @@ -29,6 +38,7 @@
1131 #include <ctype.h>
1132 #include <setjmp.h>
1133 #include <assert.h>
1134 +#endif
1135
1136 typedef signed char schar; /* 8 bits */
1137 typedef unsigned char uchar; /* 8 bits */
1138 diff -up ClanLib-0.6.5/Sources/Sound/SoundProviders/static_provider_wave.cpp.foo ClanLib-0.6.5/Sources/Sound/SoundProviders/static_provider_wave.cpp
1139 --- ClanLib-0.6.5/Sources/Sound/SoundProviders/static_provider_wave.cpp.foo 2002-08-14 15:58:29.000000000 +0200
1140 +++ ClanLib-0.6.5/Sources/Sound/SoundProviders/static_provider_wave.cpp 2008-09-07 13:39:37.000000000 +0200
1141 @@ -27,6 +27,7 @@
1142 #include "API/Core/System/error.h"
1143 #include "API/Sound/SoundProviders/static_provider_raw.h"
1144 #include "API/Sound/SoundProviders/static_provider_wave.h"
1145 +#include "API/Core/IOData/cl_endian.h"
1146
1147 CL_SoundBuffer *CL_Sample::create(const std::string &sample_id, CL_InputSourceProvider *provider)
1148 {
1149 diff -up ClanLib-0.6.5/Sources/Sound/SoundProviders/stream_provider_wave.cpp.foo ClanLib-0.6.5/Sources/Sound/SoundProviders/stream_provider_wave.cpp
1150 --- ClanLib-0.6.5/Sources/Sound/SoundProviders/stream_provider_wave.cpp.foo 2002-08-14 16:00:13.000000000 +0200
1151 +++ ClanLib-0.6.5/Sources/Sound/SoundProviders/stream_provider_wave.cpp 2008-09-07 13:39:37.000000000 +0200
1152 @@ -22,6 +22,7 @@
1153
1154 #include "API/Core/System/cl_assert.h"
1155 #include "API/Core/System/error.h"
1156 +#include "API/Core/IOData/cl_endian.h"
1157 #include "API/Core/IOData/inputsource.h"
1158 #include "API/Core/IOData/inputsource_provider.h"
1159 #include "API/Sound/SoundProviders/stream_provider_wave.h"
1160 @@ -118,10 +119,13 @@ CL_Streamed_WaveSample_Session::CL_Strea
1161 // cl_assert(!(memcmp(temp, "data", 4)));
1162
1163 sample_size = input->read_uint32();
1164 + SWAP_IF_BIG(format.nSamplesPerSec);
1165 sample_freq = format.nSamplesPerSec;
1166
1167 + SWAP_IF_BIG(format.nAvgBytesPerSec);
1168 int bytes_per_sample = format.nAvgBytesPerSec / format.nSamplesPerSec;
1169
1170 + SWAP_IF_BIG(format.nChannels);
1171 if (format.nChannels == 2 && bytes_per_sample == 4) sample_format = sf_16bit_signed_stereo;
1172 else if (format.nChannels == 2 && bytes_per_sample == 2) sample_format = sf_8bit_signed_stereo;
1173 else if (format.nChannels == 1 && bytes_per_sample == 2) sample_format = sf_16bit_signed;
1174 diff -up ClanLib-0.6.5/configure.in.foo ClanLib-0.6.5/configure.in
1175 --- ClanLib-0.6.5/configure.in.foo 2008-09-07 13:39:25.000000000 +0200
1176 +++ ClanLib-0.6.5/configure.in 2008-09-07 13:39:37.000000000 +0200
1177 @@ -217,7 +217,7 @@ dnl CHECK_LIB(ggi,Setup/Tests/ggi.cpp, G
1178
1179 CHECK_LIB(GL,Setup/Tests/opengl.cpp, OPENGL=enabled, OPENGL=disabled, [$x_libraries -lGL -lGLU -lpthread])
1180 CHECK_LIB(mikmod,Setup/Tests/mikmod.cpp, mikmod=enabled, mikmod=disabled, [$x_libraries -lmikmod])
1181 -CHECK_LIB(png,Setup/Tests/png.cpp, png=enabled, png=disabled, [$x_libraries -lpng])
1182 +CHECK_LIB(png,Setup/Tests/png.cpp, png=enabled, png=disabled, [$x_libraries -lpng -lz])
1183 CHECK_LIB(jpeg,Setup/Tests/jpeg.cpp, jpeg=enabled, jpeg=disabled, [$x_libraries -ljpeg])
1184 for lib in lua40 lua; do
1185 dnl setting back OLDLIBS is needed because of the break
admin@fedoraproject.org
 ViewVC Help
Powered by ViewVC 1.1.2