openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File PcsxSrc.dif of Package pcsx (Revision d684ae5f97d931558b521cf7a0436637)

Currently displaying revision d684ae5f97d931558b521cf7a0436637 , Show latest

--- Gte.c
+++ Gte.c
@@ -231,7 +231,7 @@
 			} else {
 				psxRegs.CP2D.r[31] = 32;
 			}
-#elif defined(__LINUX__) || defined(__MINGW32__)
+#elif (defined(__LINUX__) && (defined(__i386__)||defined(__x86_64__))) || defined(__MINGW32__)
 			if (a > 0) {
 				__asm__ ("bsrl %1, %0\n" : "=r"(a) : "r"(a) );
 				psxRegs.CP2D.r[31] = 31 - a;
--- Linux/GtkGui.c
+++ Linux/GtkGui.c
@@ -1084,9 +1084,13 @@
 	Config.Cpu = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(Btn));
 	if (t != Config.Cpu) {
 		psxCpu->Shutdown();
+#ifdef __i386__
 		if (Config.Cpu)	
+#endif
 			 psxCpu = &psxInt;
+#ifdef __i386__
 		else psxCpu = &psxRec;
+#endif
 		if (psxCpu->Init() == -1) {
 			SysClose();
 			exit(1);
--- Linux/Makefile
+++ Linux/Makefile
@@ -13,9 +13,9 @@
 
 all: pcsx
 
-CPU = ix86
+#CPU = ix86
 
-OPTIMIZE = -O2 -fomit-frame-pointer -finline-functions -ffast-math
+OPTIMIZE = $(RPM_OPT_FLAGS) -O2 -fomit-frame-pointer -finline-functions -ffast-math
 FLAGS = -D__LINUX__ -DPCSX_VERSION=\"${VERSION}\" -DPACKAGE=\"pcsx\"
 FLAGS+= -DENABLE_NLS
 
@@ -44,7 +44,7 @@
 	ifneq (${PGCC}, )
 		CC = ${PGCC}
 	endif
-	OPTIMIZE = -O4 -fomit-frame-pointer -finline-functions -ffast-math -fno-exceptions -march=pentiumpro
+	OPTIMIZE = $(RPM_OPT_FLAGS) -O4 -fomit-frame-pointer -finline-functions -ffast-math -fno-exceptions -march=pentiumpro
 	OBJS+= ../ix86/iR3000A.o ../ix86/ix86.o
 	FLAGS+= -D__i386__
 endif
--- ix86/ix86.c
+++ ix86/ix86.c
@@ -7,6 +7,7 @@
 #include <stdio.h>
 #include <string.h>
 
+#include "PsxCommon.h"
 #include "ix86.h"
 
 static s32 iCpuId(s32 cmd, u32 *regs) {

Places

File PcsxSrc.dif of Package pcsx (Revision d684ae5f97d931558b521cf7a0436637)

Places