Fix compilation on linux.

5 files changed, 41 insertions, 16 deletions

diff --git a/gui/ConfDlg.c b/gui/ConfDlg.c
index d71326c7..25c107eb 100755
--- a/gui/ConfDlg.c
+++ b/gui/ConfDlg.c
@@ -1032,3 +1032,6 @@ void OnConf_Cpu() {
 	g_signal_connect_data(G_OBJECT(CpuDlg), "response",
 			G_CALLBACK(OnCpu_Clicked), builder, (GClosureNotify)g_object_unref, G_CONNECT_AFTER);
 }
+
+void OnConf_Pgxp() {
+}
diff --git a/gui/ConfDlg.h b/gui/ConfDlg.h
index ef1c0203..b8b9d4e6 100755
--- a/gui/ConfDlg.h
+++ b/gui/ConfDlg.h
@@ -28,6 +28,7 @@ void OnConf_Sound();
 void OnConf_CdRom();
 void OnConf_Pad();
 void OnConf_Cpu();
+void OnConf_Pgxp();
 void OnConf_Net();
 void OnConf_Sio1();
 
diff --git a/gui/Config.c b/gui/Config.c
index 25e2e54b..4988757d 100755
--- a/gui/Config.c
+++ b/gui/Config.c
@@ -142,10 +142,20 @@ int LoadConfig(PcsxConfig *Conf) {
 	Config.VSyncWA = GetValueb(data, "VSyncWA");
 	Config.NoMemcard = GetValueb(data, "NoMemcard");
 	Config.Widescreen = GetValueb(data, "Widescreen");
+    Config.PerGameMcd = GetValueb(data, "PerGameMcd");
+    Config.MemHack = GetValuel(data, "MemHack");
+    Config.OverClock = GetValueb(data, "OverClock");
 
 	Config.Cpu     = GetValuel(data, "Cpu");
 	Config.PsxType = GetValuel(data, "PsxType");
-	Config.RewindCount = GetValuel(data, "RewindCount");
+    //GetValue(data, "PsxClock", &(Config.PsxClock));
+
+    Config.PGXP_GTE = GetValueb(data, "PGXP_GTE");
+    Config.PGXP_Cache = GetValueb(data, "PGXP_Cache");
+    Config.PGXP_Texture = GetValueb(data, "PGXP_Texture");
+    Config.PGXP_Mode = GetValuel(data, "PGXP_Mode");
+
+    Config.RewindCount = GetValuel(data, "RewindCount");
 	Config.RewindInterval = GetValuel(data, "RewindInterval");
 
 	Config.AltSpeed1 = GetValuel(data, "AltSpeed1");
@@ -191,7 +201,7 @@ void SaveConfig() {
 	SetValueb("SioIrq",  Config.SioIrq);
 	SetValueb("Mdec",    Config.Mdec);
 	SetValueb("PsxAuto", Config.PsxAuto);
-	SetValuel("Cdda",    Config.Cdda);
+	SetValuel("Cdda",    (long)Config.Cdda);
 	SetValueb("SlowBoot",Config.SlowBoot);
 	SetValueb("Dbg",     Config.Debug);
 	SetValueb("PsxOut",  Config.PsxOut);
@@ -200,16 +210,26 @@ void SaveConfig() {
 	SetValueb("VSyncWA", Config.VSyncWA);
 	SetValueb("NoMemcard", Config.NoMemcard);
 	SetValueb("Widescreen", Config.Widescreen);
+    SetValueb("PerGameMcd", Config.PerGameMcd);
+    SetValuel("MemHack", (long)Config.MemHack);
+    SetValueb("OverClock", Config.OverClock);
+
+	SetValuel("Cpu",     (long)Config.Cpu);
+    SetValuel("PsxType", (long)Config.PsxType);
+    //SetValue("PsxClock", Config.PsxClock);
+
+    SetValueb("PGXP_GTE", Config.PGXP_GTE);
+    SetValueb("PGXP_Cache", Config.PGXP_Cache);
+    SetValueb("PGXP_Texture", Config.PGXP_Texture);
+    SetValuel("PGXP_Mode", (long)Config.PGXP_Mode);
 
-	SetValuel("Cpu",     Config.Cpu);
-	SetValuel("PsxType", Config.PsxType);
-	SetValuel("RewindCount", Config.RewindCount);
-	SetValuel("RewindInterval", Config.RewindInterval);
+    SetValuel("RewindCount", (long)Config.RewindCount);
+    SetValuel("RewindInterval", (long)Config.RewindInterval);
 
-	SetValuel("AltSpeed1", Config.AltSpeed1);
-	SetValuel("AltSpeed2", Config.AltSpeed2);
+    SetValuel("AltSpeed1", (long)Config.AltSpeed1);
+    SetValuel("AltSpeed2", (long)Config.AltSpeed2);
 
-	SetValuel("HackFix", Config.HackFix);
+    SetValuel("HackFix", (long)Config.HackFix);
 
 	fclose(f);
 }
diff --git a/gui/GtkGui.c b/gui/GtkGui.c
index 3185e51a..17f1422f 100755
--- a/gui/GtkGui.c
+++ b/gui/GtkGui.c
@@ -462,8 +462,9 @@ void StartGui() {
 			G_CALLBACK(OnConf_Sio1), NULL, NULL, G_CONNECT_AFTER);
 #endif
 	widget = GTK_WIDGET(gtk_builder_get_object(builder, "cpu1"));
-	g_signal_connect_data(G_OBJECT(widget), "activate",
-			G_CALLBACK(OnConf_Cpu), NULL, NULL, G_CONNECT_AFTER);
+	g_signal_connect_data(G_OBJECT(widget), "activate", G_CALLBACK(OnConf_Cpu), NULL, NULL, G_CONNECT_AFTER);
+    widget = GTK_WIDGET(gtk_builder_get_object(builder, "pgxp1"));
+    g_signal_connect_data(G_OBJECT(widget), "activate", G_CALLBACK(OnConf_Pgxp), NULL, NULL, G_CONNECT_AFTER);
 	widget = GTK_WIDGET(gtk_builder_get_object(builder, "memory_cards1"));
 	g_signal_connect_data(G_OBJECT(widget), "activate",
 			G_CALLBACK(OnConf_Mcds), NULL, NULL, G_CONNECT_AFTER);
diff --git a/gui/MemcardDlg.c b/gui/MemcardDlg.c
index b777126e..b9f2dab0 100755
--- a/gui/MemcardDlg.c
+++ b/gui/MemcardDlg.c
@@ -441,7 +441,7 @@ static int GetFreeMemcardSlot(gint target_card, gint count, u8* blocks) {
 	return -1;
 }
 
-void CopyMemcardData(char *from, char *to, gint srci, gint dsti,
+void CopyMemcardData(gint dstmcd, char *from, char *to, gint srci, gint dsti,
 						gchar *str, const u16 linkindex) {
 	u16* linkptr;
 	u8* checksumptr;
@@ -463,11 +463,11 @@ void CopyMemcardData(char *from, char *to, gint srci, gint dsti,
 		//printf("link = %i %i\n", dsti, linkindex);
 	}
 
-	SaveMcd((char *)str, to, dsti * 128, 128);
+	SaveMcd(dstmcd, (char *)str, to, dsti * 128, 128);
 
 	// data	
 	memcpy(to + dsti * 1024 * 8, from + srci * 1024 * 8, 1024 * 8);
-	SaveMcd((char *)str, to, dsti * 1024 * 8, 1024 * 8);
+	SaveMcd(dstmcd, (char *)str, to, dsti * 1024 * 8, 1024 * 8);
 
 	//printf("data = %s\n", from + (srci+1) * 128);
 }
@@ -548,7 +548,7 @@ static void OnMcd_CopyTo(GtkWidget *widget, gpointer user_data) {
 
 	for (j=0; srctbl[j] > 0; j++) {
 		// last parameter specifies link index (next block)
-		CopyMemcardData(source, destination, 
+		CopyMemcardData(dstmcd, source, destination,
 					srctbl[j], dsttbl[j], str, dsttbl[j+1]-1);
 		//printf("count = %i, indices=(%x,%x) jindex=%i\n", count, srctbl[j], dsttbl[j], j);
 	}
@@ -620,7 +620,7 @@ static void OnMemcardDelete(GtkWidget *widget, gpointer user_data) {
 			}
 			*ptr = xorsum;
 
-			SaveMcd((char *)filename, data, i * 128, 128);
+			SaveMcd(memcard, (char *)filename, data, i * 128, 128);
 
 			// Check links
 			i = GETLINKFORBLOCK(data, i); //0...15 index when ++i at top of loop