X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=common.h;h=7eea8b63dd7e6b4813540cce55f836eeb8debe7f;hb=eb3668fc5dab138073cd4844208ac05b94086a4a;hp=b58228b83dcd4e291b8abd8bf79279b60a20104c;hpb=4742480dcabcbd9d23fd8cb9a655fc8c9c314513;p=gpsp.git

diff --git a/common.h b/common.h
index b58228b..7eea8b6 100644
--- a/common.h
+++ b/common.h
@@ -29,6 +29,7 @@
 #ifdef _WIN32_WCE
   #include <windows.h>
 #else
+  #define _BSD_SOURCE // sync
   #include <stdlib.h>
   #include <stdio.h>
   #include <string.h>
@@ -114,8 +115,8 @@
   typedef signed char s8;
   typedef unsigned short int u16;
   typedef signed short int s16;
-  typedef unsigned long u32;
-  typedef signed long s32;
+  typedef unsigned int u32;
+  typedef signed int s32;
   typedef unsigned long long int u64;
   typedef signed long long int s64;
 
@@ -135,8 +136,8 @@
 
   #define file_close(filename_tag)                                            \
   {                                                                           \
-    sync();                                                                   \
     fclose(filename_tag);                                                     \
+    sync();                                                                   \
   }                                                                           \
 
 #else
@@ -157,30 +158,6 @@
 
   #define file_tag_type FILE *
 
-  // The ARM arch uses SDL, and SDL requires you to know what resolution
-  // you want. Define the resolution for ARM arch builds here.
-  // Placed in common.h for use with video.c and gui.c.
-
-  #ifndef PC_BUILD
-
-  #define GP2X_SCREEN_WIDTH 320
-  #define GP2X_SCREEN_HEIGHT 240
-
-  #define GIZ_SCREEN_WIDTH 320
-  #define GIZ_SCREEN_HEIGHT 240
-
-  #ifdef GP2X_BUILD
-    #define SDL_SCREEN_WIDTH GP2X_SCREEN_WIDTH
-    #define SDL_SCREEN_HEIGHT GP2X_SCREEN_HEIGHT
-
-  #elif defined(GIZ_BUILD)
-
-    #define SDL_SCREEN_WIDTH GIZ_SCREEN_WIDTH
-    #define SDL_SCREEN_HEIGHT GIZ_SCREEN_HEIGHT
-  #endif
-
-  #endif
-
 #endif
 
 // These must be variables, not constants.
@@ -248,6 +225,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
@@ -271,4 +251,8 @@ typedef u32 fixed16_16;
 //  #define STDIO_DEBUG
 #endif
 
+#ifdef PND_BUILD
+  #include "pandora/pnd.h"
+#endif
+
 #endif