X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=common.h;h=f97549fefe33a23128e63bb1fdbfe2b81c5ac8b1;hb=e38fee1b96c0b904d7f221a349fb2492258d5789;hp=c3c03bab27bf8e4a9dd4ae3a8ed41df47adbdf5e;hpb=eac69717338922e6bb55076e57d7674080291fe9;p=gpsp.git

diff --git a/common.h b/common.h
index c3c03ba..f97549f 100644
--- a/common.h
+++ b/common.h
@@ -23,12 +23,21 @@
 #define ror(dest, value, shift)                                               \
   dest = ((value) >> shift) | ((value) << (32 - shift))                       \
 
+#if defined(_WIN32) || defined(_WIN32_WCE)
+  #define PATH_SEPARATOR "\\"
+  #define PATH_SEPARATOR_CHAR '\\'
+#else
+  #define PATH_SEPARATOR "/"
+  #define PATH_SEPARATOR_CHAR '/'
+#endif
+
 // These includes must be used before SDL is included.
 #ifdef ARM_ARCH
 
 #ifdef _WIN32_WCE
   #include <windows.h>
 #else
+  #define _BSD_SOURCE // sync
   #include <stdlib.h>
   #include <stdio.h>
   #include <string.h>
@@ -147,10 +156,10 @@
 #endif
 
   #define file_read(filename_tag, buffer, size)                               \
-    fread(buffer, size, 1, filename_tag)                                      \
+    fread(buffer, 1, size, filename_tag)                                      \
 
   #define file_write(filename_tag, buffer, size)                              \
-    fwrite(buffer, size, 1, filename_tag)                                     \
+    fwrite(buffer, 1, size, filename_tag)                                     \
 
   #define file_seek(filename_tag, offset, type)                               \
     fseek(filename_tag, offset, type)                                         \
@@ -179,6 +188,7 @@
 
 
 typedef u32 fixed16_16;
+typedef u32 fixed8_24;
 
 #define float_to_fp16_16(value)                                               \
   (fixed16_16)((value) * 65536.0)                                             \
@@ -195,6 +205,12 @@ typedef u32 fixed16_16;
 #define fp16_16_fractional_part(value)                                        \
   ((value) & 0xFFFF)                                                          \
 
+#define float_to_fp8_24(value)                                                \
+  (fixed8_24)((value) * 16777216.0)                                           \
+
+#define fp8_24_fractional_part(value)                                         \
+  ((value) & 0xFFFFFF)                                                        \
+
 #define fixed_div(numerator, denominator, bits)                               \
   (((numerator * (1 << bits)) + (denominator / 2)) / denominator)             \
 
@@ -224,6 +240,9 @@ typedef u32 fixed16_16;
 #include "zip.h"
 #include "cheats.h"
 
+#ifdef ARM_ARCH
+  #include "arm/warm.h"
+#endif
 
 #ifdef PSP_BUILD
   #define printf pspDebugScreenPrintf
@@ -247,4 +266,8 @@ typedef u32 fixed16_16;
 //  #define STDIO_DEBUG
 #endif
 
+#ifdef PND_BUILD
+  #include "pandora/pnd.h"
+#endif
+
 #endif