merge an assorment of calc84maniac's fixes.

[gpsp.git] / video.h

diff --git a/video.h b/video.h
index cb717f2..c7b926a 100644 (file)
--- a/video.h
+++ b/video.h
@@ -49,6 +49,8 @@ void debug_screen_update();
 
 extern u32 frame_speed;
 
+extern u32 resolution_width, resolution_height;
+
 extern s32 affine_reference_x[2];
 extern s32 affine_reference_y[2];
 
@@ -77,11 +79,15 @@ typedef enum
 {
   unscaled,
   scaled_aspect,
-#ifndef WIZ_BUILD
-  fullscreen,
-#endif
+#ifdef WIZ_BUILD
   unscaled_rot,
   scaled_aspect_rot,
+#elif defined(GP2X_BUILD)
+  fullscreen,
+  scaled_aspect_sw,
+#else
+  fullscreen,
+#endif
 } video_scale_type;
 
 typedef enum