Skip to content

Commit a284518

Browse files
committed
inc: update to sqlite 3.34.0, curl 7.73.0, cryptlib 3.4.5, DevIL 1.8.0, chipmunk 7.0.3
This fixes the sqlite3 headers which were broken by the recent upgrade to 3.33.0 From fbbindings. Some of these updates by St_W, but weren't sent to fbc. sqlite2.bi and bass.bi were touched but didn't change.
1 parent 4d51ab7 commit a284518

File tree

16 files changed

+280
-119
lines changed

16 files changed

+280
-119
lines changed

changelog.txt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,16 @@ Version 1.08.0
33
[changed]
44
- array descriptor contains new 'flags' field. Careful, breaks binary compatibility plus chicken-egg problem to build fbc.
55
- fbc '-version' reports build date in yyyy-mm-dd format (aka build date iso)
6-
- updated SQLite headers for binding to SQLite 3.33.0
6+
- updated SQLite headers for binding to SQLite 3.34.0
77
- updated BASS headers for binding to BASS 2.4.15
88
- updated PostgreSQL headers for binding to PostgreSQL 12.0
9-
- updated curl headers for binding to curl 7.66.0
9+
- updated curl headers for binding to curl 7.73.0
1010
- updated SDL1.2 bindings to SDL_gfx 2.0.26
1111
- updated SDL2 bindings to SDL2 2.0.14, SDL2_image 2.0.5, SDL2_mixer 2.0.4, SDL2_ttf 2.0.15
1212
- updated LLVM and Clang bindings to 5.0.0
13+
- updated Chipmunk2D binding to 7.0.3
14+
- updated cryptlib binding to 3.4.5
15+
- updated DevIL binding to 1.8.0
1316
- warning level for all warnings is increased by 1. Default warning level is 1. Previously, default warning level was 0 and some warnings had level of -1.
1417
- reverted changes due sf.net #893: invalid suffixes due to '-lang fb'
1518
- reverted changes due sf.net #832: Fix bug allowing QB style suffixes on all keywords, regardless of -lang

inc/IL/il.bi

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
'' FreeBASIC binding for DevIL-1.7.8
1+
'' FreeBASIC binding for DevIL-1.8.0
22
''
33
'' based on the C header files:
44
'' ImageLib Sources
5-
'' Copyright (C) 2000-2009 by Denton Woods
5+
'' Copyright (C) 2000-2017 by Denton Woods
66
'' Last modified: 03/07/2009
77
''
88
'' Filename: IL/il.h
@@ -12,7 +12,7 @@
1212
'' This library is free software; you can redistribute it and/or
1313
'' modify it under the terms of the GNU Lesser General Public
1414
'' License as published by the Free Software Foundation; either
15-
'' version 2 of the License, or (at your option) any later version.
15+
'' version 2.1 of the License, or (at your option) any later version.
1616
''
1717
'' This library is distributed in the hope that it will be useful,
1818
'' but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -21,10 +21,11 @@
2121
''
2222
'' You should have received a copy of the GNU Lesser General Public
2323
'' License along with this library; if not, write to the Free Software
24-
'' Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
24+
'' Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
25+
'' USA
2526
''
2627
'' translated to FreeBASIC by:
27-
'' Copyright © 2015 FreeBASIC development team
28+
'' Copyright © 2020 FreeBASIC development team
2829

2930
#pragma once
3031

@@ -104,8 +105,8 @@ const IL_HALF = &h140B
104105
const IL_VENDOR = &h1F00
105106
const IL_LOAD_EXT = &h1F01
106107
const IL_SAVE_EXT = &h1F02
107-
const IL_VERSION_1_7_8 = 1
108-
const IL_VERSION = 178
108+
const IL_VERSION_1_8_0 = 1
109+
const IL_VERSION = 180
109110
const IL_ORIGIN_BIT = &h00000001
110111
const IL_FILE_BIT = &h00000002
111112
const IL_PAL_BIT = &h00000004
@@ -175,6 +176,7 @@ const IL_TEXTURE = &h044F
175176
const IL_DPX = &h0450
176177
const IL_UTX = &h0451
177178
const IL_MP3 = &h0452
179+
const IL_KTX = &h0453
178180
const IL_JASC_PAL = &h0475
179181
const IL_NO_ERROR = &h0000
180182
const IL_INVALID_ENUM = &h0501

inc/IL/ilu.bi

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
'' FreeBASIC binding for DevIL-1.7.8
1+
'' FreeBASIC binding for DevIL-1.8.0
22
''
33
'' based on the C header files:
44
'' ImageLib Utility Sources
5-
'' Copyright (C) 2000-2009 by Denton Woods
5+
'' Copyright (C) 2000-2017 by Denton Woods
66
'' Last modified: 03/07/2009
77
''
88
'' Filename: IL/ilu.h
@@ -12,7 +12,7 @@
1212
'' This library is free software; you can redistribute it and/or
1313
'' modify it under the terms of the GNU Lesser General Public
1414
'' License as published by the Free Software Foundation; either
15-
'' version 2 of the License, or (at your option) any later version.
15+
'' version 2.1 of the License, or (at your option) any later version.
1616
''
1717
'' This library is distributed in the hope that it will be useful,
1818
'' but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -21,10 +21,11 @@
2121
''
2222
'' You should have received a copy of the GNU Lesser General Public
2323
'' License along with this library; if not, write to the Free Software
24-
'' Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
24+
'' Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
25+
'' USA
2526
''
2627
'' translated to FreeBASIC by:
27-
'' Copyright © 2015 FreeBASIC development team
28+
'' Copyright © 2020 FreeBASIC development team
2829

2930
#pragma once
3031

@@ -40,8 +41,8 @@
4041

4142
#define __ilu_h_
4243
#define __ILU_H__
43-
const ILU_VERSION_1_7_8 = 1
44-
const ILU_VERSION = 178
44+
const ILU_VERSION_1_8_0 = 1
45+
const ILU_VERSION = 180
4546
const ILU_FILTER = &h2600
4647
const ILU_NEAREST = &h2601
4748
const ILU_LINEAR = &h2602
@@ -74,6 +75,7 @@ const ILU_JAPANESE = &h0803
7475
const ILU_SPANISH = &h0804
7576
const ILU_GERMAN = &h0805
7677
const ILU_FRENCH = &h0806
78+
const ILU_ITALIAN = &h0807
7779

7880
type ILinfo
7981
Id as ILuint
@@ -121,6 +123,7 @@ declare function iluEmboss() as ILboolean
121123
declare function iluEnlargeCanvas(byval Width as ILuint, byval Height as ILuint, byval Depth as ILuint) as ILboolean
122124
declare function iluEnlargeImage(byval XDim as ILfloat, byval YDim as ILfloat, byval ZDim as ILfloat) as ILboolean
123125
declare function iluEqualize() as ILboolean
126+
declare function iluEqualize2() as ILboolean
124127
declare function iluErrorString(byval Error as ILenum) as const zstring ptr
125128
declare function iluConvolution(byval matrix as ILint ptr, byval scale as ILint, byval bias as ILint) as ILboolean
126129
declare function iluFlipImage() as ILboolean
@@ -148,6 +151,7 @@ declare function iluSaturate4f(byval r as ILfloat, byval g as ILfloat, byval b a
148151
declare function iluScale(byval Width as ILuint, byval Height as ILuint, byval Depth as ILuint) as ILboolean
149152
declare function iluScaleAlpha(byval scale as ILfloat) as ILboolean
150153
declare function iluScaleColours(byval r as ILfloat, byval g as ILfloat, byval b as ILfloat) as ILboolean
154+
declare function iluSepia() as ILboolean
151155
declare function iluSetLanguage(byval Language as ILenum) as ILboolean
152156
declare function iluSharpen(byval Factor as ILfloat, byval Iter as ILuint) as ILboolean
153157
declare function iluSwapColours() as ILboolean

inc/IL/ilut.bi

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
'' FreeBASIC binding for DevIL-1.7.8
1+
'' FreeBASIC binding for DevIL-1.8.0
22
''
33
'' based on the C header files:
44
'' ImageLib Utility Toolkit Sources
5-
'' Copyright (C) 2000-2009 by Denton Woods
5+
'' Copyright (C) 2000-2017 by Denton Woods
66
'' Last modified: 03/07/2009
77
''
88
'' Filename: IL/ilut.h
@@ -12,7 +12,7 @@
1212
'' This library is free software; you can redistribute it and/or
1313
'' modify it under the terms of the GNU Lesser General Public
1414
'' License as published by the Free Software Foundation; either
15-
'' version 2 of the License, or (at your option) any later version.
15+
'' version 2.1 of the License, or (at your option) any later version.
1616
''
1717
'' This library is distributed in the hope that it will be useful,
1818
'' but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -21,10 +21,11 @@
2121
''
2222
'' You should have received a copy of the GNU Lesser General Public
2323
'' License along with this library; if not, write to the Free Software
24-
'' Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
24+
'' Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
25+
'' USA
2526
''
2627
'' translated to FreeBASIC by:
27-
'' Copyright © 2015 FreeBASIC development team
28+
'' Copyright © 2020 FreeBASIC development team
2829

2930
#pragma once
3031

@@ -45,8 +46,8 @@
4546

4647
#define __ilut_h_
4748
#define __ILUT_H__
48-
const ILUT_VERSION_1_7_8 = 1
49-
const ILUT_VERSION = 178
49+
const ILUT_VERSION_1_8_0 = 1
50+
const ILUT_VERSION = 180
5051
const ILUT_OPENGL_BIT = &h00000001
5152
const ILUT_D3D_BIT = &h00000002
5253
const ILUT_ALL_ATTRIB_BITS = &h000FFFFF
@@ -89,7 +90,6 @@ const ILUT_DIRECT3D10 = 6
8990

9091
#ifdef __FB_WIN32__
9192
#define __ILUT_CONFIG_H__
92-
#define IL_USE_PRAGMA_LIBS
9393
#undef ILUT_USE_ALLEGRO
9494
#undef ILUT_USE_DIRECTX8
9595
#define ILUT_USE_OPENGL

inc/bass.bi

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
'' package are the property of their respective owners.
2626
''
2727
'' translated to FreeBASIC by:
28-
'' Copyright © 2019 FreeBASIC development team
28+
'' Copyright © 2020 FreeBASIC development team
2929

3030
#pragma once
3131

@@ -847,7 +847,6 @@ end type
847847

848848
const BASS_IOSNOTIFY_INTERRUPT = 1
849849
const BASS_IOSNOTIFY_INTERRUPT_END = 2
850-
851850
declare function BASS_SetConfig(byval option as DWORD, byval value as DWORD) as BOOL
852851
declare function BASS_GetConfig(byval option as DWORD) as DWORD
853852
declare function BASS_SetConfigPtr(byval option as DWORD, byval value as const any ptr) as BOOL

inc/chipmunk/chipmunk.bi

Lines changed: 29 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
'' FreeBASIC binding for Chipmunk-7.0.1
1+
'' FreeBASIC binding for Chipmunk-7.0.3
22
''
33
'' based on the C header files:
44
'' Copyright (c) 2007-2015 Scott Lembcke and Howling Moon Software
@@ -22,7 +22,7 @@
2222
'' SOFTWARE.
2323
''
2424
'' translated to FreeBASIC by:
25-
'' Copyright © 2015 FreeBASIC development team
25+
'' Copyright © 2020 FreeBASIC development team
2626

2727
#pragma once
2828

@@ -276,24 +276,34 @@ end type
276276
#define cpBBMergedArea(a, b) cast(cpFloat, (cpfmax((a).r, (b).r) - cpfmin((a).l, (b).l)) * (cpfmax((a).t, (b).t) - cpfmin((a).(b), (b).(b))))
277277

278278
private function cpBBSegmentQuery(byval bb as cpBB, byval a as cpVect, byval b as cpVect) as cpFloat
279-
dim idx as cpFloat = 1.0f / (b.x - a.x)
280-
dim tx1 as cpFloat = iif(bb.l = a.x, -INFINITY, (bb.l - a.x) * idx)
281-
dim tx2 as cpFloat = iif(bb.r = a.x, INFINITY, (bb.r - a.x) * idx)
282-
dim txmin as cpFloat = cpfmin(tx1, tx2)
283-
dim txmax as cpFloat = cpfmax(tx1, tx2)
284-
dim idy as cpFloat = 1.0f / (b.y - a.y)
285-
dim ty1 as cpFloat = iif(bb.b = a.y, -INFINITY, (bb.b - a.y) * idy)
286-
dim ty2 as cpFloat = iif(bb.t = a.y, INFINITY, (bb.t - a.y) * idy)
287-
dim tymin as cpFloat = cpfmin(ty1, ty2)
288-
dim tymax as cpFloat = cpfmax(ty1, ty2)
289-
if (tymin <= txmax) andalso (txmin <= tymax) then
290-
dim min as cpFloat = cpfmax(txmin, tymin)
291-
dim max as cpFloat = cpfmin(txmax, tymax)
292-
if (0.0 <= max) andalso (min <= 1.0) then
293-
return cpfmax(min, 0.0)
279+
dim delta as cpVect = cpvsub(b, a)
280+
dim tmin as cpFloat = -INFINITY
281+
dim tmax as cpFloat = INFINITY
282+
if delta.x = 0.0f then
283+
if (a.x < bb.l) orelse (bb.r < a.x) then
284+
return INFINITY
294285
end if
286+
else
287+
dim t1 as cpFloat = (bb.l - a.x) / delta.x
288+
dim t2 as cpFloat = (bb.r - a.x) / delta.x
289+
tmin = cpfmax(tmin, cpfmin(t1, t2))
290+
tmax = cpfmin(tmax, cpfmax(t1, t2))
291+
end if
292+
if delta.y = 0.0f then
293+
if (a.y < bb.b) orelse (bb.t < a.y) then
294+
return INFINITY
295+
end if
296+
else
297+
dim t1 as cpFloat = (bb.b - a.y) / delta.y
298+
dim t2 as cpFloat = (bb.t - a.y) / delta.y
299+
tmin = cpfmax(tmin, cpfmin(t1, t2))
300+
tmax = cpfmin(tmax, cpfmax(t1, t2))
301+
end if
302+
if ((tmin <= tmax) andalso (0.0f <= tmax)) andalso (tmin <= 1.0f) then
303+
return cpfmax(tmin, 0.0f)
304+
else
305+
return INFINITY
295306
end if
296-
return INFINITY
297307
end function
298308

299309
#define cpBBIntersectsSegment(bb, a, b) cast(cpBool, -(cpBBSegmentQuery((bb), (a), (b)) <> INFINITY))
@@ -949,7 +959,7 @@ end type
949959
declare sub cpSpaceDebugDraw(byval space as cpSpace ptr, byval options as cpSpaceDebugDrawOptions ptr)
950960
const CP_VERSION_MAJOR = 7
951961
const CP_VERSION_MINOR = 0
952-
const CP_VERSION_RELEASE = 1
962+
const CP_VERSION_RELEASE = 3
953963
extern cpVersionString as const zstring ptr
954964

955965
declare function cpMomentForCircle(byval m as cpFloat, byval r1 as cpFloat, byval r2 as cpFloat, byval offset as cpVect) as cpFloat

inc/chipmunk/chipmunk_unsafe.bi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
'' FreeBASIC binding for Chipmunk-7.0.1
1+
'' FreeBASIC binding for Chipmunk-7.0.3
22
''
33
'' based on the C header files:
44
'' Copyright (c) 2007-2015 Scott Lembcke and Howling Moon Software
@@ -22,7 +22,7 @@
2222
'' SOFTWARE.
2323
''
2424
'' translated to FreeBASIC by:
25-
'' Copyright © 2015 FreeBASIC development team
25+
'' Copyright © 2020 FreeBASIC development team
2626

2727
#pragma once
2828

inc/chipmunk/cpHastySpace.bi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
'' FreeBASIC binding for Chipmunk-7.0.1
1+
'' FreeBASIC binding for Chipmunk-7.0.3
22
''
33
'' based on the C header files:
44
'' Copyright (c) 2007-2015 Scott Lembcke and Howling Moon Software
@@ -22,7 +22,7 @@
2222
'' SOFTWARE.
2323
''
2424
'' translated to FreeBASIC by:
25-
'' Copyright © 2015 FreeBASIC development team
25+
'' Copyright © 2020 FreeBASIC development team
2626

2727
#pragma once
2828

inc/chipmunk/cpMarch.bi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
'' FreeBASIC binding for Chipmunk-7.0.1
1+
'' FreeBASIC binding for Chipmunk-7.0.3
22
''
33
'' based on the C header files:
44
'' Copyright (c) 2007-2015 Scott Lembcke and Howling Moon Software
@@ -22,7 +22,7 @@
2222
'' SOFTWARE.
2323
''
2424
'' translated to FreeBASIC by:
25-
'' Copyright © 2015 FreeBASIC development team
25+
'' Copyright © 2020 FreeBASIC development team
2626

2727
#pragma once
2828

inc/chipmunk/cpPolyline.bi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
'' FreeBASIC binding for Chipmunk-7.0.1
1+
'' FreeBASIC binding for Chipmunk-7.0.3
22
''
33
'' based on the C header files:
44
'' Copyright (c) 2007-2015 Scott Lembcke and Howling Moon Software
@@ -22,7 +22,7 @@
2222
'' SOFTWARE.
2323
''
2424
'' translated to FreeBASIC by:
25-
'' Copyright © 2015 FreeBASIC development team
25+
'' Copyright © 2020 FreeBASIC development team
2626

2727
#pragma once
2828

0 commit comments

Comments
 (0)