First compilation, we just need more stupid assets

5 files changed, 25 insertions, 43 deletions

diff --git a/include/libc/math.h b/include/libc/math.h
index 0e63d99b..1f243d23 100644
--- a/include/libc/math.h
+++ b/include/libc/math.h
@@ -1,7 +1,7 @@
 #ifndef LIBC_MATH_H

 #define LIBC_MATH_H

 

-#include "PR/ultratypes.h"

+#include <libultra/types.h>

 

 #define M_PI    3.14159265358979323846f

 #define M_DTOR	(M_PI / 180.0f)

@@ -28,43 +28,25 @@ typedef union {
 

 extern f32 __libm_qnan_f;

 

-float fabsf(float f);

-#pragma intrinsic(fabsf)

-#ifdef __GNUC__

-#define fabsf(f) __builtin_fabsf((float)(f))

-#endif

-

-double fabs(double f);

-#pragma intrinsic(fabs)

-#ifdef __GNUC__

-#define fabs(f) __builtin_fabs((double)(f))

-#endif

-

-float sqrtf(float f);

-#pragma intrinsic(sqrtf)

-

-double sqrt(double d);

-#pragma intrinsic(sqrt)

-

-f32 __floorf(f32);

-f64 __floor(f64);

-s32 __lfloorf(f32);

-s32 __lfloor(f64);

-f32 __ceilf(f32);

-f64 __ceil(f64);

-s32 __lceilf(f32);

-s32 __lceil(f64);

-f32 __truncf(f32);

-f64 __trunc(f64);

-s32 __ltruncf(f32);

-s32 __ltrunc(f64);

-f32 __roundf(f32);

-f64 __round(f64);

-s32 __lroundf(f32);

-s32 __lround(f64);

-f32 __nearbyintf(f32);

-f64 __nearbyint(f64);

-s32 __lnearbyintf(f32);

-s32 __lnearbyint(f64);

+#define __floorf floorf

+#define __floor floor

+#define __lfloorf lfloorf

+#define __lfloor lfloor

+#define __ceilf ceilf

+#define __ceil ceil

+#define __lceilf lceilf

+#define __lceil lceil

+#define __truncf truncf

+#define __trunc trunc

+#define __ltruncf ltruncf

+#define __ltrunc ltrunc

+#define __roundf roundf

+#define __round round

+#define __lroundf lroundf

+#define __lround lround

+#define __nearbyintf nearbyintf

+#define __nearbyint nearbyint

+#define __lnearbyintf lnearbyintf

+#define __lnearbyint lnearbyint

 

 #endif

diff --git a/include/libc/stddef.h b/include/libc/stddef.h
index d7533961..6206dc8a 100644
--- a/include/libc/stddef.h
+++ b/include/libc/stddef.h
@@ -1,7 +1,7 @@
 #ifndef LIBC_STDDEF_H
 #define LIBC_STDDEF_H
 
-#include "PR/ultratypes.h"
+#include <libultra/types.h>
 
 typedef s32 ptrdiff_t;
 
diff --git a/include/libc/stdint.h b/include/libc/stdint.h
index 854fd254..3350767e 100644
--- a/include/libc/stdint.h
+++ b/include/libc/stdint.h
@@ -1,7 +1,7 @@
 #ifndef LIBC_STDINT_H
 #define LIBC_STDINT_H
 
-#include "PR/ultratypes.h"
+#include <libultra/types.h>
 
 typedef s32 intptr_t;
 typedef u32 uintptr_t;
diff --git a/include/libc/stdlib.h b/include/libc/stdlib.h
index ec15b4f6..08d313f4 100644
--- a/include/libc/stdlib.h
+++ b/include/libc/stdlib.h
@@ -1,7 +1,7 @@
 #ifndef LIBC_STDLIB_H
 #define LIBC_STDLIB_H
 
-#include "libc/stddef.h"
+#include "stddef.h"
 
 typedef struct {
     /* 0x0 */ int quot;
diff --git a/include/libc/string.h b/include/libc/string.h
index 9c6a1cb0..50e13fd1 100644
--- a/include/libc/string.h
+++ b/include/libc/string.h
@@ -1,7 +1,7 @@
 #ifndef LIBC_STRING_H
 #define LIBC_STRING_H
 
-#include "libc/stddef.h"
+#include "stddef.h"
 
 
 const char* strchr(const char* s, int c);