Match the Gui changes in the last version in Linux, and clean up what gets sent to gcc a bit, so it doesn't get the same flage multiple times.

git-svn-id: http://pcsx2-playground.googlecode.com/svn/trunk@318 a6443dda-0b58-4228-96e9-037be469359c

pcsx2/Linux/GtkGui.cpp

@@ -674,7 +674,7 @@ void on_Speed_Hacks(GtkMenuItem *menuitem, gpointer user_data)
 	set_checked(SpeedHacksDlg, "check_Disable_Underflow", (Config.Hacks & FLAG_NO_UNDERFLOW));
 	set_checked(SpeedHacksDlg, "check_IOP_Double_Sync", (Config.Hacks & FLAG_IOP_2_SYNC));
 	set_checked(SpeedHacksDlg, "check_Triple_Sync",(Config.Hacks & FLAG_TRIPLE_SYNC));
-        set_checked(SpeedHacksDlg, "check_EE_Fast_Branches", (Config.Hacks & FLAG_FAST_BRANCHES));
+        //set_checked(SpeedHacksDlg, "check_EE_Fast_Branches", (Config.Hacks & FLAG_FAST_BRANCHES)); 
         set_checked(SpeedHacksDlg, "check_Disable_VU_Flags", (Config.Hacks & FLAG_NO_VU_FLAGS));
 	set_checked(SpeedHacksDlg, "check_Disable_FPU_Flags", (Config.Hacks & FLAG_NO_FPU_FLAGS));
 	set_checked(SpeedHacksDlg, "check_ESC_Hack", (Config.Hacks & FLAG_ESC));
@@ -693,7 +693,7 @@ void on_Speed_Hack_Compatability(GtkButton *button, gpointer user_data)
 	set_checked(SpeedHacksDlg, "check_Disable_Underflow", TRUE);
 	set_checked(SpeedHacksDlg, "check_IOP_Double_Sync", FALSE);
 	set_checked(SpeedHacksDlg, "check_Triple_Sync", FALSE);
-        set_checked(SpeedHacksDlg, "check_EE_Fast_Branches", FALSE);
+        //set_checked(SpeedHacksDlg, "check_EE_Fast_Branches", FALSE);
         set_checked(SpeedHacksDlg, "check_Disable_VU_Flags", TRUE);
 	set_checked(SpeedHacksDlg, "check_Disable_FPU_Flags", TRUE);
 	
@@ -709,7 +709,7 @@ void on_Speed_Hack_Speed(GtkButton *button, gpointer user_data)
 	set_checked(SpeedHacksDlg, "check_Disable_Underflow", TRUE);
 	set_checked(SpeedHacksDlg, "check_IOP_Double_Sync", TRUE);
 	set_checked(SpeedHacksDlg, "check_Triple_Sync", TRUE);
-        set_checked(SpeedHacksDlg, "check_EE_Fast_Branches", FALSE);
+        //set_checked(SpeedHacksDlg, "check_EE_Fast_Branches", FALSE);
         set_checked(SpeedHacksDlg, "check_Disable_VU_Flags", TRUE);
 	set_checked(SpeedHacksDlg, "check_Disable_FPU_Flags", TRUE);
 	
@@ -737,7 +737,7 @@ void on_Speed_Hack_OK(GtkButton *button, gpointer user_data)
 	Config.Hacks |= is_checked(SpeedHacksDlg, "check_Disable_Underflow") ? FLAG_NO_UNDERFLOW : 0;  
 	Config.Hacks |= is_checked(SpeedHacksDlg, "check_IOP_Double_Sync") ? FLAG_IOP_2_SYNC : 0;  
 	Config.Hacks |= is_checked(SpeedHacksDlg, "check_Triple_Sync") ? FLAG_TRIPLE_SYNC : 0;  
-	Config.Hacks |= is_checked(SpeedHacksDlg, "check_EE_Fast_Branches") ? FLAG_FAST_BRANCHES : 0; 
+	//Config.Hacks |= is_checked(SpeedHacksDlg, "check_EE_Fast_Branches") ? FLAG_FAST_BRANCHES : 0; 
 	Config.Hacks |= is_checked(SpeedHacksDlg, "check_Disable_VU_Flags") ? FLAG_NO_VU_FLAGS : 0;  
 	Config.Hacks |= is_checked(SpeedHacksDlg, "check_Disable_FPU_Flags")? FLAG_NO_FPU_FLAGS : 0;  
 	Config.Hacks |= is_checked(SpeedHacksDlg, "check_ESC_Hack") ? FLAG_ESC : 0;  

pcsx2/Linux/Pref.cpp

@@ -96,6 +96,10 @@ int LoadConfig() {
 	
 	GetValuel("Options", Config.Options);
 	GetValuel("Hacks",        Config.Hacks);
+	
+	// Remove Fast Branches hack for now:
+	Config.Hacks &= ~0x80;
+		
 	GetValuel("Fixes",        Config.GameFixes);
 	
 	Config.sseMXCSR = DEFAULT_sseMXCSR;
@@ -150,6 +154,10 @@ void SaveConfig() {
 	SetValue("FW",  Config.FW);
 	
 	SetValuel("Options",        Config.Options);
+	
+	// Remove Fast Branches hack for now:
+	Config.Hacks &= ~0x80;
+	
 	SetValuel("Hacks",        Config.Hacks);
 	SetValuel("Fixes",        Config.GameFixes);
 

pcsx2/Linux/interface.c

@@ -321,7 +321,6 @@ create_SpeedHacksDlg (void)
   GtkWidget *frame14;
   GtkWidget *alignment9;
   GtkWidget *vbox33;
-  GtkWidget *check_EE_Fast_Branches;
   GtkWidget *check_Tight_SPU_Sync;
   GtkWidget *check_ESC_Hack;
   GtkWidget *label47;
@@ -472,10 +471,6 @@ create_SpeedHacksDlg (void)
   gtk_widget_show (vbox33);
   gtk_container_add (GTK_CONTAINER (alignment9), vbox33);
 
-  check_EE_Fast_Branches = gtk_check_button_new_with_mnemonic (_("EE/IOP Fast Branches - Quick branching ( Very small speedup; Not Recommended!  )"));
-  gtk_widget_show (check_EE_Fast_Branches);
-  gtk_box_pack_start (GTK_BOX (vbox33), check_EE_Fast_Branches, FALSE, FALSE, 0);
-
   check_Tight_SPU_Sync = gtk_check_button_new_with_mnemonic (_("Tighter SPU2 Sync ( FFXII vids) - Slower, not very useful anymore."));
   gtk_widget_show (check_Tight_SPU_Sync);
   gtk_box_pack_start (GTK_BOX (vbox33), check_Tight_SPU_Sync, FALSE, FALSE, 0);
@@ -558,7 +553,6 @@ create_SpeedHacksDlg (void)
   GLADE_HOOKUP_OBJECT (SpeedHacksDlg, frame14, "frame14");
   GLADE_HOOKUP_OBJECT (SpeedHacksDlg, alignment9, "alignment9");
   GLADE_HOOKUP_OBJECT (SpeedHacksDlg, vbox33, "vbox33");
-  GLADE_HOOKUP_OBJECT (SpeedHacksDlg, check_EE_Fast_Branches, "check_EE_Fast_Branches");
   GLADE_HOOKUP_OBJECT (SpeedHacksDlg, check_Tight_SPU_Sync, "check_Tight_SPU_Sync");
   GLADE_HOOKUP_OBJECT (SpeedHacksDlg, check_ESC_Hack, "check_ESC_Hack");
   GLADE_HOOKUP_OBJECT (SpeedHacksDlg, label47, "label47");

pcsx2/Linux/pcsx2.glade

@@ -1115,25 +1115,6 @@ Enabled (Helps SPS, Slow)</property>
 		      <property name="homogeneous">False</property>
 		      <property name="spacing">0</property>
 
-		      <child>
-			<widget class="GtkCheckButton" id="check_EE_Fast_Branches">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">EE/IOP Fast Branches - Quick branching ( Very small speedup; Not Recommended!  )</property>
-			  <property name="use_underline">True</property>
-			  <property name="relief">GTK_RELIEF_NORMAL</property>
-			  <property name="focus_on_click">True</property>
-			  <property name="active">False</property>
-			  <property name="inconsistent">False</property>
-			  <property name="draw_indicator">True</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
 		      <child>
 			<widget class="GtkCheckButton" id="check_Tight_SPU_Sync">
 			  <property name="visible">True</property>
@@ -1171,6 +1152,10 @@ Enabled (Helps SPS, Slow)</property>
 			  <property name="fill">False</property>
 			</packing>
 		      </child>
+
+		      <child>
+			<placeholder/>
+		      </child>
 		    </widget>
 		  </child>
 		</widget>

pcsx2/configure.ac

@@ -28,9 +28,8 @@ CXXFLAGS=
 CCASFLAGS=
 
 WARNING_FLAGS="-Wall -Wno-format -Wno-unused-value"
-dnl EXTRA_FLAGS = " -Xlinker -fpermissive -march=native"
-NORMAL_FLAGS=" -pipe -O3 -Xlinker -zmuldefs -fomit-frame-pointer ${WARNING_FLAGS}"
-DEBUG_FLAGS=" -g -Xlinker -zmuldefs ${WARNING_FLAGS}"
+NORMAL_FLAGS=" -pipe -O3 -fomit-frame-pointer ${WARNING_FLAGS}"
+DEBUG_FLAGS=" -g -O0 ${WARNING_FLAGS}"
 
 dnl Check for debug build
 AC_MSG_CHECKING(debug build)
@@ -40,15 +39,15 @@ if test "x$debug" == xyes
 then
  AC_DEFINE(_DEBUG,1,[_DEBUG])
  CFLAGS+=" ${DEBUG_FLAGS}"
- CPPFLAGS+=" ${DEBUG_FLAGS}"
- CXXFLAGS+=" ${DEBUG_FLAGS}"
+ dnl CPPFLAGS+=" ${DEBUG_FLAGS}"
+ CXXFLAGS+=" ${DEBUG_FLAGS} -fpermissive -Xlinker -zmuldefs "
  CCASFLAGS+="-D_DEBUG ${DEBUG_FLAGS}"
  MYOBJDIR="Debug"
 else
  AC_DEFINE(NDEBUG,1,[NDEBUG])
  CFLAGS+=" ${NORMAL_FLAGS}"
- CPPFLAGS+="  ${NORMAL_FLAGS}"
- CXXFLAGS+=" ${NORMAL_FLAGS}"
+ dnl CPPFLAGS+="  ${NORMAL_FLAGS}"
+ CXXFLAGS+=" ${NORMAL_FLAGS} -fpermissive -Xlinker -zmuldefs "
  MYOBJDIR="Release"
 fi
 AC_MSG_RESULT($debug)