Skip to content

Commit 2b5e0e5

Browse files
authored
Merge pull request #70 from Triang3l/patch-1
cube: Fix vector function multiple definitions linkage errors
2 parents a7fa3bb + a72a77f commit 2b5e0e5

1 file changed

Lines changed: 10 additions & 10 deletions

File tree

  • devkitxenon/examples/xenon/graphics/cube/source

devkitxenon/examples/xenon/graphics/cube/source/engine.h

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -45,67 +45,67 @@ void gluLookAt(float eyex, float eyey, float eyez,
4545

4646
/* now some stupid, unoptimized vector stuff */
4747

48-
extern inline void vec_zero(eVector3 vec)
48+
static inline void vec_zero(eVector3 vec)
4949
{
5050
vec[0] = 0;
5151
vec[1] = 0;
5252
vec[2] = 0;
5353
}
5454

55-
extern inline void vec_copy(eVector3 dst, eVector3 src)
55+
static inline void vec_copy(eVector3 dst, eVector3 src)
5656
{
5757
dst[0] = src[0];
5858
dst[1] = src[1];
5959
dst[2] = src[2];
6060
}
6161

62-
extern inline float vec_dot(eVector3 vec1, eVector3 vec2)
62+
static inline float vec_dot(eVector3 vec1, eVector3 vec2)
6363
{
6464
return vec1[0] * vec2[0] + vec1[1] * vec2[1] +vec1[2] * vec2[2];
6565
}
6666

67-
extern inline void vec_cross(eVector3 dst, eVector3 src1, eVector3 src2)
67+
static inline void vec_cross(eVector3 dst, eVector3 src1, eVector3 src2)
6868
{
6969
dst[0] = src1[1] * src2[2] - src1[2] * src2[1];
7070
dst[1] = src1[2] * src2[0] - src1[0] * src2[2];
7171
dst[2] = src1[0] * src2[1] - src1[1] * src2[0];
7272
}
7373

74-
extern inline float vec_abs(eVector3 vec)
74+
static inline float vec_abs(eVector3 vec)
7575
{
7676
return sqrtf(vec[0]*vec[0] + vec[1] * vec[1] + vec[2] * vec[2]);
7777
}
7878

79-
extern inline void vec_normalize(eVector3 dst, eVector3 src)
79+
static inline void vec_normalize(eVector3 dst, eVector3 src)
8080
{
8181
float invlen = 1 / vec_abs(src);
8282
dst[0] = src[0] * invlen;
8383
dst[1] = src[1] * invlen;
8484
dst[2] = src[2] * invlen;
8585
}
8686

87-
extern inline void vec_scale(eVector3 dst, eVector3 src, float scale)
87+
static inline void vec_scale(eVector3 dst, eVector3 src, float scale)
8888
{
8989
dst[0] = src[0] * scale;
9090
dst[1] = src[1] * scale;
9191
dst[2] = src[2] * scale;
9292
}
9393

94-
extern inline void vec_add(eVector3 dst, eVector3 src1, eVector3 src2)
94+
static inline void vec_add(eVector3 dst, eVector3 src1, eVector3 src2)
9595
{
9696
dst[0] = src1[0] + src2[0];
9797
dst[1] = src1[1] + src2[1];
9898
dst[2] = src1[2] + src2[2];
9999
}
100100

101-
extern inline void vec_mac(eVector3 dst, eVector3 src1, eVector3 src2, float f)
101+
static inline void vec_mac(eVector3 dst, eVector3 src1, eVector3 src2, float f)
102102
{
103103
dst[0] = src1[0] + src2[0] * f;
104104
dst[1] = src1[1] + src2[1] * f;
105105
dst[2] = src1[2] + src2[2] * f;
106106
}
107107

108-
extern inline void vec_sub(eVector3 dst, eVector3 src1, eVector3 src2)
108+
static inline void vec_sub(eVector3 dst, eVector3 src1, eVector3 src2)
109109
{
110110
dst[0] = src1[0] - src2[0];
111111
dst[1] = src1[1] - src2[1];

0 commit comments

Comments
 (0)