X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fsettings.h;h=efd1306646a3564d820f5265da03d3eb923f7912;hb=62587015fb12ec54b1702bfa17077e4b8af44b19;hp=e527040803df63731e5c1cde94128c9bf916c56a;hpb=47b31991c3d7575e48c2ef35fc0884a6a4bb6d53;p=virtualjaguar

diff --git a/src/settings.h b/src/settings.h
index e527040..efd1306 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -1,5 +1,5 @@
 //
-// SETTINGS.H: Header file
+// settings.h: Header file
 //
 
 #ifndef __SETTINGS_H__
@@ -10,31 +10,40 @@
 #include <limits.h>
 #define MAX_PATH		_POSIX_PATH_MAX
 #else
-#include <stdlib.h>								// for MAX_PATH on MinGW/Darwin
+#include <stdlib.h>				// for MAX_PATH on MinGW/Darwin
+// Kludge for Win64
+#ifndef MAX_PATH
+#define MAX_PATH _MAX_PATH		// Urgh.
 #endif
-#include "types.h"
+#endif
+#include <stdint.h>
 
 // Settings struct
 
 struct VJSettings
 {
 	bool useJoystick;
-	int32 joyport;								// Joystick port
-	bool hardwareTypeNTSC;						// Set to false for PAL
+	int32_t joyport;			// Joystick port
+	bool hardwareTypeNTSC;		// Set to false for PAL
 	bool useJaguarBIOS;
+	bool GPUEnabled;
 	bool DSPEnabled;
 	bool usePipelinedDSP;
 	bool fullscreen;
 	bool useOpenGL;
-	uint32 glFilter;
+	uint32_t glFilter;
 	bool hardwareTypeAlpine;
-	uint32 frameSkip;
-	uint32 renderType;
-	
+	bool audioEnabled;
+	uint32_t frameSkip;
+	uint32_t renderType;
+	bool allowWritesToROM;
+	uint32_t biosType;
+	bool useFastBlitter;
+
 	// Keybindings in order of U, D, L, R, C, B, A, Op, Pa, 0-9, #, *
 
-	uint16 p1KeyBindings[21];
-	uint16 p2KeyBindings[21];
+	uint32_t p1KeyBindings[21];
+	uint32_t p2KeyBindings[21];
 
 	// Paths
 
@@ -42,16 +51,17 @@ struct VJSettings
 	char jagBootPath[MAX_PATH];
 	char CDBootPath[MAX_PATH];
 	char EEPROMPath[MAX_PATH];
+	char alpineROMPath[MAX_PATH];
+	char absROMPath[MAX_PATH];
 };
 
 // Render types
 
 enum { RT_NORMAL = 0, RT_TV = 1 };
 
-// Exported functions
+// BIOS types
 
-void LoadVJSettings(void);
-void SaveVJSettings(void);
+enum { BT_K_SERIES, BT_M_SERIES, BT_STUBULATOR_1, BT_STUBULATOR_2 };
 
 // Exported variables