X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=gpsp.git;a=blobdiff_plain;f=common.h;h=f97549fefe33a23128e63bb1fdbfe2b81c5ac8b1;hp=8d55af9700ac803d3e6def98f67663e2ec1402d7;hb=108c704a364e89d071c67f929a292f05d019236a;hpb=8b6232a675c7b49bd9651805fc92917cc7a92198 diff --git a/common.h b/common.h index 8d55af9..f97549f 100644 --- a/common.h +++ b/common.h @@ -23,6 +23,14 @@ #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 @@ -148,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) \ @@ -180,6 +188,7 @@ typedef u32 fixed16_16; +typedef u32 fixed8_24; #define float_to_fp16_16(value) \ (fixed16_16)((value) * 65536.0) \ @@ -196,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) \ @@ -225,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 @@ -248,4 +266,8 @@ typedef u32 fixed16_16; // #define STDIO_DEBUG #endif +#ifdef PND_BUILD + #include "pandora/pnd.h" +#endif + #endif